Added circle, cylinder and sphere buildmodes. Refactored buildmodes to use hierarchy classes, much less code duplication. Added support for multiple options per build mode.

Added alternative placement key (ctrl) that toggles between first two actions of first option.
Fixed crash when placing ladders.

README.md

@@ -0,0 +1,3 @@
+This is the version for Minecraft 1.12.
+
+1.13 can be found here: https://bitbucket.org/Requios/effortless-building-1.13/src/master/

build.gradle

@@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
 
-version = "1.0"
+version = "1.12.2-2.16"
 group = "nl.requios.effortlessbuilding" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "effortlessbuilding"
 
@@ -21,7 +21,7 @@ compileJava {
 }
 
 minecraft {
-    version = "1.12.2-14.23.4.2705"
+    version = "1.12.2-14.23.5.2825"
     runDir = "run"
     
     // the mappings can be changed at any time, and must be in the following format.
@@ -29,10 +29,14 @@ minecraft {
     // stable_#            stables are built at the discretion of the MCP team.
     // Use non-default mappings at your own risk. they may not always work.
     // simply re-run your setup task after changing the mappings to update your workspace.
-    mappings = "snapshot_20171003"
+    mappings = "stable_39"
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
 }
 
+repositories {
+	flatDir { dirs 'libs' }
+}
+
 dependencies {
     // you may put jars on which you depend on in ./libs
     // or you may define them like so..
@@ -50,6 +54,7 @@ dependencies {
     // except that these dependencies get remapped to your current MCP mappings
     //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev'
     //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
+	provided 'mod.chiselsandbits:chiselsandbits:14.30'
 
     // for more info...
     // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Mon Sep 14 12:28:28 PDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -6,47 +6,6 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -61,9 +20,49 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

src/main/java/nl/requios/effortlessbuilding/BuildConfig.java

@@ -50,13 +50,40 @@ public class BuildConfig {
                  "A percentage between 0% and 100%, where 0% is the same as disabling it,",
                  "and 100% takes as much time as breaking each block individually.",
                  "The block in front of you always counts as 100%."})
-        @RangeInt(min = 0, max = 100)
+        @RangeInt(min = 0, max = 200)
         public int miningTimePercentage = 50;
+
+        @Comment({"Determines what blocks can be replaced in survival.",
+                 "-1: only blocks that can be harvested by hand (default)",
+                 "0: blocks that can be harvested with wooden or gold tools",
+                 "1: blocks that can be harvested with stone tools",
+                 "2: blocks that can be harvested with iron tools",
+                 "3: blocks that can be harvested with diamond tools",
+                 })
+        @RangeInt(min = -1, max = 3)
+        public int quickReplaceMiningLevel = -1;
+
+        @Comment({"How many placements are remembered for the undo functionality."})
+        @RequiresMcRestart
+        public int undoStackSize = 10;
     }
 
     public static class Visuals {
-        @Comment({"Show a block preview if you have a block in hand,",
-                 "even when mirror and array are off."})
+        @Comment({"Show a block preview if you have a block in hand on build mode NORMAL"})
         public boolean alwaysShowBlockPreview = false;
+
+        @Comment({"How long the dissolve effect takes when placing blocks.",
+                 "Default between 30 and 60 ticks, you can multiply that here.",
+                 "Recommended values:",
+                 "Snappy: 0.7",
+                 "Relaxing: 1.5"})
+        public double dissolveTimeMultiplier = 1.0;
+
+        @Comment({"Switch to using the simple performance shader when placing more than this many blocks."})
+        public int shaderTreshold = 1500;
+
+        @Comment({"Use fancy shaders while placing blocks"})
+        public boolean useShaders = true;
+
     }
 }

src/main/java/nl/requios/effortlessbuilding/BuildModifiers.java

@@ -1,207 +0,0 @@
-package nl.requios.effortlessbuilding;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.World;
-import net.minecraftforge.event.world.BlockEvent;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
-import nl.requios.effortlessbuilding.helper.SurvivalHelper;
-import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
-import nl.requios.effortlessbuilding.network.BlockBrokenMessage;
-import nl.requios.effortlessbuilding.network.BlockPlacedMessage;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class BuildModifiers {
-
-    //Uses a network message to get the previous raytraceresult from the player
-    //The server could keep track of all raytraceresults but this might lag with many players
-    //Raytraceresult is needed for sideHit and hitVec
-    public static void onBlockPlacedMessage(EntityPlayer player, BlockPlacedMessage message) {
-        if (!message.isBlockHit() || message.getBlockPos() == null) return;
-
-        World world = player.world;
-        ItemRandomizerBag.renewRandomness();
-
-        BlockPos startPos = message.getBlockPos();
-
-        //Offset in direction of sidehit if not quickreplace and not replaceable
-        BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(player);
-        boolean replaceable = world.getBlockState(startPos).getBlock().isReplaceable(player.world, startPos);
-        if (!buildSettings.doQuickReplace() && !replaceable) {
-            startPos = startPos.offset(message.getSideHit());
-        }
-
-        //Get under tall grass and other replaceable blocks
-        if (buildSettings.doQuickReplace() && replaceable) {
-            startPos = startPos.down();
-        }
-
-        //Check if player reach does not exceed startpos
-        int maxReach = ReachHelper.getMaxReach(player);
-        if (player.getPosition().distanceSq(startPos) > maxReach * maxReach) {
-            EffortlessBuilding.log(player, "Placement exceeds your reach.");
-            return;
-        }
-
-        //Format hitvec to 0.x
-        Vec3d hitVec = message.getHitVec();
-        hitVec = new Vec3d(Math.abs(hitVec.x - ((int) hitVec.x)), Math.abs(hitVec.y - ((int) hitVec.y)), Math.abs(hitVec.z - ((int) hitVec.z)));
-
-        //find coordinates and blockstates
-        List<BlockPos> coordinates = findCoordinates(player, startPos);
-        List<ItemStack> itemStacks = new ArrayList<>();
-        List<IBlockState> blockStates = findBlockStates(player, startPos, hitVec, message.getSideHit(), itemStacks);
-
-        //check if valid blockstates
-        if (blockStates.size() == 0 || coordinates.size() != blockStates.size()) return;
-
-        //place blocks
-        for (int i = 0; i < coordinates.size(); i++) {
-            BlockPos blockPos = coordinates.get(i);
-            IBlockState blockState = blockStates.get(i);
-            ItemStack itemStack = itemStacks.get(i);
-
-            if (world.isBlockLoaded(blockPos, true)) {
-                //check itemstack empty
-                if (itemStack.isEmpty()) continue;
-                SurvivalHelper.placeBlock(world, player, blockPos, blockState, itemStack, EnumFacing.UP, true, false);
-            }
-        }
-    }
-
-    public static void onBlockPlaced(BlockEvent.PlaceEvent event) {
-        if (event.getWorld().isRemote) return;
-
-        BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(event.getPlayer());
-        //Only use own place event if anything is enabled
-        if (isEnabled(buildSettings, event.getPos())) {
-            //EffortlessBuilding.packetHandler.sendTo(new BlockPlacedMessage(), (EntityPlayerMP) event.getPlayer());
-            event.setCanceled(true);
-        }
-
-    }
-
-    //Use a network message to break blocks in the distance using clientside mouse input
-    public static void onBlockBrokenMessage(EntityPlayer player, BlockBrokenMessage message) {
-        BlockPos blockPos = message.getBlockPos();
-        if (ReachHelper.canBreakFar(player) && message.isBlockHit()) {
-            BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(player.world, blockPos, player.world.getBlockState(blockPos), player);
-            onBlockBroken(event);
-        }
-    }
-
-    public static void onBlockBroken(BlockEvent.BreakEvent event) {
-        if (event.getWorld().isRemote) return;
-
-        BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(event.getPlayer());
-        //Only use own break event if anything is enabled
-        if (isEnabled(buildSettings, event.getPos())) {
-            //get coordinates
-            List<BlockPos> coordinates = findCoordinates(event.getPlayer(), event.getPos());
-
-            //break all those blocks
-            for (BlockPos coordinate : coordinates) {
-                if (event.getWorld().isBlockLoaded(coordinate, false)) {
-                    SurvivalHelper.breakBlock(event.getWorld(), event.getPlayer(), coordinate);
-                }
-            }
-        }
-    }
-
-    public static List<BlockPos> findCoordinates(EntityPlayer player, BlockPos startPos) {
-        List<BlockPos> coordinates = new ArrayList<>();
-        //Add current block being placed too
-        coordinates.add(startPos);
-
-        List<BlockPos> arrayCoordinates = Array.findCoordinates(player, startPos);
-        coordinates.addAll(arrayCoordinates);
-        coordinates.addAll(Mirror.findCoordinates(player, startPos));
-        coordinates.addAll(RadialMirror.findCoordinates(player, startPos));
-        //get mirror for each array coordinate
-        for (BlockPos coordinate : arrayCoordinates) {
-            coordinates.addAll(Mirror.findCoordinates(player, coordinate));
-            coordinates.addAll(RadialMirror.findCoordinates(player, coordinate));
-        }
-
-        return coordinates;
-    }
-
-    public static List<IBlockState> findBlockStates(EntityPlayer player, BlockPos startPos, Vec3d hitVec, EnumFacing facing, List<ItemStack> itemStacks) {
-        List<IBlockState> blockStates = new ArrayList<>();
-        itemStacks.clear();
-
-        //Get itemstack
-        ItemStack itemStack = player.getHeldItem(EnumHand.MAIN_HAND);
-        if (itemStack.isEmpty() || !(itemStack.getItem() instanceof ItemBlock || itemStack.getItem() instanceof ItemRandomizerBag)) {
-            itemStack = player.getHeldItem(EnumHand.OFF_HAND);
-        }
-        if (itemStack.isEmpty() || !(itemStack.getItem() instanceof ItemBlock || itemStack.getItem() instanceof ItemRandomizerBag)) {
-            return blockStates;
-        }
-
-        //Get ItemBlock stack
-        ItemStack itemBlock = ItemStack.EMPTY;
-        if (itemStack.getItem() instanceof ItemBlock) itemBlock = itemStack;
-        ItemRandomizerBag.resetRandomness();
-        if (itemStack.getItem() instanceof ItemRandomizerBag) itemBlock = ItemRandomizerBag.pickRandomStack(ItemRandomizerBag.getBagInventory(itemStack));
-
-        IBlockState blockState = getBlockStateFromItem(itemBlock, player, startPos, facing, hitVec, EnumHand.MAIN_HAND);
-        //Add current block being placed too
-        blockStates.add(blockState);
-        itemStacks.add(itemStack);
-
-        List<IBlockState> arrayBlockStates = Array.findBlockStates(player, startPos, blockState, itemStack, itemStacks);
-        blockStates.addAll(arrayBlockStates);
-        blockStates.addAll(Mirror.findBlockStates(player, startPos, blockState, itemStack, itemStacks));
-        blockStates.addAll(RadialMirror.findBlockStates(player, startPos, blockState, itemStack, itemStacks));
-        //add mirror for each array coordinate
-        List<BlockPos> arrayCoordinates = Array.findCoordinates(player, startPos);
-        for (int i = 0; i < arrayCoordinates.size(); i++) {
-            BlockPos coordinate = arrayCoordinates.get(i);
-            IBlockState blockState1 = arrayBlockStates.get(i);
-            blockStates.addAll(Mirror.findBlockStates(player, coordinate, blockState1, itemStack, itemStacks));
-            blockStates.addAll(RadialMirror.findBlockStates(player, coordinate, blockState1, itemStack, itemStacks));
-        }
-
-        //Adjust blockstates for torches and ladders etc to place on a valid side
-        //TODO optimize findCoordinates (done twice now)
-        //TODO fix mirror
-//        List<BlockPos> coordinates = findCoordinates(player, startPos);
-//        for (int i = 0; i < blockStates.size(); i++) {
-//            blockStates.set(i, blockStates.get(i).getBlock().getStateForPlacement(player.world, coordinates.get(i), facing,
-//                    (float) hitVec.x, (float) hitVec.y, (float) hitVec.z, itemStacks.get(i).getMetadata(), player, EnumHand.MAIN_HAND));
-//        }
-
-        return blockStates;
-    }
-
-    public static boolean isEnabled(BuildSettingsManager.BuildSettings buildSettings, BlockPos startPos) {
-        return Mirror.isEnabled(buildSettings.getMirrorSettings(), startPos) ||
-               Array.isEnabled(buildSettings.getArraySettings()) ||
-               RadialMirror.isEnabled(buildSettings.getRadialMirrorSettings(), startPos) ||
-               buildSettings.doQuickReplace();
-    }
-
-    public static IBlockState getBlockStateFromItem(ItemStack itemStack, EntityPlayer player, BlockPos blockPos, EnumFacing facing, Vec3d hitVec, EnumHand hand) {
-        return Block.getBlockFromItem(itemStack.getItem()).getStateForPlacement(player.world, blockPos, facing,
-                ((float) hitVec.x), ((float) hitVec.y), ((float) hitVec.z), itemStack.getMetadata(), player, hand);
-    }
-
-    //Returns true if equal (or both null)
-    public static boolean compareCoordinates(List<BlockPos> coordinates1, List<BlockPos> coordinates2) {
-        if (coordinates1 == null && coordinates2 == null) return true;
-        if (coordinates1 == null || coordinates2 == null) return false;
-
-        return coordinates1.equals(coordinates2);
-    }
-}

src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java

@@ -3,6 +3,8 @@ package nl.requios.effortlessbuilding;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.SoundEvent;
 import net.minecraft.util.text.TextComponentString;
 import net.minecraftforge.common.capabilities.CapabilityManager;
 import net.minecraftforge.common.config.Config;
@@ -17,16 +19,17 @@ import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
 import net.minecraftforge.fml.common.network.NetworkRegistry;
 import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
 import net.minecraftforge.fml.relauncher.Side;
-import nl.requios.effortlessbuilding.capability.BuildModifierCapabilityManager;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
+import nl.requios.effortlessbuilding.capability.ModeCapabilityManager;
+import nl.requios.effortlessbuilding.capability.ModifierCapabilityManager;
 import nl.requios.effortlessbuilding.command.CommandReach;
+import nl.requios.effortlessbuilding.compatibility.CompatHelper;
 import nl.requios.effortlessbuilding.gui.RandomizerBagGuiHandler;
 import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
 import nl.requios.effortlessbuilding.item.ItemReachUpgrade1;
 import nl.requios.effortlessbuilding.item.ItemReachUpgrade2;
 import nl.requios.effortlessbuilding.item.ItemReachUpgrade3;
-import nl.requios.effortlessbuilding.network.BlockBrokenMessage;
-import nl.requios.effortlessbuilding.network.BlockPlacedMessage;
-import nl.requios.effortlessbuilding.network.BuildSettingsMessage;
+import nl.requios.effortlessbuilding.network.*;
 import nl.requios.effortlessbuilding.proxy.IProxy;
 import org.apache.logging.log4j.Logger;
 
@@ -36,7 +39,7 @@ public class EffortlessBuilding
 {
     public static final String MODID = "effortlessbuilding";
     public static final String NAME = "Effortless Building";
-    public static final String VERSION = "1.0";
+    public static final String VERSION = "1.12.2-2.16";
 
     @Mod.Instance(EffortlessBuilding.MODID)
     public static EffortlessBuilding instance;
@@ -74,16 +77,35 @@ public class EffortlessBuilding
     {
         logger = event.getModLog();
 
-        CapabilityManager.INSTANCE.register(
-                BuildModifierCapabilityManager.IBuildModifierCapability.class, new BuildModifierCapabilityManager.Storage(), BuildModifierCapabilityManager.BuildModifierCapability.class);
+        CapabilityManager.INSTANCE.register(ModifierCapabilityManager.IModifierCapability.class, new ModifierCapabilityManager.Storage(), ModifierCapabilityManager.ModifierCapability.class);
+        CapabilityManager.INSTANCE.register(ModeCapabilityManager.IModeCapability.class, new ModeCapabilityManager.Storage(), ModeCapabilityManager.ModeCapability.class);
 
-        EffortlessBuilding.packetHandler.registerMessage(BuildSettingsMessage.MessageHandler.class, BuildSettingsMessage.class, 0, Side.SERVER);
-        EffortlessBuilding.packetHandler.registerMessage(BuildSettingsMessage.MessageHandler.class, BuildSettingsMessage.class, 0, Side.CLIENT);
+        EffortlessBuilding.packetHandler.registerMessage(ModifierSettingsMessage.MessageHandler.class, ModifierSettingsMessage.class, 0, Side.SERVER);
+        EffortlessBuilding.packetHandler.registerMessage(ModifierSettingsMessage.MessageHandler.class, ModifierSettingsMessage.class, 0, Side.CLIENT);
 
-        EffortlessBuilding.packetHandler.registerMessage(BlockPlacedMessage.MessageHandler.class, BlockPlacedMessage.class, 1, Side.SERVER);
-        EffortlessBuilding.packetHandler.registerMessage(BlockPlacedMessage.MessageHandler.class, BlockPlacedMessage.class, 1, Side.CLIENT);
+        EffortlessBuilding.packetHandler.registerMessage(ModeSettingsMessage.MessageHandler.class, ModeSettingsMessage.class, 1, Side.SERVER);
+        EffortlessBuilding.packetHandler.registerMessage(ModeSettingsMessage.MessageHandler.class, ModeSettingsMessage.class, 1, Side.CLIENT);
 
-        EffortlessBuilding.packetHandler.registerMessage(BlockBrokenMessage.MessageHandler.class, BlockBrokenMessage.class, 2, Side.SERVER);
+        EffortlessBuilding.packetHandler.registerMessage(ModeActionMessage.MessageHandler.class, ModeActionMessage.class, 2, Side.SERVER);
+        EffortlessBuilding.packetHandler.registerMessage(ModeActionMessage.MessageHandler.class, ModeActionMessage.class, 2, Side.CLIENT);
+
+        EffortlessBuilding.packetHandler.registerMessage(BlockPlacedMessage.MessageHandler.class, BlockPlacedMessage.class, 3, Side.SERVER);
+        EffortlessBuilding.packetHandler.registerMessage(BlockPlacedMessage.MessageHandler.class, BlockPlacedMessage.class, 3, Side.CLIENT);
+
+        EffortlessBuilding.packetHandler.registerMessage(BlockBrokenMessage.MessageHandler.class, BlockBrokenMessage.class, 4, Side.SERVER);
+        EffortlessBuilding.packetHandler.registerMessage(BlockBrokenMessage.MessageHandler.class, BlockBrokenMessage.class, 4, Side.CLIENT);
+
+        EffortlessBuilding.packetHandler.registerMessage(CancelModeMessage.MessageHandler.class, CancelModeMessage.class, 5, Side.SERVER);
+        EffortlessBuilding.packetHandler.registerMessage(CancelModeMessage.MessageHandler.class, CancelModeMessage.class, 5, Side.CLIENT);
+
+        EffortlessBuilding.packetHandler.registerMessage(RequestLookAtMessage.MessageHandler.class, RequestLookAtMessage.class, 6, Side.SERVER);
+        EffortlessBuilding.packetHandler.registerMessage(RequestLookAtMessage.MessageHandler.class, RequestLookAtMessage.class, 6, Side.CLIENT);
+
+        EffortlessBuilding.packetHandler.registerMessage(AddUndoMessage.MessageHandler.class, AddUndoMessage.class, 7, Side.SERVER);
+        EffortlessBuilding.packetHandler.registerMessage(AddUndoMessage.MessageHandler.class, AddUndoMessage.class, 7, Side.CLIENT);
+
+        EffortlessBuilding.packetHandler.registerMessage(ClearUndoMessage.MessageHandler.class, ClearUndoMessage.class, 8, Side.SERVER);
+        EffortlessBuilding.packetHandler.registerMessage(ClearUndoMessage.MessageHandler.class, ClearUndoMessage.class, 8, Side.CLIENT);
 
         proxy.preInit(event);
     }
@@ -104,6 +126,7 @@ public class EffortlessBuilding
     public void postInit(FMLPostInitializationEvent event)
     {
         proxy.postInit(event);
+        CompatHelper.postInit();
     }
 
     @EventHandler

src/main/java/nl/requios/effortlessbuilding/EventHandler.java

@@ -4,10 +4,13 @@ import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import net.minecraftforge.common.config.Config;
 import net.minecraftforge.common.config.ConfigManager;
@@ -18,11 +21,27 @@ import net.minecraftforge.event.world.BlockEvent;
 import net.minecraftforge.fml.client.event.ConfigChangedEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import nl.requios.effortlessbuilding.capability.BuildModifierCapabilityManager;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
+import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
+import nl.requios.effortlessbuilding.buildmodifier.BlockSet;
+import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
+import nl.requios.effortlessbuilding.capability.ModeCapabilityManager;
+import nl.requios.effortlessbuilding.capability.ModifierCapabilityManager;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
 import nl.requios.effortlessbuilding.helper.SurvivalHelper;
+import nl.requios.effortlessbuilding.network.AddUndoMessage;
+import nl.requios.effortlessbuilding.network.BlockBrokenMessage;
+import nl.requios.effortlessbuilding.network.ClearUndoMessage;
+import nl.requios.effortlessbuilding.network.RequestLookAtMessage;
+import scala.actors.threadpool.Arrays;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import static net.minecraftforge.fml.common.gameevent.PlayerEvent.*;
+
 @Mod.EventBusSubscriber
 public class EventHandler
 {
@@ -47,12 +66,13 @@ public class EventHandler
     @SubscribeEvent
     public static void attachCapabilities(AttachCapabilitiesEvent<Entity> event) {
         if (event.getObject() instanceof EntityPlayer) {
-            event.addCapability(new ResourceLocation(EffortlessBuilding.MODID, "BuildModifier"), new BuildModifierCapabilityManager.Provider());
+            event.addCapability(new ResourceLocation(EffortlessBuilding.MODID, "BuildModifier"), new ModifierCapabilityManager.Provider());
+            event.addCapability(new ResourceLocation(EffortlessBuilding.MODID, "BuildMode"), new ModeCapabilityManager.Provider());
         }
     }
 
     @SubscribeEvent
-    public void onConfigChangedEvent(ConfigChangedEvent.OnConfigChangedEvent event)
+    public static void onConfigChangedEvent(ConfigChangedEvent.OnConfigChangedEvent event)
     {
         if (event.getModID().equals(EffortlessBuilding.MODID))
         {
@@ -66,14 +86,50 @@ public class EventHandler
 //    }
 
     @SubscribeEvent
+    //Only called serverside (except with lilypads...)
     public static void onBlockPlaced(BlockEvent.PlaceEvent event) {
-        //Still call it to cancel event
-        BuildModifiers.onBlockPlaced(event);
+        if (event.getWorld().isRemote) return;
+
+        //Cancel event if necessary
+        EntityPlayer player = event.getPlayer();
+        BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+
+        if (buildMode != BuildModes.BuildModeEnum.NORMAL) {
+            event.setCanceled(true);
+        } else if (modifierSettings.doQuickReplace()) {
+            //Cancel event and send message if QuickReplace
+            event.setCanceled(true);
+            EffortlessBuilding.packetHandler.sendTo(new RequestLookAtMessage(true), (EntityPlayerMP) player);
+            EffortlessBuilding.packetHandler.sendTo(new AddUndoMessage(event.getPos(), event.getBlockSnapshot().getReplacedBlock(), event.getState()), (EntityPlayerMP) player);
+        } else {
+            //NORMAL mode, let vanilla handle block placing
+            //But modifiers should still work
+
+            //Send message to client, which sends message back with raytrace info
+            EffortlessBuilding.packetHandler.sendTo(new RequestLookAtMessage(false), (EntityPlayerMP) player);
+            EffortlessBuilding.packetHandler.sendTo(new AddUndoMessage(event.getPos(), event.getBlockSnapshot().getReplacedBlock(), event.getState()), (EntityPlayerMP) player);
+        }
     }
 
     @SubscribeEvent
     public static void onBlockBroken(BlockEvent.BreakEvent event) {
-        BuildModifiers.onBlockBroken(event);
+        if (event.getWorld().isRemote) return;
+
+        //Cancel event if necessary
+        //If cant break far then dont cancel event ever
+        BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(event.getPlayer()).getBuildMode();
+        if (buildMode != BuildModes.BuildModeEnum.NORMAL && ReachHelper.canBreakFar(event.getPlayer())) {
+            event.setCanceled(true);
+        } else {
+            //NORMAL mode, let vanilla handle block breaking
+            //But modifiers should still work
+            //Dont break the original block yourself, otherwise Tinkers Hammer and Veinminer won't work
+            BuildModes.onBlockBroken(event.getPlayer(), event.getPos(), false);
+
+            //Add to undo stack in client
+            EffortlessBuilding.packetHandler.sendTo(new AddUndoMessage(event.getPos(), event.getState(), Blocks.AIR.getDefaultState()), (EntityPlayerMP) event.getPlayer());
+        }
     }
 
     @SubscribeEvent
@@ -88,6 +144,7 @@ public class EventHandler
         //EffortlessBuilding.log(player, String.valueOf(event.getNewSpeed()));
 
         float originalBlockHardness = event.getState().getBlockHardness(world, pos);
+        if (originalBlockHardness < 0) return; //Dont break bedrock
         float totalBlockHardness = 0;
         //get coordinates
         List<BlockPos> coordinates = BuildModifiers.findCoordinates(player, pos);
@@ -111,4 +168,39 @@ public class EventHandler
 
         //EffortlessBuilding.log(player, String.valueOf(event.getNewSpeed()));
     }
+
+    @SubscribeEvent
+    public static void onPlayerLoggedIn(PlayerLoggedInEvent event) {
+        EntityPlayer player = event.player;
+        ModifierSettingsManager.handleNewPlayer(player);
+        ModeSettingsManager.handleNewPlayer(player);
+    }
+
+    @SubscribeEvent
+    public static void onPlayerLoggedOut(PlayerLoggedOutEvent event) {
+        EntityPlayer player = event.player;
+        if (player.getEntityWorld().isRemote) return;
+
+        UndoRedo.clear(player);
+        EffortlessBuilding.packetHandler.sendTo(new ClearUndoMessage(), (EntityPlayerMP) player);
+    }
+
+    @SubscribeEvent
+    public static void onPlayerRespawn(PlayerRespawnEvent event) {
+        EntityPlayer player = event.player;
+        ModifierSettingsManager.handleNewPlayer(player);
+        ModeSettingsManager.handleNewPlayer(player);
+    }
+
+    @SubscribeEvent
+    public static void onPlayerChangedDimension(PlayerChangedDimensionEvent event) {
+        EntityPlayer player = event.player;
+        if (player.getEntityWorld().isRemote) return;
+
+        ModifierSettingsManager.handleNewPlayer(player);
+        ModeSettingsManager.handleNewPlayer(player);
+
+        UndoRedo.clear(player);
+        EffortlessBuilding.packetHandler.sendTo(new ClearUndoMessage(), (EntityPlayerMP) player);
+    }
 }

src/main/java/nl/requios/effortlessbuilding/buildmode/BaseBuildMode.java

@@ -0,0 +1,40 @@
+package nl.requios.effortlessbuilding.buildmode;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+
+import java.util.Dictionary;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.UUID;
+
+public abstract class BaseBuildMode implements IBuildMode {
+    //In singleplayer client and server variables are shared
+    //Split everything that needs separate values and may not be called twice in one click
+    protected Dictionary<UUID, Integer> rightClickClientTable = new Hashtable<>();
+    protected Dictionary<UUID, Integer> rightClickServerTable = new Hashtable<>();
+    protected Dictionary<UUID, BlockPos> firstPosTable = new Hashtable<>();
+    protected Dictionary<UUID, EnumFacing> sideHitTable = new Hashtable<>();
+    protected Dictionary<UUID, Vec3d> hitVecTable = new Hashtable<>();
+
+    @Override
+    public void initialize(EntityPlayer player) {
+        rightClickClientTable.put(player.getUniqueID(), 0);
+        rightClickServerTable.put(player.getUniqueID(), 0);
+        firstPosTable.put(player.getUniqueID(), BlockPos.ORIGIN);
+        sideHitTable.put(player.getUniqueID(), EnumFacing.UP);
+        hitVecTable.put(player.getUniqueID(), Vec3d.ZERO);
+    }
+
+    @Override
+    public EnumFacing getSideHit(EntityPlayer player) {
+        return sideHitTable.get(player.getUniqueID());
+    }
+
+    @Override
+    public Vec3d getHitVec(EntityPlayer player) {
+        return hitVecTable.get(player.getUniqueID());
+    }
+}

src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModes.java

@@ -0,0 +1,245 @@
+package nl.requios.effortlessbuilding.buildmode;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmode.buildmodes.*;
+import nl.requios.effortlessbuilding.buildmode.buildmodes.Circle;
+import nl.requios.effortlessbuilding.buildmode.buildmodes.Cylinder;
+import nl.requios.effortlessbuilding.buildmode.buildmodes.Sphere;
+import nl.requios.effortlessbuilding.buildmodifier.*;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+import nl.requios.effortlessbuilding.helper.SurvivalHelper;
+import nl.requios.effortlessbuilding.network.BlockBrokenMessage;
+import nl.requios.effortlessbuilding.network.BlockPlacedMessage;
+
+import java.util.ArrayList;
+import java.util.Dictionary;
+import java.util.Hashtable;
+import java.util.List;
+
+import static nl.requios.effortlessbuilding.buildmode.ModeOptions.*;
+
+public class BuildModes {
+
+    //Static variables are shared between client and server in singleplayer
+    //We need them separate
+    public static Dictionary<EntityPlayer, Boolean> currentlyBreakingClient = new Hashtable<>();
+    public static Dictionary<EntityPlayer, Boolean> currentlyBreakingServer = new Hashtable<>();
+
+    public enum BuildModeEnum {
+        NORMAL("effortlessbuilding.mode.normal", new Normal()),
+        NORMAL_PLUS("effortlessbuilding.mode.normal_plus", new NormalPlus(), OptionEnum.BUILD_SPEED),
+        LINE("effortlessbuilding.mode.line", new Line() /*, OptionEnum.THICKNESS*/),
+        WALL("effortlessbuilding.mode.wall", new Wall(), OptionEnum.FILL),
+        FLOOR("effortlessbuilding.mode.floor", new Floor(), OptionEnum.FILL),
+        DIAGONAL_LINE("effortlessbuilding.mode.diagonal_line", new DiagonalLine() /*, OptionEnum.THICKNESS*/),
+        DIAGONAL_WALL("effortlessbuilding.mode.diagonal_wall", new DiagonalWall() /*, OptionEnum.FILL*/),
+        SLOPE_FLOOR("effortlessbuilding.mode.slope_floor", new SlopeFloor(), OptionEnum.RAISED_EDGE),
+        CIRCLE("effortlessbuilding.mode.circle", new Circle(), OptionEnum.CIRCLE_START, OptionEnum.FILL),
+        CYLINDER("effortlessbuilding.mode.cylinder", new Cylinder(), OptionEnum.CIRCLE_START, OptionEnum.FILL),
+        SPHERE("effortlessbuilding.mode.sphere", new Sphere(), OptionEnum.CIRCLE_START, OptionEnum.FILL),
+        CUBE("effortlessbuilding.mode.cube", new Cube(), OptionEnum.CUBE_FILL);
+
+        public String name;
+        public IBuildMode instance;
+        public OptionEnum[] options;
+
+        BuildModeEnum(String name, IBuildMode instance, OptionEnum... options) {
+            this.name = name;
+            this.instance = instance;
+            this.options = options;
+        }
+    }
+
+    //Uses a network message to get the previous raytraceresult from the player
+    //The server could keep track of all raytraceresults but this might lag with many players
+    //Raytraceresult is needed for sideHit and hitVec
+    public static void onBlockPlacedMessage(EntityPlayer player, BlockPlacedMessage message) {
+
+        //Check if not in the middle of breaking
+        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
+        if (currentlyBreaking.get(player) != null && currentlyBreaking.get(player)) {
+            //Cancel breaking
+            initializeMode(player);
+            return;
+        }
+
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+        ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
+        BuildModeEnum buildMode = modeSettings.getBuildMode();
+
+        BlockPos startPos = null;
+
+        if (message.isBlockHit() && message.getBlockPos() != null) {
+            startPos = message.getBlockPos();
+
+            //Offset in direction of sidehit if not quickreplace and not replaceable
+            boolean replaceable = player.world.getBlockState(startPos).getBlock().isReplaceable(player.world, startPos);
+            boolean becomesDoubleSlab = SurvivalHelper.doesBecomeDoubleSlab(player, startPos, message.getSideHit());
+            if (!modifierSettings.doQuickReplace() && !replaceable && !becomesDoubleSlab) {
+                startPos = startPos.offset(message.getSideHit());
+            }
+
+            //Get under tall grass and other replaceable blocks
+            if (modifierSettings.doQuickReplace() && replaceable) {
+                startPos = startPos.down();
+            }
+
+            //Check if player reach does not exceed startpos
+            int maxReach = ReachHelper.getMaxReach(player);
+            if (buildMode != BuildModeEnum.NORMAL && player.getPosition().distanceSq(startPos) > maxReach * maxReach) {
+                EffortlessBuilding.log(player, "Placement exceeds your reach.");
+                return;
+            }
+        }
+
+        //Even when no starting block is found, call buildmode instance
+        //We might want to place things in the air
+        List<BlockPos> coordinates = buildMode.instance.onRightClick(player, startPos, message.getSideHit(), message.getHitVec(), modifierSettings.doQuickReplace());
+
+        if (coordinates.isEmpty()) {
+            currentlyBreaking.put(player, false);
+            return;
+        }
+
+        //Limit number of blocks you can place
+        int limit = ReachHelper.getMaxBlocksPlacedAtOnce(player);
+        if (coordinates.size() > limit) {
+            coordinates = coordinates.subList(0, limit);
+        }
+
+        EnumFacing sideHit = buildMode.instance.getSideHit(player);
+        if (sideHit == null) sideHit = message.getSideHit();
+
+        Vec3d hitVec = buildMode.instance.getHitVec(player);
+        if (hitVec == null) hitVec = message.getHitVec();
+
+        BuildModifiers.onBlockPlaced(player, coordinates, sideHit, hitVec, message.getPlaceStartPos());
+
+        //Only works when finishing a buildmode is equal to placing some blocks
+        //No intermediate blocks allowed
+        currentlyBreaking.remove(player);
+
+    }
+
+    //Use a network message to break blocks in the distance using clientside mouse input
+    public static void onBlockBrokenMessage(EntityPlayer player, BlockBrokenMessage message) {
+        BlockPos startPos = message.isBlockHit() ? message.getBlockPos() : null;
+        onBlockBroken(player, startPos, true);
+    }
+
+    public static void onBlockBroken(EntityPlayer player, BlockPos startPos, boolean breakStartPos) {
+
+        //Check if not in the middle of placing
+        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
+        if (currentlyBreaking.get(player) != null && !currentlyBreaking.get(player)) {
+            //Cancel placing
+            initializeMode(player);
+            return;
+        }
+
+        //If first click
+        if (currentlyBreaking.get(player) == null) {
+            //If startpos is null, dont do anything
+            if (startPos == null) return;
+        }
+
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+        ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
+
+        //Get coordinates
+        BuildModeEnum buildMode = modeSettings.getBuildMode();
+        List<BlockPos> coordinates = buildMode.instance.onRightClick(player, startPos, EnumFacing.UP, Vec3d.ZERO, true);
+
+        if (coordinates.isEmpty()) {
+            currentlyBreaking.put(player, true);
+            return;
+        }
+
+        //Let buildmodifiers break blocks
+        BuildModifiers.onBlockBroken(player, coordinates, breakStartPos);
+
+        //Only works when finishing a buildmode is equal to breaking some blocks
+        //No intermediate blocks allowed
+        currentlyBreaking.remove(player);
+    }
+
+    public static List<BlockPos> findCoordinates(EntityPlayer player, BlockPos startPos, boolean skipRaytrace) {
+        List<BlockPos> coordinates = new ArrayList<>();
+
+        ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
+        coordinates.addAll(modeSettings.getBuildMode().instance.findCoordinates(player, startPos, skipRaytrace));
+
+        return coordinates;
+    }
+
+    public static void initializeMode(EntityPlayer player) {
+        //Resetting mode, so not placing or breaking
+        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
+        currentlyBreaking.remove(player);
+
+        ModeSettingsManager.getModeSettings(player).getBuildMode().instance.initialize(player);
+    }
+
+    public static boolean isCurrentlyPlacing(EntityPlayer player) {
+        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
+        return currentlyBreaking.get(player) != null && !currentlyBreaking.get(player);
+    }
+
+    public static boolean isCurrentlyBreaking(EntityPlayer player) {
+        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
+        return currentlyBreaking.get(player) != null && currentlyBreaking.get(player);
+    }
+
+    //Either placing or breaking
+    public static boolean isActive(EntityPlayer player) {
+        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
+        return currentlyBreaking.get(player) != null;
+    }
+
+
+    //Find coordinates on a line bound by a plane
+    public static Vec3d findXBound(double x, Vec3d start, Vec3d look) {
+        //then y and z are
+        double y = (x - start.x) / look.x * look.y + start.y;
+        double z = (x - start.x) / look.x * look.z + start.z;
+
+        return new Vec3d(x, y, z);
+    }
+
+    public static Vec3d findYBound(double y, Vec3d start, Vec3d look) {
+        //then x and z are
+        double x = (y - start.y) / look.y * look.x + start.x;
+        double z = (y - start.y) / look.y * look.z + start.z;
+
+        return new Vec3d(x, y, z);
+    }
+
+    public static Vec3d findZBound(double z, Vec3d start, Vec3d look) {
+        //then x and y are
+        double x = (z - start.z) / look.z * look.x + start.x;
+        double y = (z - start.z) / look.z * look.y + start.y;
+
+        return new Vec3d(x, y, z);
+    }
+
+    public static boolean isCriteriaValid(Vec3d start, Vec3d look, int reach, EntityPlayer player, boolean skipRaytrace, Vec3d lineBound, Vec3d planeBound, double distToPlayerSq) {
+        boolean intersects = false;
+        if (!skipRaytrace) {
+            //collision within a 1 block radius to selected is fine
+            RayTraceResult rayTraceResult = player.world.rayTraceBlocks(start, lineBound, false, true, false);
+            intersects = rayTraceResult != null && rayTraceResult.typeOfHit == RayTraceResult.Type.BLOCK &&
+                         planeBound.subtract(rayTraceResult.hitVec).lengthSquared() > 4;
+        }
+
+        return planeBound.subtract(start).dotProduct(look) > 0 &&
+               distToPlayerSq > 2 && distToPlayerSq < reach * reach &&
+               !intersects;
+    }
+
+}

src/main/java/nl/requios/effortlessbuilding/buildmode/IBuildMode.java

@@ -0,0 +1,25 @@
+package nl.requios.effortlessbuilding.buildmode;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+
+import java.util.List;
+
+public interface IBuildMode {
+
+    //Fired when a player selects a buildmode and when it needs to initializeMode
+    void initialize(EntityPlayer player);
+
+    //Fired when a block would be placed
+    //Return a list of coordinates where you want to place blocks
+    List<BlockPos> onRightClick(EntityPlayer player, BlockPos blockPos, EnumFacing sideHit, Vec3d hitVec, boolean skipRaytrace);
+
+    //Fired continuously for visualization purposes
+    List<BlockPos> findCoordinates(EntityPlayer player, BlockPos blockPos, boolean skipRaytrace);
+
+    EnumFacing getSideHit(EntityPlayer player);
+
+    Vec3d getHitVec(EntityPlayer player);
+}

src/main/java/nl/requios/effortlessbuilding/buildmode/ModeOptions.java

@@ -0,0 +1,182 @@
+package nl.requios.effortlessbuilding.buildmode;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.text.TextFormatting;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
+import nl.requios.effortlessbuilding.proxy.ClientProxy;
+
+public class ModeOptions {
+
+    public enum ActionEnum {
+        UNDO("effortlessbuilding.action.undo"),
+        REDO("effortlessbuilding.action.redo"),
+        REPLACE("effortlessbuilding.action.replace"),
+        OPEN_MODIFIER_SETTINGS("effortlessbuilding.action.open_modifier_settings"),
+
+        NORMAL_SPEED("effortlessbuilding.action.normal_speed"),
+        FAST_SPEED("effortlessbuilding.action.fast_speed"),
+
+        FULL("effortlessbuilding.action.full"),
+        HOLLOW("effortlessbuilding.action.hollow"),
+
+        CUBE_FULL("effortlessbuilding.action.full"),
+        CUBE_HOLLOW("effortlessbuilding.action.hollow"),
+        CUBE_SKELETON("effortlessbuilding.action.skeleton"),
+
+        SHORT_EDGE("effortlessbuilding.action.short_edge"),
+        LONG_EDGE("effortlessbuilding.action.long_edge"),
+
+        THICKNESS_1("effortlessbuilding.action.thickness_1"),
+        THICKNESS_3("effortlessbuilding.action.thickness_3"),
+        THICKNESS_5("effortlessbuilding.action.thickness_5"),
+
+        CIRCLE_START_CORNER("effortlessbuilding.action.start_corner"),
+        CIRCLE_START_CENTER("effortlessbuilding.action.start_center");
+
+        public String name;
+
+        ActionEnum(String name) {
+            this.name = name;
+        }
+    }
+
+    public enum OptionEnum {
+        BUILD_SPEED("effortlessbuilding.action.build_speed", ActionEnum.NORMAL_SPEED, ActionEnum.FAST_SPEED),
+        FILL("effortlessbuilding.action.filling", ActionEnum.FULL, ActionEnum.HOLLOW),
+        CUBE_FILL("effortlessbuilding.action.filling", ActionEnum.CUBE_FULL, ActionEnum.CUBE_HOLLOW, ActionEnum.CUBE_SKELETON),
+        RAISED_EDGE("effortlessbuilding.action.raised_edge", ActionEnum.SHORT_EDGE, ActionEnum.LONG_EDGE),
+        LINE_THICKNESS("effortlessbuilding.action.thickness", ActionEnum.THICKNESS_1, ActionEnum.THICKNESS_3, ActionEnum.THICKNESS_5),
+        CIRCLE_START("effortlessbuilding.action.circle_start", ActionEnum.CIRCLE_START_CORNER, ActionEnum.CIRCLE_START_CENTER);
+
+        public String name;
+        public ActionEnum[] actions;
+
+        OptionEnum(String name, ActionEnum... actions){
+            this.name = name;
+            this.actions = actions;
+        }
+    }
+
+    private static ActionEnum buildSpeed = ActionEnum.NORMAL_SPEED;
+    private static ActionEnum fill = ActionEnum.FULL;
+    private static ActionEnum cubeFill = ActionEnum.CUBE_FULL;
+    private static ActionEnum raisedEdge = ActionEnum.SHORT_EDGE;
+    private static ActionEnum lineThickness = ActionEnum.THICKNESS_1;
+    private static ActionEnum circleStart = ActionEnum.CIRCLE_START_CORNER;
+
+    public static ActionEnum getOptionSetting(OptionEnum option) {
+        switch (option) {
+            case BUILD_SPEED:
+                return getBuildSpeed();
+            case FILL:
+                return getFill();
+            case CUBE_FILL:
+                return getCubeFill();
+            case RAISED_EDGE:
+                return getRaisedEdge();
+            case LINE_THICKNESS:
+                return getLineThickness();
+            case CIRCLE_START:
+                return getCircleStart();
+            default:
+                return null;
+        }
+    }
+
+    public static ActionEnum getBuildSpeed() {
+        return buildSpeed;
+    }
+
+    public static ActionEnum getFill() {
+        return fill;
+    }
+
+    public static ActionEnum getCubeFill() {
+        return cubeFill;
+    }
+
+    public static ActionEnum getRaisedEdge() {
+        return raisedEdge;
+    }
+
+    public static ActionEnum getLineThickness() {
+        return lineThickness;
+    }
+
+    public static ActionEnum getCircleStart() {
+        return circleStart;
+    }
+
+    //Called on both client and server
+    public static void performAction(EntityPlayer player, ActionEnum action) {
+        if (action == null) return;
+
+        switch (action) {
+            case UNDO:
+                UndoRedo.undo(player);
+                break;
+            case REDO:
+                UndoRedo.redo(player);
+                break;
+            case REPLACE:
+                ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+                modifierSettings.setQuickReplace(!modifierSettings.doQuickReplace());
+                EffortlessBuilding.log(player, "Set " + TextFormatting.GOLD + "Quick Replace " + TextFormatting.RESET + (
+                        modifierSettings.doQuickReplace() ? "on" : "off"), true);
+                break;
+            case OPEN_MODIFIER_SETTINGS:
+                if (player.world.isRemote)
+                    ClientProxy.openModifierSettings();
+                break;
+
+            case NORMAL_SPEED:
+                buildSpeed = ActionEnum.NORMAL_SPEED;
+                break;
+            case FAST_SPEED:
+                buildSpeed = ActionEnum.FAST_SPEED;
+                break;
+            case FULL:
+                fill = ActionEnum.FULL;
+                break;
+            case HOLLOW:
+                fill = ActionEnum.HOLLOW;
+                break;
+            case CUBE_FULL:
+                cubeFill = ActionEnum.CUBE_FULL;
+                break;
+            case CUBE_HOLLOW:
+                cubeFill = ActionEnum.CUBE_HOLLOW;
+                break;
+            case CUBE_SKELETON:
+                cubeFill = ActionEnum.CUBE_SKELETON;
+                break;
+            case SHORT_EDGE:
+                raisedEdge = ActionEnum.SHORT_EDGE;
+                break;
+            case LONG_EDGE:
+                raisedEdge = ActionEnum.LONG_EDGE;
+                break;
+            case THICKNESS_1:
+                lineThickness = ActionEnum.THICKNESS_1;
+                break;
+            case THICKNESS_3:
+                lineThickness = ActionEnum.THICKNESS_3;
+                break;
+            case THICKNESS_5:
+                lineThickness = ActionEnum.THICKNESS_5;
+                break;
+            case CIRCLE_START_CENTER:
+                circleStart = ActionEnum.CIRCLE_START_CENTER;
+                break;
+            case CIRCLE_START_CORNER:
+                circleStart = ActionEnum.CIRCLE_START_CORNER;
+                break;
+        }
+
+        if (player.world.isRemote && action != ActionEnum.REPLACE && action != ActionEnum.OPEN_MODIFIER_SETTINGS) {
+            ClientProxy.logTranslate(action.name);
+        }
+    }
+}

src/main/java/nl/requios/effortlessbuilding/buildmode/ModeSettingsManager.java

@@ -0,0 +1,86 @@
+package nl.requios.effortlessbuilding.buildmode;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraftforge.fml.common.Mod;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.capability.ModeCapabilityManager;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+import nl.requios.effortlessbuilding.network.ModeSettingsMessage;
+
+@Mod.EventBusSubscriber
+public class ModeSettingsManager {
+
+    //Retrieves the buildsettings of a player through the modifierCapability capability
+    //Never returns null
+    public static ModeSettings getModeSettings(EntityPlayer player) {
+        if (player.hasCapability(ModeCapabilityManager.modeCapability, null)) {
+            ModeCapabilityManager.IModeCapability capability = player.getCapability(
+                    ModeCapabilityManager.modeCapability, null);
+            if (capability.getModeData() == null) {
+                capability.setModeData(new ModeSettings());
+            }
+            return capability.getModeData();
+        }
+        throw new IllegalArgumentException("Player does not have modeCapability capability");
+    }
+
+    public static void setModeSettings(EntityPlayer player, ModeSettings modeSettings) {
+        if (player == null) {
+            EffortlessBuilding.log("Cannot set buildsettings, player is null");
+            return;
+        }
+        if (player.hasCapability(ModeCapabilityManager.modeCapability, null)) {
+            ModeCapabilityManager.IModeCapability capability = player.getCapability(
+                    ModeCapabilityManager.modeCapability, null);
+
+            capability.setModeData(modeSettings);
+
+            //Initialize new mode
+            BuildModes.initializeMode(player);
+        } else {
+            EffortlessBuilding.log(player, "Saving buildsettings failed.");
+        }
+    }
+
+    public static String sanitize(ModeSettings modeSettings, EntityPlayer player) {
+        int maxReach = ReachHelper.getMaxReach(player);
+        String error = "";
+
+        //TODO sanitize
+
+        return error;
+    }
+
+    public static class ModeSettings {
+        private BuildModes.BuildModeEnum buildMode = BuildModes.BuildModeEnum.NORMAL;
+
+        public ModeSettings() {
+        }
+
+        public ModeSettings(BuildModes.BuildModeEnum buildMode) {
+            this.buildMode = buildMode;
+        }
+
+        public BuildModes.BuildModeEnum getBuildMode() {
+            return this.buildMode;
+        }
+
+        public void setBuildMode(BuildModes.BuildModeEnum buildMode) {
+            this.buildMode = buildMode;
+        }
+    }
+
+    public static void handleNewPlayer(EntityPlayer player){
+        if (getModeSettings(player) == null) {
+            setModeSettings(player, new ModeSettings());
+        }
+
+        //Only on server
+        if (!player.world.isRemote) {
+            //Send to client
+            ModeSettingsMessage msg = new ModeSettingsMessage(getModeSettings(player));
+            EffortlessBuilding.packetHandler.sendTo(msg, (EntityPlayerMP) player);
+        }
+    }
+}

src/main/java/nl/requios/effortlessbuilding/buildmode/ThreeClicksBuildMode.java

@@ -0,0 +1,215 @@
+package nl.requios.effortlessbuilding.buildmode;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.buildmode.buildmodes.DiagonalLine;
+import nl.requios.effortlessbuilding.buildmode.buildmodes.Floor;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+
+import java.util.*;
+
+public abstract class ThreeClicksBuildMode extends BaseBuildMode {
+    protected Dictionary<UUID, BlockPos> secondPosTable = new Hashtable<>();
+
+    static class HeightCriteria {
+        Vec3d planeBound;
+        Vec3d lineBound;
+        double distToLineSq;
+        double distToPlayerSq;
+
+        HeightCriteria(Vec3d planeBound, BlockPos secondPos, Vec3d start) {
+            this.planeBound = planeBound;
+            this.lineBound = toLongestLine(this.planeBound, secondPos);
+            this.distToLineSq = this.lineBound.subtract(this.planeBound).lengthSquared();
+            this.distToPlayerSq = this.planeBound.subtract(start).lengthSquared();
+        }
+
+        //Make it from a plane into a line, on y axis only
+        private Vec3d toLongestLine(Vec3d boundVec, BlockPos secondPos) {
+            BlockPos bound = new BlockPos(boundVec);
+            return new Vec3d(secondPos.getX(), bound.getY(), secondPos.getZ());
+        }
+
+        //check if its not behind the player and its not too close and not too far
+        //also check if raytrace from player to block does not intersect blocks
+        public boolean isValid(Vec3d start, Vec3d look, int reach, EntityPlayer player, boolean skipRaytrace) {
+
+            return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, lineBound, planeBound, distToPlayerSq);
+        }
+    }
+
+    @Override
+    public void initialize(EntityPlayer player) {
+        super.initialize(player);
+        secondPosTable.put(player.getUniqueID(), BlockPos.ORIGIN);
+    }
+
+    @Override
+    public List<BlockPos> onRightClick(EntityPlayer player, BlockPos blockPos, EnumFacing sideHit, Vec3d hitVec, boolean skipRaytrace) {
+        List<BlockPos> list = new ArrayList<>();
+
+        Dictionary<UUID, Integer> rightClickTable = player.world.isRemote ? rightClickClientTable : rightClickServerTable;
+        int rightClickNr = rightClickTable.get(player.getUniqueID());
+        rightClickNr++;
+        rightClickTable.put(player.getUniqueID(), rightClickNr);
+
+        if (rightClickNr == 1) {
+            //If clicking in air, reset and try again
+            if (blockPos == null) {
+                rightClickTable.put(player.getUniqueID(), 0);
+                return list;
+            }
+
+            //First click, remember starting position
+            firstPosTable.put(player.getUniqueID(), blockPos);
+            sideHitTable.put(player.getUniqueID(), sideHit);
+            hitVecTable.put(player.getUniqueID(), hitVec);
+            //Keep list empty, dont place any blocks yet
+        } else if (rightClickNr == 2) {
+            //Second click, find other floor point
+            BlockPos firstPos = firstPosTable.get(player.getUniqueID());
+            BlockPos secondPos = findSecondPos(player, firstPos, true);
+
+            if (secondPos == null) {
+                rightClickTable.put(player.getUniqueID(), 1);
+                return list;
+            }
+
+            secondPosTable.put(player.getUniqueID(), secondPos);
+
+        } else {
+            //Third click, place diagonal wall with height
+            list = findCoordinates(player, blockPos, skipRaytrace);
+            rightClickTable.put(player.getUniqueID(), 0);
+        }
+
+        return list;
+    }
+
+    @Override
+    public List<BlockPos> findCoordinates(EntityPlayer player, BlockPos blockPos, boolean skipRaytrace) {
+        List<BlockPos> list = new ArrayList<>();
+        Dictionary<UUID, Integer> rightClickTable = player.world.isRemote ? rightClickClientTable : rightClickServerTable;
+        int rightClickNr = rightClickTable.get(player.getUniqueID());
+
+        if (rightClickNr == 0) {
+            if (blockPos != null)
+                list.add(blockPos);
+        } else if (rightClickNr == 1) {
+            BlockPos firstPos = firstPosTable.get(player.getUniqueID());
+
+            BlockPos secondPos = findSecondPos(player, firstPos, true);
+            if (secondPos == null) return list;
+
+            //Limit amount of blocks you can place per row
+            int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
+
+            int x1 = firstPos.getX(), x2 = secondPos.getX();
+            int y1 = firstPos.getY(), y2 = secondPos.getY();
+            int z1 = firstPos.getZ(), z2 = secondPos.getZ();
+
+            //limit axis
+            if (x2 - x1 >= axisLimit) x2 = x1 + axisLimit - 1;
+            if (x1 - x2 >= axisLimit) x2 = x1 - axisLimit + 1;
+            if (y2 - y1 >= axisLimit) y2 = y1 + axisLimit - 1;
+            if (y1 - y2 >= axisLimit) y2 = y1 - axisLimit + 1;
+            if (z2 - z1 >= axisLimit) z2 = z1 + axisLimit - 1;
+            if (z1 - z2 >= axisLimit) z2 = z1 - axisLimit + 1;
+
+            //Add diagonal line from first to second
+            list.addAll(getIntermediateBlocks(player, x1, y1, z1, x2, y2, z2));
+
+        } else {
+            BlockPos firstPos = firstPosTable.get(player.getUniqueID());
+            BlockPos secondPos = secondPosTable.get(player.getUniqueID());
+
+            BlockPos thirdPos = findThirdPos(player, firstPos, secondPos, skipRaytrace);
+            if (thirdPos == null) return list;
+
+            //Limit amount of blocks you can place per row
+            int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
+
+            int x1 = firstPos.getX(), x2 = secondPos.getX(), x3 = thirdPos.getX();
+            int y1 = firstPos.getY(), y2 = secondPos.getY(), y3 = thirdPos.getY();
+            int z1 = firstPos.getZ(), z2 = secondPos.getZ(), z3 = thirdPos.getZ();
+
+            //limit axis
+            if (x2 - x1 >= axisLimit) x2 = x1 + axisLimit - 1;
+            if (x1 - x2 >= axisLimit) x2 = x1 - axisLimit + 1;
+            if (y2 - y1 >= axisLimit) y2 = y1 + axisLimit - 1;
+            if (y1 - y2 >= axisLimit) y2 = y1 - axisLimit + 1;
+            if (z2 - z1 >= axisLimit) z2 = z1 + axisLimit - 1;
+            if (z1 - z2 >= axisLimit) z2 = z1 - axisLimit + 1;
+
+            if (x3 - x1 >= axisLimit) x3 = x1 + axisLimit - 1;
+            if (x1 - x3 >= axisLimit) x3 = x1 - axisLimit + 1;
+            if (y3 - y1 >= axisLimit) y3 = y1 + axisLimit - 1;
+            if (y1 - y3 >= axisLimit) y3 = y1 - axisLimit + 1;
+            if (z3 - z1 >= axisLimit) z3 = z1 + axisLimit - 1;
+            if (z1 - z3 >= axisLimit) z3 = z1 - axisLimit + 1;
+
+            //Add diagonal line from first to third
+            list.addAll(getFinalBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3));
+        }
+
+        return list;
+    }
+
+    //Finds the place of the second block pos
+    protected abstract BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace);
+
+    //Finds the place of the third block pos
+    protected abstract BlockPos findThirdPos(EntityPlayer player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace);
+
+    //After first and second pos are known, we want to visualize the blocks in a way (like floor for cube)
+    protected abstract List<BlockPos> getIntermediateBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2);
+
+    //After first, second and third pos are known, we want all the blocks
+    protected abstract List<BlockPos> getFinalBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3);
+
+    //Finds height after floor has been chosen in buildmodes with 3 clicks
+    public static BlockPos findHeight(EntityPlayer player, BlockPos secondPos, boolean skipRaytrace) {
+        Vec3d look = player.getLookVec();
+        Vec3d start = new Vec3d(player.posX, player.posY + player.getEyeHeight(), player.posZ);
+
+        List<HeightCriteria> criteriaList = new ArrayList<>(3);
+
+        //X
+        Vec3d xBound = BuildModes.findXBound(secondPos.getX(), start, look);
+        criteriaList.add(new HeightCriteria(xBound, secondPos, start));
+
+        //Z
+        Vec3d zBound = BuildModes.findZBound(secondPos.getZ(), start, look);
+        criteriaList.add(new HeightCriteria(zBound, secondPos, start));
+
+        //Remove invalid criteria
+        int reach = ReachHelper.getPlacementReach(player) * 4; //4 times as much as normal placement reach
+        criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
+
+        //If none are valid, return empty list of blocks
+        if (criteriaList.isEmpty()) return null;
+
+        //If only 1 is valid, choose that one
+        HeightCriteria selected = criteriaList.get(0);
+
+        //If multiple are valid, choose based on criteria
+        if (criteriaList.size() > 1) {
+            //Select the one that is closest (from wall position to its line counterpart)
+            for (int i = 1; i < criteriaList.size(); i++) {
+                HeightCriteria criteria = criteriaList.get(i);
+                if (criteria.distToLineSq < 2.0 && selected.distToLineSq < 2.0) {
+                    //Both very close to line, choose closest to player
+                    if (criteria.distToPlayerSq < selected.distToPlayerSq)
+                        selected = criteria;
+                } else {
+                    //Pick closest to line
+                    if (criteria.distToLineSq < selected.distToLineSq)
+                        selected = criteria;
+                }
+            }
+        }
+        return new BlockPos(selected.lineBound);
+    }
+}

src/main/java/nl/requios/effortlessbuilding/buildmode/TwoClicksBuildMode.java

@@ -0,0 +1,86 @@
+package nl.requios.effortlessbuilding.buildmode;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+
+import java.util.ArrayList;
+import java.util.Dictionary;
+import java.util.List;
+import java.util.UUID;
+
+public abstract class TwoClicksBuildMode extends BaseBuildMode {
+
+    @Override
+    public List<BlockPos> onRightClick(EntityPlayer player, BlockPos blockPos, EnumFacing sideHit, Vec3d hitVec, boolean skipRaytrace) {
+        List<BlockPos> list = new ArrayList<>();
+
+        Dictionary<UUID, Integer> rightClickTable = player.world.isRemote ? rightClickClientTable : rightClickServerTable;
+        int rightClickNr = rightClickTable.get(player.getUniqueID());
+        rightClickNr++;
+        rightClickTable.put(player.getUniqueID(), rightClickNr);
+
+        if (rightClickNr == 1) {
+            //If clicking in air, reset and try again
+            if (blockPos == null) {
+                rightClickTable.put(player.getUniqueID(), 0);
+                return list;
+            }
+
+            //First click, remember starting position
+            firstPosTable.put(player.getUniqueID(), blockPos);
+            sideHitTable.put(player.getUniqueID(), sideHit);
+            hitVecTable.put(player.getUniqueID(), hitVec);
+            //Keep list empty, dont place any blocks yet
+        } else {
+            //Second click, place blocks
+            list = findCoordinates(player, blockPos, skipRaytrace);
+            rightClickTable.put(player.getUniqueID(), 0);
+        }
+
+        return list;
+    }
+
+    @Override
+    public List<BlockPos> findCoordinates(EntityPlayer player, BlockPos blockPos, boolean skipRaytrace) {
+        List<BlockPos> list = new ArrayList<>();
+        Dictionary<UUID, Integer> rightClickTable = player.world.isRemote ? rightClickClientTable : rightClickServerTable;
+        int rightClickNr = rightClickTable.get(player.getUniqueID());
+        BlockPos firstPos = firstPosTable.get(player.getUniqueID());
+
+        if (rightClickNr == 0) {
+            if (blockPos != null)
+                list.add(blockPos);
+        } else {
+            BlockPos secondPos = findSecondPos(player, firstPos, skipRaytrace);
+            if (secondPos == null) return list;
+
+            //Limit amount of blocks we can place per row
+            int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
+
+            int x1 = firstPos.getX(), x2 = secondPos.getX();
+            int y1 = firstPos.getY(), y2 = secondPos.getY();
+            int z1 = firstPos.getZ(), z2 = secondPos.getZ();
+
+            //limit axis
+            if (x2 - x1 >= axisLimit) x2 = x1 + axisLimit - 1;
+            if (x1 - x2 >= axisLimit) x2 = x1 - axisLimit + 1;
+            if (y2 - y1 >= axisLimit) y2 = y1 + axisLimit - 1;
+            if (y1 - y2 >= axisLimit) y2 = y1 - axisLimit + 1;
+            if (z2 - z1 >= axisLimit) z2 = z1 + axisLimit - 1;
+            if (z1 - z2 >= axisLimit) z2 = z1 - axisLimit + 1;
+
+            list.addAll(getAllBlocks(player, x1, y1, z1, x2, y2, z2));
+        }
+
+        return list;
+    }
+
+    //Finds the place of the second block pos based on criteria (floor must be on same height as first click, wall on same plane etc)
+    protected abstract BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace);
+
+    //After first and second pos are known, we want all the blocks
+    protected abstract List<BlockPos> getAllBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2);
+}

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Circle.java

@@ -0,0 +1,88 @@
+package nl.requios.effortlessbuilding.buildmode.buildmodes;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
+import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions;
+
+import java.util.*;
+
+public class Circle extends TwoClicksBuildMode {
+
+    @Override
+    protected BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        return Floor.findFloor(player, firstPos, skipRaytrace);
+    }
+
+    @Override
+    protected List<BlockPos> getAllBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        return getCircleBlocks(player, x1, y1, z1, x2, y2, z2);
+    }
+
+    public static List<BlockPos> getCircleBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        List<BlockPos> list = new ArrayList<>();
+
+        float centerX = x1;
+        float centerZ = z1;
+
+        //Adjust for CIRCLE_START
+        if (ModeOptions.getCircleStart() == ModeOptions.ActionEnum.CIRCLE_START_CORNER) {
+            centerX = x1 + (x2 - x1) / 2f;
+            centerZ = z1 + (z2 - z1) / 2f;
+        } else {
+            x1 = (int) (centerX - (x2 - centerX));
+            z1 = (int) (centerZ - (z2 - centerZ));
+        }
+
+        float radiusX = MathHelper.abs(x2 - centerX);
+        float radiusZ = MathHelper.abs(z2 - centerZ);
+
+        if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
+            addCircleBlocks(list, x1, y1, z1, x2, y2, z2, centerX, centerZ, radiusX, radiusZ);
+        else
+            addHollowCircleBlocks(list, x1, y1, z1, x2, y2, z2, centerX, centerZ, radiusX, radiusZ);
+
+        return list;
+    }
+
+    public static void addCircleBlocks(List<BlockPos> list, int x1, int y1, int z1, int x2, int y2, int z2, float centerX, float centerZ, float radiusX, float radiusZ) {
+
+        for (int l = x1; x1 < x2 ? l <= x2 : l >= x2; l += x1 < x2 ? 1 : -1) {
+
+            for (int n = z1; z1 < z2 ? n <= z2 : n >= z2; n += z1 < z2 ? 1 : -1) {
+
+                float distance = distance(l, n, centerX, centerZ);
+                float radius = calculateEllipseRadius(centerX, centerZ, radiusX, radiusZ, l, n);
+                if (distance < radius + 0.4f)
+                    list.add(new BlockPos(l, y1, n));
+            }
+        }
+    }
+
+    public static void addHollowCircleBlocks(List<BlockPos> list, int x1, int y1, int z1, int x2, int y2, int z2, float centerX, float centerZ, float radiusX, float radiusZ) {
+
+        for (int l = x1; x1 < x2 ? l <= x2 : l >= x2; l += x1 < x2 ? 1 : -1) {
+
+            for (int n = z1; z1 < z2 ? n <= z2 : n >= z2; n += z1 < z2 ? 1 : -1) {
+
+                float distance = distance(l, n, centerX, centerZ);
+                float radius = calculateEllipseRadius(centerX, centerZ, radiusX, radiusZ, l, n);
+                if (distance < radius + 0.4f && distance > radius - 0.6f)
+                    list.add(new BlockPos(l, y1, n));
+            }
+        }
+    }
+
+    private static float distance(float x1, float z1, float x2, float z2) {
+        return MathHelper.sqrt((x2 - x1) * (x2 - x1) + (z2 - z1) * (z2 - z1));
+    }
+
+    public static float calculateEllipseRadius(float centerX, float centerZ, float radiusX, float radiusZ, int x, int z) {
+        //https://math.stackexchange.com/questions/432902/how-to-get-the-radius-of-an-ellipse-at-a-specific-angle-by-knowing-its-semi-majo
+        float theta = (float) MathHelper.atan2(z - centerZ, x - centerX);
+        float part1 = radiusX * radiusX * MathHelper.sin(theta) * MathHelper.sin(theta);
+        float part2 = radiusZ * radiusZ * MathHelper.cos(theta) * MathHelper.cos(theta);
+        return radiusX * radiusZ / MathHelper.sqrt(part1 + part2);
+    }
+}

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Cube.java

@@ -0,0 +1,104 @@
+package nl.requios.effortlessbuilding.buildmode.buildmodes;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.buildmode.IBuildMode;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions;
+import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+
+import java.util.*;
+
+public class Cube extends ThreeClicksBuildMode {
+
+    @Override
+    protected BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        return Floor.findFloor(player, firstPos, skipRaytrace);
+    }
+
+    @Override
+    protected BlockPos findThirdPos(EntityPlayer player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+        return findHeight(player, secondPos, skipRaytrace);
+    }
+
+    @Override
+    protected List<BlockPos> getIntermediateBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        return getFloorBlocksUsingCubeFill(player, x1, y1, z1, x2, y2, z2);
+    }
+
+    @Override
+    protected List<BlockPos> getFinalBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
+        return getCubeBlocks(player, x1, y1, z1, x3, y3, z3);
+    }
+
+    public static List<BlockPos> getFloorBlocksUsingCubeFill(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        List<BlockPos> list = new ArrayList<>();
+
+        if (ModeOptions.getCubeFill() == ModeOptions.ActionEnum.CUBE_SKELETON)
+            Floor.addHollowFloorBlocks(list, x1, x2, y1, z1, z2);
+        else
+            Floor.addFloorBlocks(list, x1, x2, y1, z1, z2);
+
+        return list;
+    }
+
+    public static List<BlockPos> getCubeBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        List<BlockPos> list = new ArrayList<>();
+
+        switch (ModeOptions.getCubeFill()) {
+            case CUBE_FULL:
+                addCubeBlocks(list, x1, x2, y1, y2, z1, z2);
+                break;
+            case CUBE_HOLLOW:
+                addHollowCubeBlocks(list, x1, x2, y1, y2, z1, z2);
+                break;
+            case CUBE_SKELETON:
+                addSkeletonCubeBlocks(list, x1, x2, y1, y2, z1, z2);
+                break;
+        }
+
+        return list;
+    }
+
+    public static void addCubeBlocks(List<BlockPos> list, int x1, int x2, int y1, int y2, int z1, int z2) {
+        for (int l = x1; x1 < x2 ? l <= x2 : l >= x2; l += x1 < x2 ? 1 : -1) {
+
+            for (int n = z1; z1 < z2 ? n <= z2 : n >= z2; n += z1 < z2 ? 1 : -1) {
+
+                for (int m = y1; y1 < y2 ? m <= y2 : m >= y2; m += y1 < y2 ? 1 : -1) {
+                    list.add(new BlockPos(l, m, n));
+                }
+            }
+        }
+    }
+
+    public static void addHollowCubeBlocks(List<BlockPos> list, int x1, int x2, int y1, int y2, int z1, int z2) {
+        Wall.addXWallBlocks(list, x1, y1, y2, z1, z2);
+        Wall.addXWallBlocks(list, x2, y1, y2, z1, z2);
+
+        Wall.addZWallBlocks(list, x1, x2, y1, y2, z1);
+        Wall.addZWallBlocks(list, x1, x2, y1, y2, z2);
+
+        Floor.addFloorBlocks(list, x1, x2, y1, z1, z2);
+        Floor.addFloorBlocks(list, x1, x2, y2, z1, z2);
+    }
+
+    public static void addSkeletonCubeBlocks(List<BlockPos> list, int x1, int x2, int y1, int y2, int z1, int z2) {
+        Line.addXLineBlocks(list, x1, x2, y1, z1);
+        Line.addXLineBlocks(list, x1, x2, y1, z2);
+        Line.addXLineBlocks(list, x1, x2, y2, z1);
+        Line.addXLineBlocks(list, x1, x2, y2, z2);
+
+        Line.addYLineBlocks(list, y1, y2, x1, z1);
+        Line.addYLineBlocks(list, y1, y2, x1, z2);
+        Line.addYLineBlocks(list, y1, y2, x2, z1);
+        Line.addYLineBlocks(list, y1, y2, x2, z2);
+
+        Line.addZLineBlocks(list, z1, z2, x1, y1);
+        Line.addZLineBlocks(list, z1, z2, x1, y2);
+        Line.addZLineBlocks(list, z1, z2, x2, y1);
+        Line.addZLineBlocks(list, z1, z2, x2, y2);
+    }
+}

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Cylinder.java

@@ -0,0 +1,50 @@
+package nl.requios.effortlessbuilding.buildmode.buildmodes;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.math.BlockPos;
+import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Cylinder extends ThreeClicksBuildMode {
+
+    @Override
+    public BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        return Floor.findFloor(player, firstPos, skipRaytrace);
+    }
+
+    @Override
+    public BlockPos findThirdPos(EntityPlayer player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+        return findHeight(player, secondPos, skipRaytrace);
+    }
+
+    @Override
+    public List<BlockPos> getIntermediateBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        return Circle.getCircleBlocks(player, x1, y1, z1, x2, y2, z2);
+    }
+
+    @Override
+    public List<BlockPos> getFinalBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
+        return getCylinderBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3);
+    }
+
+    public static List<BlockPos> getCylinderBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
+        List<BlockPos> list = new ArrayList<>();
+
+        //Get circle blocks (using CIRCLE_START and FILL options built-in)
+        List<BlockPos> circleBlocks = Circle.getCircleBlocks(player, x1, y1, z1, x2, y2, z2);
+
+        int lowest = Math.min(y1, y3);
+        int highest = Math.max(y1, y3);
+
+        //Copy circle on y axis
+        for (int y = lowest; y <= highest; y++) {
+            for (BlockPos blockPos : circleBlocks) {
+                list.add(new BlockPos(blockPos.getX(), y, blockPos.getZ()));
+            }
+        }
+
+        return list;
+    }
+}

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/DiagonalLine.java

@@ -0,0 +1,54 @@
+package nl.requios.effortlessbuilding.buildmode.buildmodes;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DiagonalLine extends ThreeClicksBuildMode {
+
+    @Override
+    protected BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        return Floor.findFloor(player, firstPos, skipRaytrace);
+    }
+
+    @Override
+    protected BlockPos findThirdPos(EntityPlayer player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+        return findHeight(player, secondPos, skipRaytrace);
+    }
+
+    @Override
+    protected List<BlockPos> getIntermediateBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        //Add diagonal line from first to second
+        return getDiagonalLineBlocks(player, x1, y1, z1, x2, y2, z2, 10);
+    }
+
+    @Override
+    protected List<BlockPos> getFinalBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
+        //Add diagonal line from first to third
+        return getDiagonalLineBlocks(player, x1, y1, z1, x3, y3, z3, 10);
+    }
+
+    //Add diagonal line from first to second
+    public static List<BlockPos> getDiagonalLineBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, float sampleMultiplier) {
+        List<BlockPos> list = new ArrayList<>();
+
+        Vec3d first = new Vec3d(x1, y1, z1).add(0.5, 0.5, 0.5);
+        Vec3d second = new Vec3d(x2, y2, z2).add(0.5, 0.5, 0.5);
+
+        int iterations = (int) Math.ceil(first.distanceTo(second) * sampleMultiplier);
+        for (double t = 0; t <= 1.0; t += 1.0/iterations) {
+            Vec3d lerp = first.add(second.subtract(first).scale(t));
+            BlockPos candidate = new BlockPos(lerp);
+            //Only add if not equal to the last in the list
+            if (list.isEmpty() || !list.get(list.size() - 1).equals(candidate))
+                list.add(candidate);
+        }
+
+        return list;
+    }
+}

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/DiagonalWall.java

@@ -0,0 +1,52 @@
+package nl.requios.effortlessbuilding.buildmode.buildmodes;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.math.BlockPos;
+import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DiagonalWall extends ThreeClicksBuildMode {
+
+    @Override
+    protected BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        return Floor.findFloor(player, firstPos, skipRaytrace);
+    }
+
+    @Override
+    protected BlockPos findThirdPos(EntityPlayer player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+        return findHeight(player, secondPos, skipRaytrace);
+    }
+
+    @Override
+    protected List<BlockPos> getIntermediateBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        return DiagonalLine.getDiagonalLineBlocks(player, x1, y1, z1, x2, y2, z2, 1);
+    }
+
+    @Override
+    protected List<BlockPos> getFinalBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
+        return getDiagonalWallBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3);
+    }
+
+    //Add diagonal wall from first to second
+    public static List<BlockPos> getDiagonalWallBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
+        List<BlockPos> list = new ArrayList<>();
+
+        //Get diagonal line blocks
+        List<BlockPos> diagonalLineBlocks = DiagonalLine.getDiagonalLineBlocks(player, x1, y1, z1, x2, y2, z2, 1);
+
+        int lowest = Math.min(y1, y3);
+        int highest = Math.max(y1, y3);
+
+        //Copy diagonal line on y axis
+        for (int y = lowest; y <= highest; y++) {
+            for (BlockPos blockPos : diagonalLineBlocks) {
+                list.add(new BlockPos(blockPos.getX(), y, blockPos.getZ()));
+            }
+        }
+
+        return list;
+    }
+}

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Floor.java

@@ -0,0 +1,93 @@
+package nl.requios.effortlessbuilding.buildmode.buildmodes;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
+import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+
+import java.util.*;
+
+public class Floor extends TwoClicksBuildMode {
+
+    static class Criteria {
+        Vec3d planeBound;
+        double distToPlayerSq;
+
+        Criteria(Vec3d planeBound, Vec3d start) {
+            this.planeBound = planeBound;
+            this.distToPlayerSq = this.planeBound.subtract(start).lengthSquared();
+        }
+
+        //check if its not behind the player and its not too close and not too far
+        //also check if raytrace from player to block does not intersect blocks
+        public boolean isValid(Vec3d start, Vec3d look, int reach, EntityPlayer player, boolean skipRaytrace) {
+
+            return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, planeBound, planeBound, distToPlayerSq);
+        }
+    }
+
+    @Override
+    protected BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        return findFloor(player, firstPos, skipRaytrace);
+    }
+
+    public static BlockPos findFloor(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        Vec3d look = player.getLookVec();
+        Vec3d start = new Vec3d(player.posX, player.posY + player.getEyeHeight(), player.posZ);
+
+        List<Criteria> criteriaList = new ArrayList<>(3);
+
+        //Y
+        Vec3d yBound = BuildModes.findYBound(firstPos.getY(), start, look);
+        criteriaList.add(new Criteria(yBound, start));
+
+        //Remove invalid criteria
+        int reach = ReachHelper.getPlacementReach(player) * 4; //4 times as much as normal placement reach
+        criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
+
+        //If none are valid, return empty list of blocks
+        if (criteriaList.isEmpty()) return null;
+
+        //Then only 1 can be valid, return that one
+        Criteria selected = criteriaList.get(0);
+
+        return new BlockPos(selected.planeBound);
+    }
+
+    @Override
+    protected List<BlockPos> getAllBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        return getFloorBlocks(player, x1, y1, z1, x2, y2, z2);
+    }
+
+    public static List<BlockPos> getFloorBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        List<BlockPos> list = new ArrayList<>();
+
+        if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
+            addFloorBlocks(list, x1, x2, y1, z1, z2);
+        else
+            addHollowFloorBlocks(list, x1, x2, y1, z1, z2);
+
+        return list;
+    }
+
+    public static void addFloorBlocks(List<BlockPos> list, int x1, int x2, int y, int z1, int z2) {
+
+        for (int l = x1; x1 < x2 ? l <= x2 : l >= x2; l += x1 < x2 ? 1 : -1) {
+
+            for (int n = z1; z1 < z2 ? n <= z2 : n >= z2; n += z1 < z2 ? 1 : -1) {
+
+                list.add(new BlockPos(l, y, n));
+            }
+        }
+    }
+
+    public static void addHollowFloorBlocks(List<BlockPos> list, int x1, int x2, int y, int z1, int z2) {
+        Line.addXLineBlocks(list, x1, x2, y, z1);
+        Line.addXLineBlocks(list, x1, x2, y, z2);
+        Line.addZLineBlocks(list, z1, z2, x1, y);
+        Line.addZLineBlocks(list, z1, z2, x2, y);
+    }
+}

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Line.java

@@ -0,0 +1,147 @@
+package nl.requios.effortlessbuilding.buildmode.buildmodes;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
+import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Line extends TwoClicksBuildMode {
+
+    static class Criteria {
+        Vec3d planeBound;
+        Vec3d lineBound;
+        double distToLineSq;
+        double distToPlayerSq;
+
+        Criteria(Vec3d planeBound, BlockPos firstPos, Vec3d start) {
+            this.planeBound = planeBound;
+            this.lineBound = toLongestLine(this.planeBound, firstPos);
+            this.distToLineSq = this.lineBound.subtract(this.planeBound).lengthSquared();
+            this.distToPlayerSq = this.planeBound.subtract(start).lengthSquared();
+        }
+
+        //Make it from a plane into a line
+        //Select the axis that is longest
+        private Vec3d toLongestLine(Vec3d boundVec, BlockPos firstPos) {
+            BlockPos bound = new BlockPos(boundVec);
+
+            BlockPos firstToSecond = bound.subtract(firstPos);
+            firstToSecond = new BlockPos(Math.abs(firstToSecond.getX()), Math.abs(firstToSecond.getY()), Math.abs(firstToSecond.getZ()));
+            int longest = Math.max(firstToSecond.getX(), Math.max(firstToSecond.getY(), firstToSecond.getZ()));
+            if (longest == firstToSecond.getX()) {
+                return new Vec3d(bound.getX(), firstPos.getY(), firstPos.getZ());
+            }
+            if (longest == firstToSecond.getY()) {
+                return new Vec3d(firstPos.getX(), bound.getY(), firstPos.getZ());
+            }
+            if (longest == firstToSecond.getZ()) {
+                return new Vec3d(firstPos.getX(), firstPos.getY(), bound.getZ());
+            }
+            return null;
+        }
+
+        //check if its not behind the player and its not too close and not too far
+        //also check if raytrace from player to block does not intersect blocks
+        public boolean isValid(Vec3d start, Vec3d look, int reach, EntityPlayer player, boolean skipRaytrace) {
+
+            return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, lineBound, planeBound, distToPlayerSq);
+        }
+
+    }
+
+    @Override
+    protected BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        return findLine(player, firstPos, skipRaytrace);
+    }
+
+    public static BlockPos findLine(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        Vec3d look = player.getLookVec();
+        Vec3d start = new Vec3d(player.posX, player.posY + player.getEyeHeight(), player.posZ);
+
+        List<Criteria> criteriaList = new ArrayList<>(3);
+
+        //X
+        Vec3d xBound = BuildModes.findXBound(firstPos.getX(), start, look);
+        criteriaList.add(new Criteria(xBound, firstPos, start));
+
+        //Y
+        Vec3d yBound = BuildModes.findYBound(firstPos.getY(), start, look);
+        criteriaList.add(new Criteria(yBound, firstPos, start));
+
+        //Z
+        Vec3d zBound = BuildModes.findZBound(firstPos.getZ(), start, look);
+        criteriaList.add(new Criteria(zBound, firstPos, start));
+
+        //Remove invalid criteria
+        int reach = ReachHelper.getPlacementReach(player) * 4; //4 times as much as normal placement reach
+        criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
+
+        //If none are valid, return empty list of blocks
+        if (criteriaList.isEmpty()) return null;
+
+        //If only 1 is valid, choose that one
+        Criteria selected = criteriaList.get(0);
+
+        //If multiple are valid, choose based on criteria
+        if (criteriaList.size() > 1) {
+            //Select the one that is closest (from wall position to its line counterpart)
+            for (int i = 1; i < criteriaList.size(); i++) {
+                Criteria criteria = criteriaList.get(i);
+                if (criteria.distToLineSq < 2.0 && selected.distToLineSq < 2.0) {
+                    //Both very close to line, choose closest to player
+                    if (criteria.distToPlayerSq < selected.distToPlayerSq)
+                        selected = criteria;
+                } else {
+                    //Pick closest to line
+                    if (criteria.distToLineSq < selected.distToLineSq)
+                        selected = criteria;
+                }
+            }
+
+        }
+
+        return new BlockPos(selected.lineBound);
+    }
+
+    @Override
+    protected List<BlockPos> getAllBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        return getLineBlocks(player, x1, y1, z1, x2, y2, z2);
+    }
+
+    public static List<BlockPos> getLineBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        List<BlockPos> list = new ArrayList<>();
+
+        if (x1 != x2) {
+            addXLineBlocks(list, x1, x2, y1, z1);
+        } else if (y1 != y2) {
+            addYLineBlocks(list, y1, y2, x1, z1);
+        } else {
+            addZLineBlocks(list, z1, z2, x1, y1);
+        }
+
+        return list;
+    }
+
+    public static void addXLineBlocks(List<BlockPos> list, int x1, int x2, int y, int z) {
+        for (int x = x1; x1 < x2 ? x <= x2 : x >= x2; x += x1 < x2 ? 1 : -1) {
+            list.add(new BlockPos(x, y, z));
+        }
+    }
+
+    public static void addYLineBlocks(List<BlockPos> list, int y1, int y2, int x, int z) {
+        for (int y = y1; y1 < y2 ? y <= y2 : y >= y2; y += y1 < y2 ? 1 : -1) {
+            list.add(new BlockPos(x, y, z));
+        }
+    }
+
+    public static void addZLineBlocks(List<BlockPos> list, int z1, int z2, int x, int y) {
+        for (int z = z1; z1 < z2 ? z <= z2 : z >= z2; z += z1 < z2 ? 1 : -1) {
+            list.add(new BlockPos(x, y, z));
+        }
+    }
+}

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Normal.java

@@ -0,0 +1,41 @@
+package nl.requios.effortlessbuilding.buildmode.buildmodes;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.buildmode.IBuildMode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Normal implements IBuildMode {
+    @Override
+    public void initialize(EntityPlayer player) {
+
+    }
+
+    @Override
+    public List<BlockPos> onRightClick(EntityPlayer player, BlockPos blockPos, EnumFacing sideHit, Vec3d hitVec, boolean skipRaytrace) {
+        List<BlockPos> list = new ArrayList<>();
+        if (blockPos != null) list.add(blockPos);
+        return list;
+    }
+
+    @Override
+    public List<BlockPos> findCoordinates(EntityPlayer player, BlockPos blockPos, boolean skipRaytrace) {
+        List<BlockPos> list = new ArrayList<>();
+        if (blockPos != null) list.add(blockPos);
+        return list;
+    }
+
+    @Override
+    public EnumFacing getSideHit(EntityPlayer player) {
+        return null;
+    }
+
+    @Override
+    public Vec3d getHitVec(EntityPlayer player) {
+        return null;
+    }
+}

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/NormalPlus.java

@@ -0,0 +1,41 @@
+package nl.requios.effortlessbuilding.buildmode.buildmodes;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.buildmode.IBuildMode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class NormalPlus implements IBuildMode {
+    @Override
+    public void initialize(EntityPlayer player) {
+
+    }
+
+    @Override
+    public List<BlockPos> onRightClick(EntityPlayer player, BlockPos blockPos, EnumFacing sideHit, Vec3d hitVec, boolean skipRaytrace) {
+        List<BlockPos> list = new ArrayList<>();
+        if (blockPos != null) list.add(blockPos);
+        return list;
+    }
+
+    @Override
+    public List<BlockPos> findCoordinates(EntityPlayer player, BlockPos blockPos, boolean skipRaytrace) {
+        List<BlockPos> list = new ArrayList<>();
+        if (blockPos != null) list.add(blockPos);
+        return list;
+    }
+
+    @Override
+    public EnumFacing getSideHit(EntityPlayer player) {
+        return null;
+    }
+
+    @Override
+    public Vec3d getHitVec(EntityPlayer player) {
+        return null;
+    }
+}

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/SlopeFloor.java

@@ -0,0 +1,95 @@
+package nl.requios.effortlessbuilding.buildmode.buildmodes;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.math.BlockPos;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions;
+import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SlopeFloor extends ThreeClicksBuildMode {
+
+    @Override
+    protected BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        return Floor.findFloor(player, firstPos, skipRaytrace);
+    }
+
+    @Override
+    protected BlockPos findThirdPos(EntityPlayer player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+        return findHeight(player, secondPos, skipRaytrace);
+    }
+
+    @Override
+    protected List<BlockPos> getIntermediateBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        return Floor.getFloorBlocks(player, x1, y1, z1, x2, y2, z2);
+    }
+
+    @Override
+    protected List<BlockPos> getFinalBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
+        return getSlopeFloorBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3);
+    }
+
+    //Add slope floor from first to second
+    public static List<BlockPos> getSlopeFloorBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
+        List<BlockPos> list = new ArrayList<>();
+
+        int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
+
+        //Determine whether to use x or z axis to slope up
+        boolean onXAxis = true;
+
+        int xLength = Math.abs(x2 - x1);
+        int zLength = Math.abs(z2 - z1);
+
+        if (ModeOptions.getRaisedEdge() == ModeOptions.ActionEnum.SHORT_EDGE) {
+            //Slope along short edge
+            if (zLength > xLength) onXAxis = false;
+        } else {
+            //Slope along long edge
+            if (zLength <= xLength) onXAxis = false;
+        }
+
+        if (onXAxis) {
+            //Along X goes up
+
+            //Get diagonal line blocks
+            List<BlockPos> diagonalLineBlocks = DiagonalLine.getDiagonalLineBlocks(player, x1, y1, z1, x2, y3, z1, 1f);
+
+            //Limit amount of blocks we can place
+            int lowest = Math.min(z1, z2);
+            int highest = Math.max(z1, z2);
+
+            if (highest - lowest >= axisLimit) highest = lowest + axisLimit - 1;
+
+            //Copy diagonal line on x axis
+            for (int z = lowest; z <= highest; z++) {
+                for (BlockPos blockPos : diagonalLineBlocks) {
+                    list.add(new BlockPos(blockPos.getX(), blockPos.getY(), z));
+                }
+            }
+
+        } else {
+            //Along Z goes up
+
+            //Get diagonal line blocks
+            List<BlockPos> diagonalLineBlocks = DiagonalLine.getDiagonalLineBlocks(player, x1, y1, z1, x1, y3, z2, 1f);
+
+            //Limit amount of blocks we can place
+            int lowest = Math.min(x1, x2);
+            int highest = Math.max(x1, x2);
+
+            if (highest - lowest >= axisLimit) highest = lowest + axisLimit - 1;
+
+            //Copy diagonal line on x axis
+            for (int x = lowest; x <= highest; x++) {
+                for (BlockPos blockPos : diagonalLineBlocks) {
+                    list.add(new BlockPos(x, blockPos.getY(), blockPos.getZ()));
+                }
+            }
+        }
+
+        return list;
+    }
+}

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Sphere.java

@@ -0,0 +1,110 @@
+package nl.requios.effortlessbuilding.buildmode.buildmodes;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions;
+import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Sphere extends ThreeClicksBuildMode {
+
+    @Override
+    public BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        return Floor.findFloor(player, firstPos, skipRaytrace);
+    }
+
+    @Override
+    public BlockPos findThirdPos(EntityPlayer player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+        return findHeight(player, secondPos, skipRaytrace);
+    }
+
+    @Override
+    public List<BlockPos> getIntermediateBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        return Circle.getCircleBlocks(player, x1, y1, z1, x2, y2, z2);
+    }
+
+    @Override
+    public List<BlockPos> getFinalBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
+        return getSphereBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3);
+    }
+
+    public static List<BlockPos> getSphereBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
+        List<BlockPos> list = new ArrayList<>();
+
+        float centerX = x1;
+        float centerY = y1;
+        float centerZ = z1;
+
+        //Adjust for CIRCLE_START
+        if (ModeOptions.getCircleStart() == ModeOptions.ActionEnum.CIRCLE_START_CORNER) {
+            centerX = x1 + (x2 - x1) / 2f;
+            centerY = y1 + (y3 - y1) / 2f;
+            centerZ = z1 + (z2 - z1) / 2f;
+        } else {
+            x1 = (int) (centerX - (x2 - centerX));
+            y1 = (int) (centerY - (y3 - centerY));
+            z1 = (int) (centerZ - (z2 - centerZ));
+        }
+
+        float radiusX = MathHelper.abs(x2 - centerX);
+        float radiusY = MathHelper.abs(y3 - centerY);
+        float radiusZ = MathHelper.abs(z2 - centerZ);
+
+        if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
+            addSphereBlocks(list, x1, y1, z1, x3, y3, z3, centerX, centerY, centerZ, radiusX, radiusY, radiusZ);
+        else
+            addHollowSphereBlocks(list, x1, y1, z1, x3, y3, z3, centerX, centerY, centerZ, radiusX, radiusY, radiusZ);
+
+        return list;
+    }
+
+    public static void addSphereBlocks(List<BlockPos> list, int x1, int y1, int z1, int x2, int y2, int z2,
+                                       float centerX, float centerY, float centerZ, float radiusX, float radiusY, float radiusZ) {
+        for (int l = x1; x1 < x2 ? l <= x2 : l >= x2; l += x1 < x2 ? 1 : -1) {
+
+            for (int n = z1; z1 < z2 ? n <= z2 : n >= z2; n += z1 < z2 ? 1 : -1) {
+
+                for (int m = y1; y1 < y2 ? m <= y2 : m >= y2; m += y1 < y2 ? 1 : -1) {
+
+                    float distance = distance(l, m, n, centerX, centerY, centerZ);
+                    float radius = calculateSpheroidRadius(centerX, centerY, centerZ, radiusX, radiusY, radiusZ, l, m, n);
+                    if (distance < radius + 0.4f)
+                        list.add(new BlockPos(l, m, n));
+                }
+            }
+        }
+    }
+
+    public static void addHollowSphereBlocks(List<BlockPos> list, int x1, int y1, int z1, int x2, int y2, int z2,
+                                             float centerX, float centerY, float centerZ, float radiusX, float radiusY, float radiusZ) {
+        for (int l = x1; x1 < x2 ? l <= x2 : l >= x2; l += x1 < x2 ? 1 : -1) {
+
+            for (int n = z1; z1 < z2 ? n <= z2 : n >= z2; n += z1 < z2 ? 1 : -1) {
+
+                for (int m = y1; y1 < y2 ? m <= y2 : m >= y2; m += y1 < y2 ? 1 : -1) {
+
+                    float distance = distance(l, m, n, centerX, centerY, centerZ);
+                    float radius = calculateSpheroidRadius(centerX, centerY, centerZ, radiusX, radiusY, radiusZ, l, m, n);
+                    if (distance < radius + 0.4f && distance > radius - 0.6f)
+                        list.add(new BlockPos(l, m, n));
+                }
+            }
+        }
+    }
+
+    private static float distance(float x1, float y1, float z1, float x2, float y2, float z2) {
+        return MathHelper.sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1) + (z2 - z1) * (z2 - z1));
+    }
+
+    public static float calculateSpheroidRadius(float centerX, float centerY, float centerZ, float radiusX, float radiusY, float radiusZ, int x, int y, int z) {
+        //Twice ellipse radius
+        float radiusXZ = Circle.calculateEllipseRadius(centerX, centerZ, radiusX, radiusZ, x, z);
+
+        //TODO project x to plane
+
+        return Circle.calculateEllipseRadius(centerX, centerY, radiusXZ, radiusY, x, y);
+    }
+}

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Wall.java

@@ -0,0 +1,134 @@
+package nl.requios.effortlessbuilding.buildmode.buildmodes;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
+import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+
+import java.util.*;
+
+public class Wall extends TwoClicksBuildMode {
+
+    static class Criteria {
+        Vec3d planeBound;
+        double distToPlayerSq;
+        double angle;
+
+        Criteria(Vec3d planeBound, BlockPos firstPos, Vec3d start, Vec3d look) {
+            this.planeBound = planeBound;
+            this.distToPlayerSq = this.planeBound.subtract(start).lengthSquared();
+            Vec3d wall = this.planeBound.subtract(new Vec3d(firstPos));
+            this.angle = wall.x * look.x + wall.z * look.z; //dot product ignoring y (looking up/down should not affect this angle)
+        }
+
+        //check if its not behind the player and its not too close and not too far
+        //also check if raytrace from player to block does not intersect blocks
+        public boolean isValid(Vec3d start, Vec3d look, int reach, EntityPlayer player, boolean skipRaytrace) {
+
+            return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, planeBound, planeBound, distToPlayerSq);
+        }
+    }
+
+    @Override
+    protected BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        return findWall(player, firstPos, skipRaytrace);
+    }
+
+    public static BlockPos findWall(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        Vec3d look = player.getLookVec();
+        Vec3d start = new Vec3d(player.posX, player.posY + player.getEyeHeight(), player.posZ);
+
+        List<Criteria> criteriaList = new ArrayList<>(3);
+
+        //X
+        Vec3d xBound = BuildModes.findXBound(firstPos.getX(), start, look);
+        criteriaList.add(new Criteria(xBound, firstPos, start, look));
+
+        //Z
+        Vec3d zBound = BuildModes.findZBound(firstPos.getZ(), start, look);
+        criteriaList.add(new Criteria(zBound, firstPos, start, look));
+
+        //Remove invalid criteria
+        int reach = ReachHelper.getPlacementReach(player) * 4; //4 times as much as normal placement reach
+        criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
+
+        //If none are valid, return empty list of blocks
+        if (criteriaList.isEmpty()) return null;
+
+        //If only 1 is valid, choose that one
+        Criteria selected = criteriaList.get(0);
+
+        //If multiple are valid, choose based on criteria
+        if (criteriaList.size() > 1) {
+            //Select the one that is closest
+            //Limit the angle to not be too extreme
+            for (int i = 1; i < criteriaList.size(); i++) {
+                Criteria criteria = criteriaList.get(i);
+                if (criteria.distToPlayerSq < selected.distToPlayerSq && Math.abs(criteria.angle) - Math.abs(selected.angle) < 3)
+                    selected = criteria;
+            }
+        }
+
+        return new BlockPos(selected.planeBound);
+    }
+
+    @Override
+    protected List<BlockPos> getAllBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        return getWallBlocks(player, x1, y1, z1, x2, y2, z2);
+    }
+
+    public static List<BlockPos> getWallBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        List<BlockPos> list = new ArrayList<>();
+
+        if (x1 == x2) {
+            if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
+                addXWallBlocks(list, x1, y1, y2, z1, z2);
+            else
+                addXHollowWallBlocks(list, x1, y1, y2, z1, z2);
+        } else {
+            if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
+                addZWallBlocks(list, x1, x2, y1, y2, z1);
+            else
+                addZHollowWallBlocks(list, x1, x2, y1, y2, z1);
+        }
+
+        return list;
+    }
+
+    public static void addXWallBlocks(List<BlockPos> list, int x, int y1, int y2, int z1, int z2) {
+
+        for (int z = z1; z1 < z2 ? z <= z2 : z >= z2; z += z1 < z2 ? 1 : -1) {
+
+            for (int y = y1; y1 < y2 ? y <= y2 : y >= y2; y += y1 < y2 ? 1 : -1) {
+                list.add(new BlockPos(x, y, z));
+            }
+        }
+    }
+
+    public static void addZWallBlocks(List<BlockPos> list, int x1, int x2, int y1, int y2, int z) {
+
+        for (int x = x1; x1 < x2 ? x <= x2 : x >= x2; x += x1 < x2 ? 1 : -1) {
+
+            for (int y = y1; y1 < y2 ? y <= y2 : y >= y2; y += y1 < y2 ? 1 : -1) {
+                list.add(new BlockPos(x, y, z));
+            }
+        }
+    }
+
+    public static void addXHollowWallBlocks(List<BlockPos> list, int x, int y1, int y2, int z1, int z2) {
+        Line.addZLineBlocks(list, z1, z2, x, y1);
+        Line.addZLineBlocks(list, z1, z2, x, y2);
+        Line.addYLineBlocks(list, y1, y2, x, z1);
+        Line.addYLineBlocks(list, y1, y2, x, z2);
+    }
+
+    public static void addZHollowWallBlocks(List<BlockPos> list, int x1, int x2, int y1, int y2, int z) {
+        Line.addXLineBlocks(list, x1, x2, y1, z);
+        Line.addXLineBlocks(list, x1, x2, y2, z);
+        Line.addYLineBlocks(list, y1, y2, x1, z);
+        Line.addYLineBlocks(list, y1, y2, x2, z);
+    }
+}

src/main/java/nl/requios/effortlessbuilding/buildmodifier/Array.java

@@ -1,4 +1,4 @@
-package nl.requios.effortlessbuilding;
+package nl.requios.effortlessbuilding.buildmodifier;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
@@ -45,7 +45,7 @@ public class Array {
         List<BlockPos> coordinates = new ArrayList<>();
 
         //find arraysettings for the player
-        ArraySettings a = BuildSettingsManager.getBuildSettings(player).getArraySettings();
+        ArraySettings a = ModifierSettingsManager.getModifierSettings(player).getArraySettings();
         if (!isEnabled(a)) return coordinates;
 
         BlockPos pos = startPos;
@@ -63,7 +63,7 @@ public class Array {
         List<IBlockState> blockStates = new ArrayList<>();
 
         //find arraysettings for the player that placed the block
-        ArraySettings a = BuildSettingsManager.getBuildSettings(player).getArraySettings();
+        ArraySettings a = ModifierSettingsManager.getModifierSettings(player).getArraySettings();
         if (!isEnabled(a)) return blockStates;
 
         BlockPos pos = startPos;
@@ -81,7 +81,8 @@ public class Array {
             //Randomizer bag synergy
             if (bagInventory != null) {
                 itemStack = ItemRandomizerBag.pickRandomStack(bagInventory);
-                blockState = BuildModifiers.getBlockStateFromItem(itemStack, player, startPos, EnumFacing.UP, new Vec3d(0, 0, 0), EnumHand.MAIN_HAND);
+                blockState = BuildModifiers
+                        .getBlockStateFromItem(itemStack, player, startPos, EnumFacing.UP, new Vec3d(0, 0, 0), EnumHand.MAIN_HAND);
             }
 
             //blockState = blockState.getBlock().getStateForPlacement(player.world, pos, )

src/main/java/nl/requios/effortlessbuilding/buildmodifier/BlockSet.java

@@ -0,0 +1,50 @@
+package nl.requios.effortlessbuilding.buildmodifier;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+
+import java.util.List;
+
+public class BlockSet {
+    private List<BlockPos> coordinates;
+    private List<IBlockState> previousBlockStates;
+    private List<IBlockState> newBlockStates;
+    private Vec3d hitVec;
+    private BlockPos firstPos;
+    private BlockPos secondPos;
+
+    public BlockSet(List<BlockPos> coordinates, List<IBlockState> previousBlockStates,  List<IBlockState> newBlockStates, Vec3d hitVec,
+                    BlockPos firstPos, BlockPos secondPos) {
+        this.coordinates = coordinates;
+        this.previousBlockStates = previousBlockStates;
+        this.newBlockStates = newBlockStates;
+        this.hitVec = hitVec;
+        this.firstPos = firstPos;
+        this.secondPos = secondPos;
+    }
+
+    public List<BlockPos> getCoordinates() {
+        return coordinates;
+    }
+
+    public List<IBlockState> getPreviousBlockStates() {
+        return previousBlockStates;
+    }
+
+    public List<IBlockState> getNewBlockStates() {
+        return newBlockStates;
+    }
+
+    public Vec3d getHitVec() {
+        return hitVec;
+    }
+
+    public BlockPos getFirstPos() {
+        return firstPos;
+    }
+
+    public BlockPos getSecondPos() {
+        return secondPos;
+    }
+}

src/main/java/nl/requios/effortlessbuilding/buildmodifier/BuildModifiers.java

@@ -0,0 +1,259 @@
+package nl.requios.effortlessbuilding.buildmodifier;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.World;
+import nl.requios.effortlessbuilding.compatibility.CompatHelper;
+import nl.requios.effortlessbuilding.helper.InventoryHelper;
+import nl.requios.effortlessbuilding.helper.SurvivalHelper;
+import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
+import nl.requios.effortlessbuilding.render.BlockPreviewRenderer;
+
+import java.util.*;
+
+public class BuildModifiers {
+
+    //Called from BuildModes
+    public static void onBlockPlaced(EntityPlayer player, List<BlockPos> startCoordinates, EnumFacing sideHit, Vec3d hitVec, boolean placeStartPos) {
+        World world = player.world;
+        ItemRandomizerBag.renewRandomness();
+
+        //Format hitvec to 0.x
+        hitVec = new Vec3d(Math.abs(hitVec.x - ((int) hitVec.x)), Math.abs(hitVec.y - ((int) hitVec.y)), Math.abs(hitVec.z - ((int) hitVec.z)));
+
+        //find coordinates and blockstates
+        List<BlockPos> coordinates = findCoordinates(player, startCoordinates);
+        List<ItemStack> itemStacks = new ArrayList<>();
+        List<IBlockState> blockStates = findBlockStates(player, startCoordinates, hitVec, sideHit, itemStacks);
+
+        //check if valid blockstates
+        if (blockStates.size() == 0 || coordinates.size() != blockStates.size()) return;
+
+        //remember previous blockstates for undo
+        List<IBlockState> previousBlockStates = new ArrayList<>(coordinates.size());
+        List<IBlockState> newBlockStates = new ArrayList<>(coordinates.size());
+        for (BlockPos coordinate : coordinates) {
+            previousBlockStates.add(world.getBlockState(coordinate));
+        }
+
+        if (world.isRemote) {
+
+            BlockPreviewRenderer.onBlocksPlaced();
+
+            newBlockStates = blockStates;
+
+        } else {
+
+            //place blocks
+            for (int i = placeStartPos ? 0 : 1; i < coordinates.size(); i++) {
+                BlockPos blockPos = coordinates.get(i);
+                IBlockState blockState = blockStates.get(i);
+                ItemStack itemStack = itemStacks.get(i);
+
+                if (world.isBlockLoaded(blockPos, true)) {
+                    //check itemstack empty
+                    if (itemStack.isEmpty()) {
+                        //try to find new stack, otherwise continue
+                        itemStack = InventoryHelper.findItemStackInInventory(player, blockState.getBlock());
+                        if (itemStack.isEmpty()) continue;
+                    }
+                    SurvivalHelper.placeBlock(world, player, blockPos, blockState, itemStack, EnumFacing.UP, hitVec, false, false, false);
+                }
+            }
+
+            //find actual new blockstates for undo
+            for (BlockPos coordinate : coordinates) {
+                newBlockStates.add(world.getBlockState(coordinate));
+            }
+        }
+
+        //Set first previousBlockState to empty if in NORMAL mode, to make undo/redo work
+        //(Block is placed by the time it gets here, and unplaced after this)
+        if (!placeStartPos) previousBlockStates.set(0, Blocks.AIR.getDefaultState());
+
+        //If all new blockstates are air then no use in adding it, no block was actually placed
+        //Can happen when e.g. placing one block in yourself
+        if (Collections.frequency(newBlockStates, Blocks.AIR.getDefaultState()) != newBlockStates.size()) {
+            //add to undo stack
+            BlockPos firstPos = startCoordinates.get(0);
+            BlockPos secondPos = startCoordinates.get(startCoordinates.size() - 1);
+            UndoRedo.addUndo(player, new BlockSet(coordinates, previousBlockStates, newBlockStates, hitVec, firstPos, secondPos));
+        }
+
+    }
+
+    public static void onBlockBroken(EntityPlayer player, List<BlockPos> startCoordinates, boolean breakStartPos) {
+        World world = player.world;
+
+        List<BlockPos> coordinates = findCoordinates(player, startCoordinates);
+
+        if (coordinates.isEmpty()) return;
+
+        //remember previous blockstates for undo
+        List<IBlockState> previousBlockStates = new ArrayList<>(coordinates.size());
+        List<IBlockState> newBlockStates = new ArrayList<>(coordinates.size());
+        for (BlockPos coordinate : coordinates) {
+            previousBlockStates.add(world.getBlockState(coordinate));
+        }
+
+        if (world.isRemote) {
+            BlockPreviewRenderer.onBlocksBroken();
+
+            //list of air blockstates
+            for (BlockPos coordinate : coordinates) {
+                newBlockStates.add(Blocks.AIR.getDefaultState());
+            }
+
+        } else {
+
+            //If the player is going to instabreak grass or a plant, only break other instabreaking things
+            boolean onlyInstaBreaking = !player.isCreative() &&
+                                        world.getBlockState(startCoordinates.get(0)).getBlockHardness(world, startCoordinates.get(0)) == 0f;
+
+            //break all those blocks
+            for (int i = breakStartPos ? 0 : 1; i < coordinates.size(); i++) {
+                BlockPos coordinate = coordinates.get(i);
+                if (world.isBlockLoaded(coordinate, false)) {
+                    if (!onlyInstaBreaking || world.getBlockState(coordinate).getBlockHardness(world, coordinate) == 0f) {
+                        SurvivalHelper.breakBlock(world, player, coordinate, false);
+                    }
+                }
+            }
+
+            //find actual new blockstates for undo
+            for (BlockPos coordinate : coordinates) {
+                newBlockStates.add(world.getBlockState(coordinate));
+            }
+        }
+
+        //Set first newBlockState to empty if in NORMAL mode, to make undo/redo work
+        //(Block isn't broken yet by the time it gets here, and broken after this)
+        if (!breakStartPos) newBlockStates.set(0, Blocks.AIR.getDefaultState());
+
+        //add to undo stack
+        BlockPos firstPos = startCoordinates.get(0);
+        BlockPos secondPos = startCoordinates.get(startCoordinates.size() - 1);
+        Vec3d hitVec = new Vec3d(0.5, 0.5, 0.5);
+        UndoRedo.addUndo(player, new BlockSet(coordinates, previousBlockStates, newBlockStates, hitVec, firstPos, secondPos));
+
+    }
+
+    public static List<BlockPos> findCoordinates(EntityPlayer player, List<BlockPos> posList) {
+        List<BlockPos> coordinates = new ArrayList<>();
+        //Add current blocks being placed too
+        coordinates.addAll(posList);
+
+        //Find mirror/array/radial mirror coordinates for each blockpos
+        for (BlockPos blockPos : posList) {
+            List<BlockPos> arrayCoordinates = Array.findCoordinates(player, blockPos);
+            coordinates.addAll(arrayCoordinates);
+            coordinates.addAll(Mirror.findCoordinates(player, blockPos));
+            coordinates.addAll(RadialMirror.findCoordinates(player, blockPos));
+            //get mirror for each array coordinate
+            for (BlockPos coordinate : arrayCoordinates) {
+                coordinates.addAll(Mirror.findCoordinates(player, coordinate));
+                coordinates.addAll(RadialMirror.findCoordinates(player, coordinate));
+            }
+        }
+
+        return coordinates;
+    }
+
+    public static List<BlockPos> findCoordinates(EntityPlayer player, BlockPos blockPos) {
+        return findCoordinates(player, new ArrayList<>(Arrays.asList(blockPos)));
+    }
+
+    public static List<IBlockState> findBlockStates(EntityPlayer player, List<BlockPos> posList, Vec3d hitVec, EnumFacing facing, List<ItemStack> itemStacks) {
+        List<IBlockState> blockStates = new ArrayList<>();
+        itemStacks.clear();
+
+        //Get itemstack
+        ItemStack itemStack = player.getHeldItem(EnumHand.MAIN_HAND);
+        if (itemStack.isEmpty() || !CompatHelper.isItemBlockProxy(itemStack)) {
+            itemStack = player.getHeldItem(EnumHand.OFF_HAND);
+        }
+        if (itemStack.isEmpty() || !CompatHelper.isItemBlockProxy(itemStack)) {
+            return blockStates;
+        }
+
+        //Get ItemBlock stack
+        ItemStack itemBlock = ItemStack.EMPTY;
+        if (itemStack.getItem() instanceof ItemBlock) itemBlock = itemStack;
+        else itemBlock = CompatHelper.getItemBlockFromStack(itemStack);
+        ItemRandomizerBag.resetRandomness();
+
+        //Add blocks in posList first
+        for (BlockPos blockPos : posList) {
+            if (!(itemStack.getItem() instanceof ItemBlock)) itemBlock = CompatHelper.getItemBlockFromStack(itemStack);
+            IBlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, EnumHand.MAIN_HAND);
+            blockStates.add(blockState);
+            itemStacks.add(itemBlock);
+        }
+
+        for (BlockPos blockPos : posList) {
+            IBlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, EnumHand.MAIN_HAND);
+
+            List<IBlockState> arrayBlockStates = Array.findBlockStates(player, blockPos, blockState, itemStack, itemStacks);
+            blockStates.addAll(arrayBlockStates);
+            blockStates.addAll(Mirror.findBlockStates(player, blockPos, blockState, itemStack, itemStacks));
+            blockStates.addAll(RadialMirror.findBlockStates(player, blockPos, blockState, itemStack, itemStacks));
+            //add mirror for each array coordinate
+            List<BlockPos> arrayCoordinates = Array.findCoordinates(player, blockPos);
+            for (int i = 0; i < arrayCoordinates.size(); i++) {
+                BlockPos coordinate = arrayCoordinates.get(i);
+                IBlockState blockState1 = arrayBlockStates.get(i);
+                blockStates.addAll(Mirror.findBlockStates(player, coordinate, blockState1, itemStack, itemStacks));
+                blockStates.addAll(RadialMirror.findBlockStates(player, coordinate, blockState1, itemStack, itemStacks));
+            }
+
+            //Adjust blockstates for torches and ladders etc to place on a valid side
+            //TODO optimize findCoordinates (done twice now)
+            //TODO fix mirror
+//            List<BlockPos> coordinates = findCoordinates(player, startPos);
+//            for (int i = 0; i < blockStates.size(); i++) {
+//                blockStates.set(i, blockStates.get(i).getBlock().getStateForPlacement(player.world, coordinates.get(i), facing,
+//                        (float) hitVec.x, (float) hitVec.y, (float) hitVec.z, itemStacks.get(i).getMetadata(), player, EnumHand.MAIN_HAND));
+//            }
+        }
+
+        return blockStates;
+    }
+
+    public static boolean isEnabled(ModifierSettingsManager.ModifierSettings modifierSettings, BlockPos startPos) {
+        return Mirror.isEnabled(modifierSettings.getMirrorSettings(), startPos) ||
+               Array.isEnabled(modifierSettings.getArraySettings()) ||
+               RadialMirror.isEnabled(modifierSettings.getRadialMirrorSettings(), startPos) ||
+               modifierSettings.doQuickReplace();
+    }
+
+    public static IBlockState getBlockStateFromItem(ItemStack itemStack, EntityPlayer player, BlockPos blockPos, EnumFacing facing, Vec3d hitVec, EnumHand hand) {
+        return Block.getBlockFromItem(itemStack.getItem()).getStateForPlacement(player.world, blockPos, facing,
+                ((float) hitVec.x), ((float) hitVec.y), ((float) hitVec.z), itemStack.getMetadata(), player, hand);
+    }
+
+    //Returns true if equal (or both null)
+    public static boolean compareCoordinates(List<BlockPos> coordinates1, List<BlockPos> coordinates2) {
+        if (coordinates1 == null && coordinates2 == null) return true;
+        if (coordinates1 == null || coordinates2 == null) return false;
+
+        //Check count, not actual values
+        if (coordinates1.size() == coordinates2.size()){
+            if (coordinates1.size() == 1){
+                return coordinates1.get(0).equals(coordinates2.get(0));
+            }
+            return true;
+        } else {
+            return false;
+        }
+
+//        return coordinates1.equals(coordinates2);
+    }
+}

src/main/java/nl/requios/effortlessbuilding/buildmodifier/Mirror.java

@@ -1,4 +1,4 @@
-package nl.requios.effortlessbuilding;
+package nl.requios.effortlessbuilding.buildmodifier;
 
 import net.minecraft.block.BlockDirectional;
 import net.minecraft.block.BlockDispenser;
@@ -23,7 +23,7 @@ public class Mirror {
         public boolean enabled = false;
         public Vec3d position = new Vec3d(0.5, 64.5, 0.5);
         public boolean mirrorX = true, mirrorY = false, mirrorZ = false;
-        public int radius = 20;
+        public int radius = 10;
         public boolean drawLines = true, drawPlanes = true;
 
         public MirrorSettings() {
@@ -41,7 +41,7 @@ public class Mirror {
         }
 
         public int getReach() {
-            return radius * 2;
+            return radius * 2; //Change ModifierSettings#setReachUpgrade too
         }
     }
     
@@ -49,7 +49,7 @@ public class Mirror {
         List<BlockPos> coordinates = new ArrayList<>();
 
         //find mirrorsettings for the player
-        MirrorSettings m = BuildSettingsManager.getBuildSettings(player).getMirrorSettings();
+        MirrorSettings m = ModifierSettingsManager.getModifierSettings(player).getMirrorSettings();
         if (!isEnabled(m, startPos)) return coordinates;
 
         if (m.mirrorX) coordinateMirrorX(m, startPos, coordinates);
@@ -89,7 +89,7 @@ public class Mirror {
         List<IBlockState> blockStates = new ArrayList<>();
 
         //find mirrorsettings for the player
-        MirrorSettings m = BuildSettingsManager.getBuildSettings(player).getMirrorSettings();
+        MirrorSettings m = ModifierSettingsManager.getModifierSettings(player).getMirrorSettings();
         if (!isEnabled(m, startPos)) return blockStates;
 
         //Randomizer bag synergy

src/main/java/nl/requios/effortlessbuilding/buildmodifier/ModifierSettingsManager.java

@@ -1,51 +1,51 @@
-package nl.requios.effortlessbuilding;
+package nl.requios.effortlessbuilding.buildmodifier;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.gameevent.PlayerEvent;
-import nl.requios.effortlessbuilding.capability.BuildModifierCapabilityManager;
+import nl.requios.effortlessbuilding.BuildConfig;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.capability.ModifierCapabilityManager;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
-import nl.requios.effortlessbuilding.network.BuildSettingsMessage;
+import nl.requios.effortlessbuilding.network.ModifierSettingsMessage;
 
 @Mod.EventBusSubscriber
-public class BuildSettingsManager {
+public class ModifierSettingsManager {
 
-    //Retrieves the buildsettings of a player through the buildModifierCapability capability
+    //Retrieves the buildsettings of a player through the modifierCapability capability
     //Never returns null
-    public static BuildSettings getBuildSettings(EntityPlayer player){
-        if (player.hasCapability(BuildModifierCapabilityManager.buildModifierCapability, null)) {
-            BuildModifierCapabilityManager.IBuildModifierCapability capability = player.getCapability(
-                    BuildModifierCapabilityManager.buildModifierCapability, null);
-            if (capability.getBuildModifierData() == null) {
-                capability.setBuildModifierData(new BuildSettings());
+    public static ModifierSettings getModifierSettings(EntityPlayer player){
+        if (player.hasCapability(ModifierCapabilityManager.modifierCapability, null)) {
+            ModifierCapabilityManager.IModifierCapability capability = player.getCapability(
+                    ModifierCapabilityManager.modifierCapability, null);
+            if (capability.getModifierData() == null) {
+                capability.setModifierData(new ModifierSettings());
             }
-            return capability.getBuildModifierData();
+            return capability.getModifierData();
         }
-        throw new IllegalArgumentException("Player does not have buildModifierCapability capability");
+        throw new IllegalArgumentException("Player does not have modifierCapability capability");
     }
 
-    public static void setBuildSettings(EntityPlayer player, BuildSettings buildSettings) {
+    public static void setModifierSettings(EntityPlayer player, ModifierSettings modifierSettings) {
         if (player == null) {
             EffortlessBuilding.log("Cannot set buildsettings, player is null");
             return;
         }
-        if (player.hasCapability(BuildModifierCapabilityManager.buildModifierCapability, null)) {
-            BuildModifierCapabilityManager.IBuildModifierCapability capability = player.getCapability(
-                    BuildModifierCapabilityManager.buildModifierCapability, null);
-            capability.setBuildModifierData(buildSettings);
+        if (player.hasCapability(ModifierCapabilityManager.modifierCapability, null)) {
+            ModifierCapabilityManager.IModifierCapability capability = player.getCapability(
+                    ModifierCapabilityManager.modifierCapability, null);
+            capability.setModifierData(modifierSettings);
         } else {
             EffortlessBuilding.log(player, "Saving buildsettings failed.");
         }
     }
 
-    public static String sanitize(BuildSettings buildSettings, EntityPlayer player) {
+    public static String sanitize(ModifierSettings modifierSettings, EntityPlayer player) {
         int maxReach = ReachHelper.getMaxReach(player);
         String error = "";
 
         //Mirror settings
-        Mirror.MirrorSettings m = buildSettings.getMirrorSettings();
+        Mirror.MirrorSettings m = modifierSettings.getMirrorSettings();
         if (m.radius < 1) {
             m.radius = 1;
             error += "Mirror size has to be at least 1. This has been corrected. ";
@@ -56,7 +56,7 @@ public class BuildSettingsManager {
         }
 
         //Array settings
-        Array.ArraySettings a = buildSettings.getArraySettings();
+        Array.ArraySettings a = modifierSettings.getArraySettings();
         if (a.count < 0) {
             a.count = 0;
             error += "Array count may not be negative. It has been reset to 0.";
@@ -68,7 +68,7 @@ public class BuildSettingsManager {
         }
 
         //Radial mirror settings
-        RadialMirror.RadialMirrorSettings r = buildSettings.getRadialMirrorSettings();
+        RadialMirror.RadialMirrorSettings r = modifierSettings.getRadialMirrorSettings();
         if (r.slices < 2) {
             r.slices = 2;
             error += "Radial mirror needs to have at least 2 slices. Slices has been set to 2.";
@@ -84,29 +84,30 @@ public class BuildSettingsManager {
         }
 
         //Other
-        if (buildSettings.reachUpgrade < 0) {
-            buildSettings.reachUpgrade = 0;
+        if (modifierSettings.reachUpgrade < 0) {
+            modifierSettings.reachUpgrade = 0;
         }
-        if (buildSettings.reachUpgrade > 3) {
-            buildSettings.reachUpgrade = 3;
+        if (modifierSettings.reachUpgrade > 3) {
+            modifierSettings.reachUpgrade = 3;
         }
 
         return error;
     }
 
-    public static class BuildSettings {
+    public static class ModifierSettings {
         private Mirror.MirrorSettings mirrorSettings;
         private Array.ArraySettings arraySettings;
         private RadialMirror.RadialMirrorSettings radialMirrorSettings;
         private boolean quickReplace = false;
         private int reachUpgrade = 0;
 
-        public BuildSettings() {
+        public ModifierSettings() {
             mirrorSettings = new Mirror.MirrorSettings();
             arraySettings = new Array.ArraySettings();
+            radialMirrorSettings = new RadialMirror.RadialMirrorSettings();
         }
 
-        public BuildSettings(Mirror.MirrorSettings mirrorSettings, Array.ArraySettings arraySettings,
+        public ModifierSettings(Mirror.MirrorSettings mirrorSettings, Array.ArraySettings arraySettings,
                                 RadialMirror.RadialMirrorSettings radialMirrorSettings, boolean quickReplace, int reachUpgrade) {
             this.mirrorSettings = mirrorSettings;
             this.arraySettings = arraySettings;
@@ -116,26 +117,32 @@ public class BuildSettingsManager {
         }
 
         public Mirror.MirrorSettings getMirrorSettings() {
-            return mirrorSettings;
+            if (this.mirrorSettings == null) this.mirrorSettings = new Mirror.MirrorSettings();
+            return this.mirrorSettings;
         }
 
         public void setMirrorSettings(Mirror.MirrorSettings mirrorSettings) {
+            if (mirrorSettings == null) return;
             this.mirrorSettings = mirrorSettings;
         }
 
         public Array.ArraySettings getArraySettings() {
-            return arraySettings;
+            if (this.arraySettings == null) this.arraySettings = new Array.ArraySettings();
+            return this.arraySettings;
         }
 
         public void setArraySettings(Array.ArraySettings arraySettings) {
+            if (arraySettings == null) return;
             this.arraySettings = arraySettings;
         }
 
         public RadialMirror.RadialMirrorSettings getRadialMirrorSettings() {
-            return radialMirrorSettings;
+            if (this.radialMirrorSettings == null) this.radialMirrorSettings = new RadialMirror.RadialMirrorSettings();
+            return this.radialMirrorSettings;
         }
 
         public void setRadialMirrorSettings(RadialMirror.RadialMirrorSettings radialMirrorSettings) {
+            if (radialMirrorSettings == null) return;
             this.radialMirrorSettings = radialMirrorSettings;
         }
 
@@ -153,30 +160,35 @@ public class BuildSettingsManager {
 
         public void setReachUpgrade(int reachUpgrade) {
             this.reachUpgrade = reachUpgrade;
+            //Set mirror radius to max
+            int reach = 10;
+            switch (reachUpgrade) {
+                case 0: reach = BuildConfig.reach.maxReachLevel0; break;
+                case 1: reach =  BuildConfig.reach.maxReachLevel1; break;
+                case 2: reach =  BuildConfig.reach.maxReachLevel2; break;
+                case 3: reach =  BuildConfig.reach.maxReachLevel3; break;
+            }
+
+            EffortlessBuilding.log("before "+this.mirrorSettings.radius);
+
+            if (this.mirrorSettings != null)
+                this.mirrorSettings.radius = reach / 2;
+            if (this.radialMirrorSettings != null)
+                this.radialMirrorSettings.radius = reach / 2;
+
+            EffortlessBuilding.log("after "+this.mirrorSettings.radius);
         }
     }
 
-    @SubscribeEvent
-    public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
-        EntityPlayer player = event.player;
-        handleNewPlayer(player);
-    }
-
-    @SubscribeEvent
-    public static void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) {
-        EntityPlayer player = event.player;
-        handleNewPlayer(player);
-    }
-
-    private static void handleNewPlayer(EntityPlayer player){
-        if (getBuildSettings(player) == null) {
-            setBuildSettings(player, new BuildSettings());
+    public static void handleNewPlayer(EntityPlayer player){
+        if (getModifierSettings(player) == null) {
+            setModifierSettings(player, new ModifierSettings());
         }
 
         //Only on server
         if (!player.world.isRemote) {
             //Send to client
-            BuildSettingsMessage msg = new BuildSettingsMessage(getBuildSettings(player));
+            ModifierSettingsMessage msg = new ModifierSettingsMessage(getModifierSettings(player));
             EffortlessBuilding.packetHandler.sendTo(msg, (EntityPlayerMP) player);
         }
     }

src/main/java/nl/requios/effortlessbuilding/buildmodifier/RadialMirror.java

@@ -1,4 +1,4 @@
-package nl.requios.effortlessbuilding;
+package nl.requios.effortlessbuilding.buildmodifier;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
@@ -48,7 +48,7 @@ public class RadialMirror {
         List<BlockPos> coordinates = new ArrayList<>();
 
         //find radial mirror settings for the player
-        RadialMirrorSettings r = BuildSettingsManager.getBuildSettings(player).getRadialMirrorSettings();
+        RadialMirrorSettings r = ModifierSettingsManager.getModifierSettings(player).getRadialMirrorSettings();
         if (!isEnabled(r, startPos)) return coordinates;
 
         //get angle between slices
@@ -82,7 +82,7 @@ public class RadialMirror {
         List<BlockPos> coordinates = new ArrayList<>(); //to keep track of duplicates
 
         //find radial mirror settings for the player that placed the block
-        RadialMirrorSettings r = BuildSettingsManager.getBuildSettings(player).getRadialMirrorSettings();
+        RadialMirrorSettings r = ModifierSettingsManager.getModifierSettings(player).getRadialMirrorSettings();
         if (!isEnabled(r, startPos)) return blockStates;
 
 
@@ -123,7 +123,8 @@ public class RadialMirror {
             //Randomizer bag synergy
             if (bagInventory != null) {
                 itemStack = ItemRandomizerBag.pickRandomStack(bagInventory);
-                newBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, startPos, EnumFacing.UP, new Vec3d(0, 0, 0), EnumHand.MAIN_HAND);
+                newBlockState = BuildModifiers
+                        .getBlockStateFromItem(itemStack, player, startPos, EnumFacing.UP, new Vec3d(0, 0, 0), EnumHand.MAIN_HAND);
 
                 newBlockState = rotateOriginalBlockState(startAngleToCenter, newBlockState);
             }

src/main/java/nl/requios/effortlessbuilding/buildmodifier/UndoRedo.java

@@ -0,0 +1,230 @@
+package nl.requios.effortlessbuilding.buildmodifier;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.BuildConfig;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.helper.FixedStack;
+import nl.requios.effortlessbuilding.helper.InventoryHelper;
+import nl.requios.effortlessbuilding.helper.SurvivalHelper;
+import nl.requios.effortlessbuilding.render.BlockPreviewRenderer;
+
+import java.util.*;
+
+public class UndoRedo {
+
+    //Undo and redo stacks per player
+    //Gets added to twice in singleplayer (server and client) if not careful. So separate stacks.
+    private static Map<UUID, FixedStack<BlockSet>> undoStacksClient = new HashMap<>();
+    private static Map<UUID, FixedStack<BlockSet>> undoStacksServer = new HashMap<>();
+    private static Map<UUID, FixedStack<BlockSet>> redoStacksClient = new HashMap<>();
+    private static Map<UUID, FixedStack<BlockSet>> redoStacksServer = new HashMap<>();
+
+    //add to undo stack
+    public static void addUndo(EntityPlayer player, BlockSet blockSet) {
+        Map<UUID, FixedStack<BlockSet>> undoStacks = player.world.isRemote ? undoStacksClient : undoStacksServer;
+
+        //Assert coordinates is as long as previous and new blockstate lists
+        if (blockSet.getCoordinates().size() != blockSet.getPreviousBlockStates().size() ||
+            blockSet.getCoordinates().size() != blockSet.getNewBlockStates().size()) {
+            EffortlessBuilding.logger.error("Coordinates and blockstate lists are not equal length. Coordinates: {}. Previous blockstates: {}. New blockstates: {}.",
+                    blockSet.getCoordinates().size(), blockSet.getPreviousBlockStates().size(), blockSet.getNewBlockStates().size());
+        }
+
+        //Warn if previous and new blockstate are equal
+        //Can happen in a lot of valid cases
+//        for (int i = 0; i < blockSet.getCoordinates().size(); i++) {
+//            if (blockSet.getPreviousBlockStates().get(i).equals(blockSet.getNewBlockStates().get(i))) {
+//                EffortlessBuilding.logger.warn("Previous and new blockstates are equal at index {}. Blockstate: {}.",
+//                        i, blockSet.getPreviousBlockStates().get(i));
+//            }
+//        }
+
+        //If no stack exists, make one
+        if (!undoStacks.containsKey(player.getUniqueID())) {
+            undoStacks.put(player.getUniqueID(), new FixedStack<>(new BlockSet[BuildConfig.survivalBalancers.undoStackSize]));
+        }
+
+
+        undoStacks.get(player.getUniqueID()).push(blockSet);
+    }
+
+    private static void addRedo(EntityPlayer player, BlockSet blockSet) {
+        Map<UUID, FixedStack<BlockSet>> redoStacks = player.world.isRemote ? redoStacksClient : redoStacksServer;
+
+        //(No asserts necessary, it's private)
+
+        //If no stack exists, make one
+        if (!redoStacks.containsKey(player.getUniqueID())) {
+            redoStacks.put(player.getUniqueID(), new FixedStack<>(new BlockSet[BuildConfig.survivalBalancers.undoStackSize]));
+        }
+
+        redoStacks.get(player.getUniqueID()).push(blockSet);
+    }
+
+    public static boolean undo(EntityPlayer player) {
+        Map<UUID, FixedStack<BlockSet>> undoStacks = player.world.isRemote ? undoStacksClient : undoStacksServer;
+
+        if (!undoStacks.containsKey(player.getUniqueID())) return false;
+
+        FixedStack<BlockSet> undoStack = undoStacks.get(player.getUniqueID());
+
+        if (undoStack.isEmpty()) return false;
+
+        BlockSet blockSet = undoStack.pop();
+        List<BlockPos> coordinates = blockSet.getCoordinates();
+        List<IBlockState> previousBlockStates = blockSet.getPreviousBlockStates();
+        List<IBlockState> newBlockStates = blockSet.getNewBlockStates();
+        Vec3d hitVec = blockSet.getHitVec();
+
+        //Find up to date itemstacks in player inventory
+        List<ItemStack> itemStacks = findItemStacksInInventory(player, previousBlockStates);
+
+        if (player.world.isRemote) {
+            BlockPreviewRenderer.onBlocksBroken(coordinates, itemStacks, newBlockStates, blockSet.getSecondPos(), blockSet.getFirstPos());
+        } else {
+            //break all those blocks, reset to what they were
+            for (int i = 0; i < coordinates.size(); i++) {
+                BlockPos coordinate = coordinates.get(i);
+                ItemStack itemStack = itemStacks.get(i);
+
+                if (previousBlockStates.get(i).equals(newBlockStates.get(i))) continue;
+
+                //get blockstate from itemstack
+                IBlockState previousBlockState = Blocks.AIR.getDefaultState();
+                if (itemStack.getItem() instanceof ItemBlock) {
+                    previousBlockState = previousBlockStates.get(i);//((ItemBlock) itemStack.getItem()).getBlock().getDefaultState();
+                }
+
+                if (player.world.isBlockLoaded(coordinate, true)) {
+                    //check itemstack empty
+                    if (itemStack.isEmpty()) {
+                        itemStack = findItemStackInInventory(player, previousBlockStates.get(i));
+                        //get blockstate from new itemstack
+                        if (!itemStack.isEmpty() && itemStack.getItem() instanceof ItemBlock) {
+                            previousBlockState = previousBlockStates.get(i);//((ItemBlock) itemStack.getItem()).getBlock().getDefaultState();
+                        } else {
+                            previousBlockState = Blocks.AIR.getDefaultState();
+                        }
+                    }
+                    if (itemStack.isEmpty()) SurvivalHelper.breakBlock(player.world, player, coordinate, true);
+                    //if previousBlockState is air, placeBlock will set it to air
+                    SurvivalHelper.placeBlock(player.world, player, coordinate, previousBlockState, itemStack, EnumFacing.UP, hitVec, true, false, false);
+                }
+            }
+        }
+
+        //add to redo
+        addRedo(player, blockSet);
+
+        return true;
+    }
+
+    public static boolean redo(EntityPlayer player) {
+        Map<UUID, FixedStack<BlockSet>> redoStacks = player.world.isRemote ? redoStacksClient : redoStacksServer;
+
+        if (!redoStacks.containsKey(player.getUniqueID())) return false;
+
+        FixedStack<BlockSet> redoStack = redoStacks.get(player.getUniqueID());
+
+        if (redoStack.isEmpty()) return false;
+
+        BlockSet blockSet = redoStack.pop();
+        List<BlockPos> coordinates = blockSet.getCoordinates();
+        List<IBlockState> previousBlockStates = blockSet.getPreviousBlockStates();
+        List<IBlockState> newBlockStates = blockSet.getNewBlockStates();
+        Vec3d hitVec = blockSet.getHitVec();
+
+        //Find up to date itemstacks in player inventory
+        List<ItemStack> itemStacks = findItemStacksInInventory(player, newBlockStates);
+
+        if (player.world.isRemote) {
+            BlockPreviewRenderer.onBlocksPlaced(coordinates, itemStacks, newBlockStates, blockSet.getFirstPos(), blockSet.getSecondPos());
+        } else {
+            //place blocks
+            for (int i = 0; i < coordinates.size(); i++) {
+                BlockPos coordinate = coordinates.get(i);
+                ItemStack itemStack = itemStacks.get(i);
+
+                if (previousBlockStates.get(i).equals(newBlockStates.get(i))) continue;
+
+                //get blockstate from itemstack
+                IBlockState newBlockState = Blocks.AIR.getDefaultState();
+                if (itemStack.getItem() instanceof ItemBlock) {
+                    newBlockState = newBlockStates.get(i);//((ItemBlock) itemStack.getItem()).getBlock().getDefaultState();
+                }
+
+                if (player.world.isBlockLoaded(coordinate, true)) {
+                    //check itemstack empty
+                    if (itemStack.isEmpty()) {
+                        itemStack = findItemStackInInventory(player, newBlockStates.get(i));
+                        //get blockstate from new itemstack
+                        if (!itemStack.isEmpty() && itemStack.getItem() instanceof ItemBlock) {
+                            newBlockState = newBlockStates.get(i);//((ItemBlock) itemStack.getItem()).getBlock().getDefaultState();
+                        } else {
+                            newBlockState = Blocks.AIR.getDefaultState();
+                        }
+                    }
+                    if (itemStack.isEmpty()) SurvivalHelper.breakBlock(player.world, player, coordinate, true);
+                    SurvivalHelper.placeBlock(player.world, player, coordinate, newBlockState, itemStack, EnumFacing.UP, hitVec, true, false, false);
+                }
+            }
+        }
+
+        //add to undo
+        addUndo(player, blockSet);
+
+        return true;
+    }
+
+    public static void clear(EntityPlayer player) {
+        Map<UUID, FixedStack<BlockSet>> undoStacks = player.world.isRemote ? undoStacksClient : undoStacksServer;
+        Map<UUID, FixedStack<BlockSet>> redoStacks = player.world.isRemote ? redoStacksClient : redoStacksServer;
+        if (undoStacks.containsKey(player.getUniqueID())) {
+            undoStacks.get(player.getUniqueID()).clear();
+        }
+        if (redoStacks.containsKey(player.getUniqueID())) {
+            redoStacks.get(player.getUniqueID()).clear();
+        }
+    }
+
+    private static List<ItemStack> findItemStacksInInventory(EntityPlayer player, List<IBlockState> blockStates) {
+        List<ItemStack> itemStacks = new ArrayList<>(blockStates.size());
+        for (IBlockState blockState : blockStates) {
+            itemStacks.add(findItemStackInInventory(player, blockState));
+        }
+        return itemStacks;
+    }
+
+    private static ItemStack findItemStackInInventory(EntityPlayer player, IBlockState blockState) {
+        ItemStack itemStack = ItemStack.EMPTY;
+        if (blockState == null) return itemStack;
+
+        //First try previousBlockStates
+        //TODO try to find itemstack with right blockstate first
+        // then change line 103 back (get state from item)
+        itemStack = InventoryHelper.findItemStackInInventory(player, blockState.getBlock());
+
+        //then anything it drops
+        if (itemStack.isEmpty()) {
+            Item itemDropped = blockState.getBlock().getItemDropped(blockState, player.world.rand, 10);
+            if (itemDropped instanceof ItemBlock) {
+                Block block = ((ItemBlock) itemDropped).getBlock();
+                itemStack = InventoryHelper.findItemStackInInventory(player, block);
+            }
+        }
+
+        //then air
+        //(already empty)
+
+        return itemStack;
+    }
+}

src/main/java/nl/requios/effortlessbuilding/capability/ModeCapabilityManager.java

@@ -0,0 +1,104 @@
+package nl.requios.effortlessbuilding.capability;
+
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumFacing;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.CapabilityInject;
+import net.minecraftforge.common.capabilities.ICapabilitySerializable;
+import net.minecraftforge.event.entity.player.PlayerEvent;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import static nl.requios.effortlessbuilding.buildmode.ModeSettingsManager.*;
+
+@Mod.EventBusSubscriber
+public class ModeCapabilityManager {
+
+    @CapabilityInject(IModeCapability.class)
+    public final static Capability<IModeCapability> modeCapability = null;
+
+    public interface IModeCapability {
+        ModeSettings getModeData();
+
+        void setModeData(ModeSettings modeSettings);
+    }
+
+    public static class ModeCapability implements IModeCapability {
+        private ModeSettings modeSettings;
+
+        @Override
+        public ModeSettings getModeData() {
+            return modeSettings;
+        }
+
+        @Override
+        public void setModeData(ModeSettings modeSettings) {
+            this.modeSettings = modeSettings;
+        }
+    }
+
+    public static class Storage implements Capability.IStorage<IModeCapability> {
+        @Override
+        public NBTBase writeNBT(Capability<IModeCapability> capability, IModeCapability instance, EnumFacing side) {
+            NBTTagCompound compound = new NBTTagCompound();
+            ModeSettings modeSettings = instance.getModeData();
+            if (modeSettings == null) modeSettings = new ModeSettings();
+
+            //compound.setInteger("buildMode", modeSettings.getBuildMode().ordinal());
+
+            //TODO add mode settings
+
+            return compound;
+        }
+
+        @Override
+        public void readNBT(Capability<IModeCapability> capability, IModeCapability instance, EnumFacing side, NBTBase nbt) {
+            NBTTagCompound compound = (NBTTagCompound) nbt;
+
+            //BuildModes.BuildModeEnum buildMode = BuildModes.BuildModeEnum.values()[compound.getInteger("buildMode")];
+
+            //TODO add mode settings
+
+            ModeSettings modeSettings = new ModeSettings(BuildModes.BuildModeEnum.NORMAL);
+            instance.setModeData(modeSettings);
+        }
+    }
+
+    public static class Provider implements ICapabilitySerializable<NBTBase> {
+        IModeCapability inst = modeCapability.getDefaultInstance();
+
+        @Override
+        public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
+            return capability == modeCapability;
+        }
+
+        @Override
+        public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing) {
+            if (capability == modeCapability) return modeCapability.<T>cast(inst);
+            return null;
+        }
+
+        @Override
+        public NBTBase serializeNBT() {
+            return modeCapability.getStorage().writeNBT(modeCapability, inst, null);
+        }
+
+        @Override
+        public void deserializeNBT(NBTBase nbt) {
+            modeCapability.getStorage().readNBT(modeCapability, inst, null, nbt);
+        }
+    }
+
+    // Allows for the capability to persist after death.
+    @SubscribeEvent
+    public static void clonePlayer(PlayerEvent.Clone event) {
+        IModeCapability original = event.getOriginal().getCapability(modeCapability, null);
+        IModeCapability clone = event.getEntity().getCapability(modeCapability, null);
+        clone.setModeData(original.getModeData());
+    }
+}

src/main/java/nl/requios/effortlessbuilding/capability/ModifierCapabilityManager.java

@@ -11,49 +11,50 @@ import net.minecraftforge.common.capabilities.ICapabilitySerializable;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import nl.requios.effortlessbuilding.Array;
-import nl.requios.effortlessbuilding.BuildSettingsManager.BuildSettings;
-import nl.requios.effortlessbuilding.Mirror;
-import nl.requios.effortlessbuilding.RadialMirror;
+import nl.requios.effortlessbuilding.buildmodifier.Array;
+import nl.requios.effortlessbuilding.buildmodifier.Mirror;
+import nl.requios.effortlessbuilding.buildmodifier.RadialMirror;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import static nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager.*;
+
 @Mod.EventBusSubscriber
-public class BuildModifierCapabilityManager {
+public class ModifierCapabilityManager {
 
-    @CapabilityInject(IBuildModifierCapability.class)
-    public final static Capability<IBuildModifierCapability> buildModifierCapability = null;
+    @CapabilityInject(IModifierCapability.class)
+    public final static Capability<IModifierCapability> modifierCapability = null;
 
-    public interface IBuildModifierCapability {
-        BuildSettings getBuildModifierData();
+    public interface IModifierCapability {
+        ModifierSettings getModifierData();
 
-        void setBuildModifierData(BuildSettings buildSettings);
+        void setModifierData(ModifierSettings modifierSettings);
     }
 
-    public static class BuildModifierCapability implements IBuildModifierCapability {
-        private BuildSettings buildSettings;
+    public static class ModifierCapability implements IModifierCapability {
+        private ModifierSettings modifierSettings;
 
         @Override
-        public BuildSettings getBuildModifierData() {
-            return buildSettings;
+        public ModifierSettings getModifierData() {
+            return modifierSettings;
         }
 
         @Override
-        public void setBuildModifierData(BuildSettings buildSettings) {
-            this.buildSettings = buildSettings;
+        public void setModifierData(ModifierSettings modifierSettings) {
+            this.modifierSettings = modifierSettings;
         }
     }
 
-    public static class Storage implements Capability.IStorage<IBuildModifierCapability> {
+    public static class Storage implements Capability.IStorage<IModifierCapability> {
         @Override
-        public NBTBase writeNBT(Capability<IBuildModifierCapability> capability, IBuildModifierCapability instance, EnumFacing side) {
+        public NBTBase writeNBT(Capability<IModifierCapability> capability, IModifierCapability instance, EnumFacing side) {
             NBTTagCompound compound = new NBTTagCompound();
-            BuildSettings buildSettings = instance.getBuildModifierData();
-            if (buildSettings == null) buildSettings = new BuildSettings();
+            ModifierSettings modifierSettings = instance.getModifierData();
+            if (modifierSettings == null) modifierSettings = new ModifierSettings();
 
             //MIRROR
-            Mirror.MirrorSettings m = buildSettings.getMirrorSettings();
+            Mirror.MirrorSettings m = modifierSettings.getMirrorSettings();
             if (m == null) m = new Mirror.MirrorSettings();
             compound.setBoolean("mirrorEnabled", m.enabled);
             compound.setDouble("mirrorPosX", m.position.x);
@@ -67,7 +68,7 @@ public class BuildModifierCapabilityManager {
             compound.setBoolean("mirrorDrawPlanes", m.drawPlanes);
 
             //ARRAY
-            Array.ArraySettings a = buildSettings.getArraySettings();
+            Array.ArraySettings a = modifierSettings.getArraySettings();
             if (a == null) a = new Array.ArraySettings();
             compound.setBoolean("arrayEnabled", a.enabled);
             compound.setInteger("arrayOffsetX", a.offset.getX());
@@ -75,12 +76,12 @@ public class BuildModifierCapabilityManager {
             compound.setInteger("arrayOffsetZ", a.offset.getZ());
             compound.setInteger("arrayCount", a.count);
 
-            compound.setInteger("reachUpgrade", buildSettings.getReachUpgrade());
+            compound.setInteger("reachUpgrade", modifierSettings.getReachUpgrade());
 
             //compound.setBoolean("quickReplace", buildSettings.doQuickReplace()); dont save quickreplace
 
             //RADIAL MIRROR
-            RadialMirror.RadialMirrorSettings r = buildSettings.getRadialMirrorSettings();
+            RadialMirror.RadialMirrorSettings r = modifierSettings.getRadialMirrorSettings();
             if (r == null) r = new RadialMirror.RadialMirrorSettings();
             compound.setBoolean("radialMirrorEnabled", r.enabled);
             compound.setDouble("radialMirrorPosX", r.position.x);
@@ -96,12 +97,15 @@ public class BuildModifierCapabilityManager {
         }
 
         @Override
-        public void readNBT(Capability<IBuildModifierCapability> capability, IBuildModifierCapability instance, EnumFacing side, NBTBase nbt) {
+        public void readNBT(Capability<IModifierCapability> capability, IModifierCapability instance, EnumFacing side, NBTBase nbt) {
             NBTTagCompound compound = (NBTTagCompound) nbt;
 
             //MIRROR
             boolean mirrorEnabled = compound.getBoolean("mirrorEnabled");
-            Vec3d mirrorPosition = new Vec3d(compound.getDouble("mirrorPosX"), compound.getDouble("mirrorPosY"), compound.getDouble("mirrorPosZ"));
+            Vec3d mirrorPosition = new Vec3d(
+                    compound.getDouble("mirrorPosX"),
+                    compound.getDouble("mirrorPosY"),
+                    compound.getDouble("mirrorPosZ"));
             boolean mirrorX = compound.getBoolean("mirrorX");
             boolean mirrorY = compound.getBoolean("mirrorY");
             boolean mirrorZ = compound.getBoolean("mirrorZ");
@@ -112,7 +116,10 @@ public class BuildModifierCapabilityManager {
 
             //ARRAY
             boolean arrayEnabled = compound.getBoolean("arrayEnabled");
-            BlockPos arrayOffset = new BlockPos(compound.getInteger("arrayOffsetX"), compound.getInteger("arrayOffsetY"), compound.getInteger("arrayOffsetZ"));
+            BlockPos arrayOffset = new BlockPos(
+                    compound.getInteger("arrayOffsetX"),
+                    compound.getInteger("arrayOffsetY"),
+                    compound.getInteger("arrayOffsetZ"));
             int arrayCount = compound.getInteger("arrayCount");
             Array.ArraySettings arraySettings = new Array.ArraySettings(arrayEnabled, arrayOffset, arrayCount);
 
@@ -122,7 +129,10 @@ public class BuildModifierCapabilityManager {
 
             //RADIAL MIRROR
             boolean radialMirrorEnabled = compound.getBoolean("radialMirrorEnabled");
-            Vec3d radialMirrorPosition = new Vec3d(compound.getDouble("radialMirrorPosX"), compound.getDouble("radialMirrorPosY"), compound.getDouble("radialMirrorPosZ"));
+            Vec3d radialMirrorPosition = new Vec3d(
+                    compound.getDouble("radialMirrorPosX"),
+                    compound.getDouble("radialMirrorPosY"),
+                    compound.getDouble("radialMirrorPosZ"));
             int radialMirrorSlices = compound.getInteger("radialMirrorSlices");
             boolean radialMirrorAlternate = compound.getBoolean("radialMirrorAlternate");
             int radialMirrorRadius = compound.getInteger("radialMirrorRadius");
@@ -131,41 +141,41 @@ public class BuildModifierCapabilityManager {
             RadialMirror.RadialMirrorSettings radialMirrorSettings = new RadialMirror.RadialMirrorSettings(radialMirrorEnabled, radialMirrorPosition,
                     radialMirrorSlices, radialMirrorAlternate, radialMirrorRadius, radialMirrorDrawLines, radialMirrorDrawPlanes);
 
-            BuildSettings buildSettings = new BuildSettings(mirrorSettings, arraySettings, radialMirrorSettings, false, reachUpgrade);
-            instance.setBuildModifierData(buildSettings);
+            ModifierSettings modifierSettings = new ModifierSettings(mirrorSettings, arraySettings, radialMirrorSettings, false, reachUpgrade);
+            instance.setModifierData(modifierSettings);
         }
     }
 
     public static class Provider implements ICapabilitySerializable<NBTBase> {
-        IBuildModifierCapability inst = buildModifierCapability.getDefaultInstance();
+        IModifierCapability inst = modifierCapability.getDefaultInstance();
 
         @Override
         public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
-            return capability == buildModifierCapability;
+            return capability == modifierCapability;
         }
 
         @Override
         public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing) {
-            if (capability == buildModifierCapability) return buildModifierCapability.<T>cast(inst);
+            if (capability == modifierCapability) return modifierCapability.<T>cast(inst);
             return null;
         }
 
         @Override
         public NBTBase serializeNBT() {
-            return buildModifierCapability.getStorage().writeNBT(buildModifierCapability, inst, null);
+            return modifierCapability.getStorage().writeNBT(modifierCapability, inst, null);
         }
 
         @Override
         public void deserializeNBT(NBTBase nbt) {
-            buildModifierCapability.getStorage().readNBT(buildModifierCapability, inst, null, nbt);
+            modifierCapability.getStorage().readNBT(modifierCapability, inst, null, nbt);
         }
     }
 
     // Allows for the capability to persist after death.
     @SubscribeEvent
     public static void clonePlayer(PlayerEvent.Clone event) {
-        IBuildModifierCapability original = event.getOriginal().getCapability(buildModifierCapability, null);
-        IBuildModifierCapability clone = event.getEntity().getCapability(buildModifierCapability, null);
-        clone.setBuildModifierData(original.getBuildModifierData());
+        IModifierCapability original = event.getOriginal().getCapability(modifierCapability, null);
+        IModifierCapability clone = event.getEntity().getCapability(modifierCapability, null);
+        clone.setModifierData(original.getModifierData());
     }
 }

src/main/java/nl/requios/effortlessbuilding/command/CommandReach.java

@@ -7,9 +7,9 @@ import net.minecraft.command.WrongUsageException;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.text.TextComponentString;
-import nl.requios.effortlessbuilding.BuildSettingsManager;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.network.BuildSettingsMessage;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.network.ModifierSettingsMessage;
 
 public class CommandReach extends CommandBase {
     @Override
@@ -24,20 +24,23 @@ public class CommandReach extends CommandBase {
 
     @Override
     public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
+        EntityPlayerMP player = (EntityPlayerMP) sender;
         if (args.length != 1) {
+            int reachUpgrade = ModifierSettingsManager.getModifierSettings(player).getReachUpgrade();
+            EffortlessBuilding.log(player, "Current reach: level "+reachUpgrade);
             throw new WrongUsageException("commands.reach.usage");
         }
 
         if (sender instanceof EntityPlayerMP) {
-            EntityPlayerMP player = (EntityPlayerMP) sender;
             //Set reach level to args[0]
-            BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(player);
-            buildSettings.setReachUpgrade(Integer.valueOf(args[0]));
-            BuildSettingsManager.setBuildSettings(player, buildSettings);
+            ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+            modifierSettings.setReachUpgrade(Integer.valueOf(args[0]));
+            ModifierSettingsManager.setModifierSettings(player, modifierSettings);
             //Send to client
-            EffortlessBuilding.packetHandler.sendTo(new BuildSettingsMessage(buildSettings), player);
+            EffortlessBuilding.packetHandler.sendTo(new ModifierSettingsMessage(modifierSettings), player);
 
-            sender.sendMessage(new TextComponentString("Reach level of " + sender.getName() + " set to " + buildSettings.getReachUpgrade()));
+            sender.sendMessage(new TextComponentString("Reach level of " + sender.getName() + " set to " + modifierSettings
+                    .getReachUpgrade()));
         }
     }
 }

src/main/java/nl/requios/effortlessbuilding/compatibility/ActiveChiselsAndBitsProxy.java

@@ -0,0 +1,13 @@
+package nl.requios.effortlessbuilding.compatibility;
+
+import mod.chiselsandbits.core.ClientSide;
+import mod.chiselsandbits.helpers.ChiselToolType;
+import net.minecraft.util.EnumHand;
+
+public class ActiveChiselsAndBitsProxy implements IChiselsAndBitsProxy {
+    @Override
+    public boolean isHoldingChiselTool(EnumHand hand) {
+        ChiselToolType toolType = ClientSide.instance.getHeldToolType(hand);
+        return toolType != null && toolType.hasMenu();
+    }
+}

src/main/java/nl/requios/effortlessbuilding/compatibility/CompatHelper.java

@@ -0,0 +1,117 @@
+package nl.requios.effortlessbuilding.compatibility;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumHand;
+import net.minecraftforge.fml.common.Loader;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+import net.minecraftforge.items.CapabilityItemHandler;
+import net.minecraftforge.items.IItemHandler;
+import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
+
+public class CompatHelper {
+    // Get a handle to the dank null item instance. This will remain null if the mod doesn't load
+    // and all checks will fail, so it works.
+    @GameRegistry.ObjectHolder("danknull:dank_null")
+    public static final Item dankNullItem = null;
+
+    public static IChiselsAndBitsProxy chiselsAndBitsProxy;
+
+    public static void postInit() {
+        if (Loader.isModLoaded("chiselsandbits")) {
+            // reflection to avoid hard dependency
+            try {
+                chiselsAndBitsProxy = Class.forName("nl.requios.effortlessbuilding.compatibility.ActiveChiselsAndBitsProxy").asSubclass(ActiveChiselsAndBitsProxy.class).newInstance();
+            } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
+                e.printStackTrace();
+            }
+        } else {
+            chiselsAndBitsProxy = new DummyChiselsAndBitsProxy();
+        }
+    }
+
+    // Check if the item given is a proxy for blocks. For now, we check for the randomizer bag,
+    // /dank/null, or plain old blocks.
+    public static boolean isItemBlockProxy(ItemStack stack) {
+        Item item = stack.getItem();
+        if (item instanceof ItemBlock)
+            return true;
+        if ((item instanceof ItemRandomizerBag))
+            return true;
+        if (item == dankNullItem)
+            return true;
+        return false;
+    }
+
+    // Get the block to be placed by this proxy. For the /dank/null, it's the slot stack
+    // pointed to by nbt integer selectedIndex.
+    public static ItemStack getItemBlockFromStack(ItemStack proxy) {
+        Item proxyItem = proxy.getItem();
+
+        if (proxyItem instanceof ItemBlock)
+            return proxy;
+
+        //Randomizer Bag
+        if (proxyItem instanceof ItemRandomizerBag) {
+            ItemStack itemStack = proxy;
+            while (!(itemStack.getItem() instanceof ItemBlock || itemStack.isEmpty())) {
+                if (itemStack.getItem() instanceof ItemRandomizerBag)
+                    itemStack = ItemRandomizerBag.pickRandomStack(ItemRandomizerBag.getBagInventory(itemStack));
+            }
+            return itemStack;
+        }
+
+        //Dank Null
+        if (proxyItem == dankNullItem) {
+            int index = 0;
+            if (proxy.hasTagCompound() && proxy.getTagCompound().hasKey("selectedIndex"))
+                index = proxy.getTagCompound().getInteger("selectedIndex");
+            return proxy.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null).getStackInSlot(index);
+        }
+
+        return ItemStack.EMPTY;
+    }
+
+    public static ItemStack getItemBlockByState(ItemStack stack, IBlockState state) {
+        Item blockItem = Item.getItemFromBlock(state.getBlock());
+        if (stack.getItem() instanceof ItemBlock)
+            return stack;
+        else if (stack.getItem() instanceof ItemRandomizerBag) {
+            IItemHandler bagInventory = ItemRandomizerBag.getBagInventory(stack);
+            return ItemRandomizerBag.findStack(bagInventory, blockItem);
+        } else if (stack.getItem() == dankNullItem) {
+            int index = itemHandlerSlotForItem(stack, blockItem);
+            if (index >= 0)
+                return stack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null).getStackInSlot(index);
+        }
+        return ItemStack.EMPTY;
+    }
+
+    // Handle IItemHandler slot stacks not being modifiable. We must call IItemHandler#extractItem,
+    // because the ItemStack returned by IItemHandler#getStackInSlot isn't modifiable.
+    public static void shrinkStack(ItemStack origStack, ItemStack curStack, EntityPlayer player) {
+        //Hacky way to get the origstack, because given origStack is itemblock stack and never a proxy
+        origStack = player.getHeldItem(EnumHand.MAIN_HAND);
+
+        if (origStack.getItem() == dankNullItem) {
+            int index = itemHandlerSlotForItem(origStack, curStack.getItem());
+            origStack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null).extractItem(index, 1, false);
+        } else
+            curStack.shrink(1);
+    }
+
+    private static int itemHandlerSlotForItem(ItemStack stack, Item blockItem) {
+        IItemHandler handler = stack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
+        for (int i = 0; i < handler.getSlots(); i++) {
+            ItemStack ref = handler.getStackInSlot(i);
+            if (ref.getItem() instanceof ItemBlock)
+                if (ref.getItem() == blockItem)
+                    return i;
+        }
+        return -1;
+    }
+
+}

src/main/java/nl/requios/effortlessbuilding/compatibility/DummyChiselsAndBitsProxy.java

@@ -0,0 +1,10 @@
+package nl.requios.effortlessbuilding.compatibility;
+
+import net.minecraft.util.EnumHand;
+
+public class DummyChiselsAndBitsProxy implements IChiselsAndBitsProxy {
+    @Override
+    public boolean isHoldingChiselTool(EnumHand hand) {
+        return false;
+    }
+}

src/main/java/nl/requios/effortlessbuilding/compatibility/IChiselsAndBitsProxy.java

@@ -0,0 +1,7 @@
+package nl.requios.effortlessbuilding.compatibility;
+
+import net.minecraft.util.EnumHand;
+
+public interface IChiselsAndBitsProxy {
+    boolean isHoldingChiselTool(EnumHand hand);
+}

src/main/java/nl/requios/effortlessbuilding/gui/RandomizerBagContainer.java

@@ -109,26 +109,22 @@ public class RandomizerBagContainer extends Container {
     @Override
     public ItemStack slotClick(int slot, int dragType, ClickType clickTypeIn, EntityPlayer player) {
         // this will prevent the player from interacting with the item that opened the inventory:
-        ItemStack clickItemStack = super.slotClick(slot, dragType, clickTypeIn, player);
-        if (slot >= 0 && getSlot(slot) != null && getSlot(slot).getStack() == player.getHeldItem(EnumHand.MAIN_HAND)) {
+        if (slot >= 0 && getSlot(slot) != null && getSlot(slot).getStack().equals(player.getHeldItem(EnumHand.MAIN_HAND))) {
             return ItemStack.EMPTY;
         }
-        return clickItemStack;
+        return super.slotClick(slot, dragType, clickTypeIn, player);
     }
 
     /**
      * Callback for when the crafting gui is closed.
      */
-//    @Override
-//    public void onContainerClosed(EntityPlayer player)
-//    {
-//        if(player.inventory.getItemStack() != null)
-//        {
-//            player.entityDropItem(player.inventory.getItemStack(), 0.5f);
-//        }
-//        if(!player.world.isRemote)
-//        {
-//            detectAndSendChanges();
-//        }
-//    }
+    @Override
+    public void onContainerClosed(EntityPlayer player)
+    {
+        super.onContainerClosed(player);
+        if(!player.world.isRemote)
+        {
+            detectAndSendChanges();
+        }
+    }
 }

src/main/java/nl/requios/effortlessbuilding/gui/RandomizerBagGuiContainer.java

@@ -12,7 +12,7 @@ import nl.requios.effortlessbuilding.EffortlessBuilding;
 @SideOnly(Side.CLIENT)
 public class RandomizerBagGuiContainer extends GuiContainer {
     private static final ResourceLocation guiTextures =
-            new ResourceLocation(EffortlessBuilding.MODID + ":textures/gui/container/randomizerbag.png");
+            new ResourceLocation(EffortlessBuilding.MODID, "textures/gui/container/randomizerbag.png");
     private final InventoryPlayer inventoryPlayer;
     private final IItemHandler inventoryBag;
 

src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java

@@ -0,0 +1,476 @@
+package nl.requios.effortlessbuilding.gui.buildmode;
+
+import java.util.ArrayList;
+import java.util.concurrent.TimeUnit;
+
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.util.text.TextFormatting;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions;
+import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
+import nl.requios.effortlessbuilding.proxy.ClientProxy;
+import org.apache.commons.lang3.text.WordUtils;
+import org.lwjgl.opengl.GL11;
+
+import com.google.common.base.Stopwatch;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.util.EnumFacing;
+import net.minecraftforge.client.model.ModelLoader;
+
+import static nl.requios.effortlessbuilding.buildmode.BuildModes.*;
+import static nl.requios.effortlessbuilding.buildmode.ModeOptions.*;
+
+/**
+ * From Chisels and Bits by AlgorithmX2
+ * https://github.com/AlgorithmX2/Chisels-and-Bits/blob/1.12/src/main/java/mod/chiselsandbits/client/gui/ChiselsAndBitsMenu.java
+ */
+public class RadialMenu extends GuiScreen {
+
+    private final float TIME_SCALE = 0.01f;
+    public static final RadialMenu instance = new RadialMenu();
+
+    private float visibility = 0.0f;
+    private Stopwatch lastChange = Stopwatch.createStarted();
+    public BuildModeEnum switchTo = null;
+    public ActionEnum doAction = null;
+    public boolean actionUsed = false;
+
+    private float clampVis(final float f) {
+        return Math.max( 0.0f, Math.min( 1.0f, f ) );
+    }
+
+    public void raiseVisibility() {
+        visibility = clampVis( visibility + lastChange.elapsed( TimeUnit.MILLISECONDS ) * TIME_SCALE );
+        lastChange = Stopwatch.createStarted();
+    }
+
+    public void decreaseVisibility() {
+        visibility = clampVis( visibility - lastChange.elapsed( TimeUnit.MILLISECONDS ) * TIME_SCALE );
+        lastChange = Stopwatch.createStarted();
+    }
+
+    public void setVisibility(float visibility) {
+        this.visibility = visibility;
+    }
+
+    public boolean isVisible() {
+        return visibility > 0.001;
+    }
+
+    public void configure(final int scaledWidth, final int scaledHeight ) {
+        mc = Minecraft.getMinecraft();
+        fontRenderer = mc.fontRenderer;
+        width = scaledWidth;
+        height = scaledHeight;
+    }
+
+    private static class MenuButton {
+
+        public double x1, x2;
+        public double y1, y2;
+        public boolean highlighted;
+
+        public final ActionEnum action;
+        public String name;
+        public EnumFacing textSide;
+
+        public MenuButton(final String name, final ActionEnum action, final double x, final double y,
+                final EnumFacing textSide) {
+            this.name = I18n.format(name);
+            this.action = action;
+            x1 = x - 10;
+            x2 = x + 10;
+            y1 = y - 10;
+            y2 = y + 10;
+            this.textSide = textSide;
+        }
+
+    }
+
+    static class MenuRegion {
+
+        public final BuildModeEnum mode;
+        public double x1, x2;
+        public double y1, y2;
+        public boolean highlighted;
+
+        public MenuRegion(final BuildModeEnum mode) {
+            this.mode = mode;
+        }
+
+    }
+
+    @Override
+    public void drawScreen(final int mouseX, final int mouseY, final float partialTicks) {
+        if (!isVisible()) return;
+
+        BuildModeEnum currentBuildMode = ModeSettingsManager.getModeSettings(Minecraft.getMinecraft().player).getBuildMode();
+
+        GlStateManager.pushMatrix();
+        GlStateManager.translate( 0.0F, 0.0F, 200.0F );
+
+        final int startColor = (int) ( visibility * 98 ) << 24;
+        final int endColor = (int) ( visibility * 128 ) << 24;
+
+        drawGradientRect(0, 0, width, height, startColor, endColor);
+
+        GlStateManager.disableTexture2D();
+        GlStateManager.enableBlend();
+        GlStateManager.disableAlpha();
+        GlStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
+        GlStateManager.shadeModel(GL11.GL_SMOOTH);
+        final Tessellator tessellator = Tessellator.getInstance();
+        final BufferBuilder buffer = tessellator.getBuffer();
+
+        buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR);
+
+        final double middleX = width / 2.0;
+        final double middleY = height / 2.0;
+
+        final double mouseXCenter = mouseX - middleX;
+        final double mouseYCenter = mouseY - middleY;
+        double mouseRadians = Math.atan2(mouseYCenter, mouseXCenter);
+
+        final double ringInnerEdge = 30;
+        final double ringOuterEdge = 65;
+        final double textDistance = 75;
+        final double buttonDistance = 105;
+        final double quarterCircle = Math.PI / 2.0;
+
+        if ( mouseRadians < -quarterCircle ) {
+            mouseRadians = mouseRadians + Math.PI * 2;
+        }
+
+        final ArrayList<MenuRegion> modes = new ArrayList<MenuRegion>();
+        final ArrayList<MenuButton> buttons = new ArrayList<MenuButton>();
+
+        //Add build modes
+        for (final BuildModeEnum mode : BuildModeEnum.values()) {
+            modes.add(new MenuRegion(mode));
+        }
+
+        //Add actions
+        buttons.add(new MenuButton(ActionEnum.UNDO.name, ActionEnum.UNDO, -buttonDistance - 26, -13, EnumFacing.UP));
+        buttons.add(new MenuButton(ActionEnum.REDO.name, ActionEnum.REDO, -buttonDistance, -13, EnumFacing.UP));
+        buttons.add(new MenuButton(ActionEnum.OPEN_MODIFIER_SETTINGS.name, ActionEnum.OPEN_MODIFIER_SETTINGS, -buttonDistance - 26, 13, EnumFacing.DOWN));
+        buttons.add(new MenuButton(ActionEnum.REPLACE.name, ActionEnum.REPLACE, -buttonDistance, 13, EnumFacing.DOWN));
+
+        //Add buildmode dependent options
+        OptionEnum[] options = currentBuildMode.options;
+        for (int i = 0; i < options.length; i++) {
+            for (int j = 0; j < options[i].actions.length; j++) {
+                ActionEnum action = options[i].actions[j];
+                buttons.add(new MenuButton(action.name, action, buttonDistance + j * 26, -13 + i * 39, EnumFacing.DOWN));
+            }
+        }
+
+        switchTo = null;
+        doAction = null;
+
+        //Draw buildmode backgrounds
+        if (!modes.isEmpty()) {
+            final int totalModes = Math.max( 3, modes.size() );
+            int currentMode = 0;
+            final double fragment = Math.PI * 0.005;
+            final double fragment2 = Math.PI * 0.0025;
+            final double perObject = 2.0 * Math.PI / totalModes;
+
+            for (int i = 0; i < modes.size(); i++) {
+                MenuRegion menuRegion = modes.get(i);
+                final double beginRadians = currentMode * perObject - quarterCircle;
+                final double endRadians = (currentMode + 1) * perObject - quarterCircle;
+
+                menuRegion.x1 = Math.cos(beginRadians);
+                menuRegion.x2 = Math.cos(endRadians);
+                menuRegion.y1 = Math.sin(beginRadians);
+                menuRegion.y2 = Math.sin(endRadians);
+
+                final double x1m1 = Math.cos(beginRadians + fragment) * ringInnerEdge;
+                final double x2m1 = Math.cos(endRadians - fragment) * ringInnerEdge;
+                final double y1m1 = Math.sin(beginRadians + fragment) * ringInnerEdge;
+                final double y2m1 = Math.sin(endRadians - fragment) * ringInnerEdge;
+
+                final double x1m2 = Math.cos(beginRadians + fragment2) * ringOuterEdge;
+                final double x2m2 = Math.cos(endRadians - fragment2) * ringOuterEdge;
+                final double y1m2 = Math.sin(beginRadians + fragment2) * ringOuterEdge;
+                final double y2m2 = Math.sin(endRadians - fragment2) * ringOuterEdge;
+
+                float r = 0.0f;
+                float g = 0.0f;
+                float b = 0.0f;
+                float a = 0.5f;
+
+                //check if current mode
+                int buildMode = currentBuildMode.ordinal();
+                if (buildMode == i) {
+                    r = 0f;
+                    g = 0.5f;
+                    b = 1f;
+                    a = 0.5f;
+                    //menuRegion.highlighted = true; //draw text
+                }
+
+                //check if mouse is over this region
+                final boolean isMouseInQuad = inTriangle(x1m1, y1m1, x2m2, y2m2, x2m1, y2m1, mouseXCenter, mouseYCenter)
+                                              || inTriangle(x1m1, y1m1, x1m2, y1m2, x2m2, y2m2, mouseXCenter, mouseYCenter);
+
+                if (beginRadians <= mouseRadians && mouseRadians <= endRadians && isMouseInQuad) {
+                    r = 0.6f;
+                    g = 0.8f;
+                    b = 1f;
+                    a = 0.6f;
+                    menuRegion.highlighted = true;
+                    switchTo = menuRegion.mode;
+                }
+
+                buffer.pos(middleX + x1m1, middleY + y1m1, zLevel).color(r, g, b, a).endVertex();
+                buffer.pos(middleX + x2m1, middleY + y2m1, zLevel).color(r, g, b, a).endVertex();
+                buffer.pos(middleX + x2m2, middleY + y2m2, zLevel).color(r, g, b, a).endVertex();
+                buffer.pos(middleX + x1m2, middleY + y1m2, zLevel).color(r, g, b, a).endVertex();
+
+                currentMode++;
+            }
+        }
+
+        //Draw action backgrounds
+        for (final MenuButton btn : buttons) {
+            float r = 0.5f;
+            float g = 0.5f;
+            float b = 0.5f;
+            float a = 0.5f;
+
+            //highlight when active option
+            if (btn.action == getBuildSpeed() ||
+                btn.action == getFill() ||
+                btn.action == getCubeFill() ||
+                btn.action == getRaisedEdge() ||
+                btn.action == getLineThickness() ||
+                btn.action == getCircleStart()) {
+                r = 0.0f;
+                g = 0.5f;
+                b = 1f;
+                a = 0.6f;
+            }
+
+            //highlight when mouse over
+            if (btn.x1 <= mouseXCenter && btn.x2 >= mouseXCenter && btn.y1 <= mouseYCenter && btn.y2 >= mouseYCenter) {
+                r = 0.6f;
+                g = 0.8f;
+                b = 1f;
+                a = 0.6f;
+                btn.highlighted = true;
+                doAction = btn.action;
+            }
+
+            buffer.pos(middleX + btn.x1, middleY + btn.y1, zLevel).color(r, g, b, a).endVertex();
+            buffer.pos(middleX + btn.x1, middleY + btn.y2, zLevel).color(r, g, b, a).endVertex();
+            buffer.pos(middleX + btn.x2, middleY + btn.y2, zLevel).color(r, g, b, a).endVertex();
+            buffer.pos(middleX + btn.x2, middleY + btn.y1, zLevel).color(r, g, b, a).endVertex();
+        }
+
+        tessellator.draw();
+
+        GlStateManager.shadeModel(GL11.GL_FLAT);
+
+        GlStateManager.translate(0f, 0f, 5f);
+        GlStateManager.enableTexture2D();
+        GlStateManager.color(1f, 1f, 1f, 1f);
+        GlStateManager.disableBlend();
+        GlStateManager.enableAlpha();
+        GlStateManager.bindTexture(Minecraft.getMinecraft().getTextureMapBlocks().getGlTextureId());
+
+        buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR);
+
+        //Draw buildmode icons
+        for (final MenuRegion menuRegion : modes) {
+
+            final double x = (menuRegion.x1 + menuRegion.x2) * 0.5 * (ringOuterEdge * 0.6 + 0.4 * ringInnerEdge);
+            final double y = (menuRegion.y1 + menuRegion.y2) * 0.5 * (ringOuterEdge * 0.6 + 0.4 * ringInnerEdge);
+
+            final TextureAtlasSprite sprite = ClientProxy.getBuildModeIcon(menuRegion.mode);
+
+            final double x1 = x - 8;
+            final double x2 = x + 8;
+            final double y1 = y - 8;
+            final double y2 = y + 8;
+
+            final float f = 1f;
+            final float a = 1f;
+
+            final double u1 = 0;
+            final double u2 = 16;
+            final double v1 = 0;
+            final double v2 = 16;
+
+            buffer.pos(middleX + x1, middleY + y1, zLevel).tex(sprite.getInterpolatedU(u1), sprite.getInterpolatedV(v1)).color(f, f, f, a).endVertex();
+            buffer.pos(middleX + x1, middleY + y2, zLevel).tex(sprite.getInterpolatedU(u1), sprite.getInterpolatedV(v2)).color(f, f, f, a).endVertex();
+            buffer.pos(middleX + x2, middleY + y2, zLevel).tex(sprite.getInterpolatedU(u2), sprite.getInterpolatedV(v2)).color(f, f, f, a).endVertex();
+            buffer.pos(middleX + x2, middleY + y1, zLevel).tex(sprite.getInterpolatedU(u2), sprite.getInterpolatedV(v1)).color(f, f, f, a).endVertex();
+        }
+
+        //Draw action icons
+        for (final MenuButton button : buttons) {
+
+            final float f = 1f;
+            final float a = 1f;
+
+            final double u1 = 0;
+            final double u2 = 16;
+            final double v1 = 0;
+            final double v2 = 16;
+
+            final TextureAtlasSprite sprite = ClientProxy.getModeOptionIcon(button.action);
+
+            final double btnmiddleX = (button.x1 + button.x2) / 2 + 0.01;
+            final double btnmiddleY = (button.y1 + button.y2) / 2 + 0.01;
+            final double btnx1 = btnmiddleX - 8;
+            final double btnx2 = btnmiddleX + 8;
+            final double btny1 = btnmiddleY - 8;
+            final double btny2 = btnmiddleY + 8;
+
+            buffer.pos(middleX + btnx1, middleY + btny1, zLevel).tex(sprite.getInterpolatedU(u1), sprite.getInterpolatedV(v1)).color(f, f, f, a).endVertex();
+            buffer.pos(middleX + btnx1, middleY + btny2, zLevel).tex(sprite.getInterpolatedU(u1), sprite.getInterpolatedV(v2)).color(f, f, f, a).endVertex();
+            buffer.pos(middleX + btnx2, middleY + btny2, zLevel).tex(sprite.getInterpolatedU(u2), sprite.getInterpolatedV(v2)).color(f, f, f, a).endVertex();
+            buffer.pos(middleX + btnx2, middleY + btny1, zLevel).tex(sprite.getInterpolatedU(u2), sprite.getInterpolatedV(v1)).color(f, f, f, a).endVertex();
+        }
+
+        tessellator.draw();
+
+        //Draw strings
+        //fontRenderer.drawStringWithShadow("Actions", (int) (middleX - buttonDistance - 13) - fontRenderer.getStringWidth("Actions") * 0.5f, (int) middleY - 38, 0xffffffff);
+
+        //Draw option strings
+        for (int i = 0; i < currentBuildMode.options.length; i++) {
+            OptionEnum option = options[i];
+            fontRenderer.drawStringWithShadow(I18n.format(option.name), (int) (middleX + buttonDistance - 9), (int) middleY - 37 + i * 39, 0xeeeeeeff);
+        }
+
+        String credits = "Effortless Building";
+        fontRenderer.drawStringWithShadow(credits, width - fontRenderer.getStringWidth(credits) - 4, height - 10, 0x88888888);
+
+        //Draw buildmode text
+        for (final MenuRegion menuRegion : modes) {
+
+            if (menuRegion.highlighted) {
+                final double x = (menuRegion.x1 + menuRegion.x2) * 0.5;
+                final double y = (menuRegion.y1 + menuRegion.y2) * 0.5;
+
+                int fixed_x = (int) (x * textDistance);
+                final int fixed_y = (int) (y * textDistance) - fontRenderer.FONT_HEIGHT / 2;
+                final String text = I18n.format(menuRegion.mode.name);
+
+                if ( x <= -0.2 ) {
+                    fixed_x -= fontRenderer.getStringWidth(text);
+                } else if ( -0.2 <= x && x <= 0.2 ) {
+                    fixed_x -= fontRenderer.getStringWidth(text) / 2;
+                }
+
+                fontRenderer.drawStringWithShadow(text, (int) middleX + fixed_x, (int) middleY + fixed_y, 0xffffffff);
+            }
+        }
+
+        //Draw action text
+        for (final MenuButton button : buttons) {
+            if (button.highlighted) {
+                String text = TextFormatting.AQUA + button.name;
+                int wrap = 120;
+                String keybind = "";
+                String keybindFormatted = "";
+
+                //Add keybind in brackets
+                if (button.action == ActionEnum.UNDO) {
+                    keybind = ClientProxy.keyBindings[4].getDisplayName();
+                }
+                if (button.action == ActionEnum.REDO) {
+                    keybind = ClientProxy.keyBindings[5].getDisplayName();
+                }
+                if (button.action == ActionEnum.REPLACE) {
+                    keybind = ClientProxy.keyBindings[1].getDisplayName();
+                }
+                if (button.action == ActionEnum.OPEN_MODIFIER_SETTINGS) {
+                    keybind = ClientProxy.keyBindings[0].getDisplayName();
+                }
+                if (currentBuildMode.options.length > 0) {
+                    //Add (ctrl) to first two actions of first option
+                    if (button.action == currentBuildMode.options[0].actions[0]
+                        || button.action == currentBuildMode.options[0].actions[1]) {
+                        keybind = ClientProxy.keyBindings[6].getDisplayName();
+                        if (keybind.equals("LCONTROL")) keybind = "Ctrl";
+                    }
+                }
+                if (!keybind.isEmpty()) keybindFormatted = TextFormatting.GRAY + "(" + WordUtils.capitalizeFully(keybind) + ")";
+
+                if (button.textSide == EnumFacing.WEST) {
+
+                    fontRenderer.drawSplitString( text, (int) (middleX + button.x1 - 8 ) - fontRenderer.getStringWidth(text),
+                            (int) (middleY + button.y1 + 6), wrap, 0xffffffff);
+
+                } else if (button.textSide == EnumFacing.EAST) {
+
+                    fontRenderer.drawSplitString(text, (int) (middleX + button.x2 + 8),
+                            (int) (middleY + button.y1 + 6 ), wrap, 0xffffffff);
+
+                } else if (button.textSide == EnumFacing.UP || button.textSide == EnumFacing.NORTH) {
+
+                    fontRenderer.drawSplitString( keybindFormatted, (int) (middleX + (button.x1 + button.x2) * 0.5 - fontRenderer.getStringWidth(keybindFormatted) * 0.5),
+                            (int) (middleY + button.y1 - 26), wrap,0xffffffff);
+
+                    fontRenderer.drawSplitString( text, (int) (middleX + (button.x1 + button.x2) * 0.5 - fontRenderer.getStringWidth(text) * 0.5),
+                            (int) (middleY + button.y1 - 14), wrap,0xffffffff);
+
+                } else if (button.textSide == EnumFacing.DOWN || button.textSide == EnumFacing.SOUTH) {
+
+                    fontRenderer.drawSplitString(text, (int) (middleX + (button.x1 + button.x2) * 0.5 - fontRenderer.getStringWidth(text) * 0.5),
+                            (int) (middleY + button.y1 + 26), wrap, 0xffffffff);
+
+                    fontRenderer.drawSplitString(keybindFormatted, (int) (middleX + (button.x1 + button.x2) * 0.5 - fontRenderer.getStringWidth(keybindFormatted) * 0.5),
+                            (int) (middleY + button.y1 + 38), wrap, 0xffffffff);
+
+                }
+
+            }
+        }
+
+        GlStateManager.popMatrix();
+    }
+
+    private boolean inTriangle(final double x1, final double y1, final double x2, final double y2,
+                               final double x3, final double y3, final double x, final double y ) {
+        final double ab = (x1 - x) * (y2 - y) - (x2 - x) * (y1 - y);
+        final double bc = (x2 - x) * (y3 - y) - (x3 - x) * (y2 - y);
+        final double ca = (x3 - x) * (y1 - y) - (x1 - x) * (y3 - y);
+        return sign(ab) == sign(bc) && sign(bc) == sign(ca);
+    }
+
+    private int sign(final double n) {
+        return n > 0 ? 1 : -1;
+    }
+
+    /**
+     * Called when the mouse is clicked. Args : mouseX, mouseY, clickedButton
+     */
+    @Override
+    protected void mouseClicked(int mouseX, int mouseY, int mouseButton ) {
+        EffortlessBuilding.log("mouse clicked");
+
+//        KeyBinding.updateKeyBindState();
+//        KeyBinding.setKeyBindState(ClientProxy.keyBindings[3].getKeyCode(), true);
+
+//        if (mouseButton == 0) {
+//            this.mc.displayGuiScreen(null);
+//
+//            if (this.mc.currentScreen == null) {
+//                this.mc.setIngameFocus();
+//            }
+//        }
+    }
+}
+

src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ArraySettingsGui.java

@@ -1,13 +1,16 @@
-package nl.requios.effortlessbuilding.gui;
+package nl.requios.effortlessbuilding.gui.buildmodifier;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.fml.client.config.GuiCheckBox;
-import nl.requios.effortlessbuilding.Array;
-import nl.requios.effortlessbuilding.BuildSettingsManager;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmodifier.Array;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.gui.elements.GuiCollapsibleScrollEntry;
+import nl.requios.effortlessbuilding.gui.elements.GuiNumberField;
+import nl.requios.effortlessbuilding.gui.elements.GuiScrollPane;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 
 import java.io.IOException;
@@ -55,9 +58,9 @@ public class ArraySettingsGui extends GuiCollapsibleScrollEntry {
         textArrayCount.setTooltip("How many copies should be made.");
         arrayNumberFieldList.add(textArrayCount);
 
-        BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(mc.player);
-        if (buildSettings != null) {
-            Array.ArraySettings a = buildSettings.getArraySettings();
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player);
+        if (modifierSettings != null) {
+            Array.ArraySettings a = modifierSettings.getArraySettings();
             buttonArrayEnabled.setIsChecked(a.enabled);
             textArrayOffsetX.setNumber(a.offset.getX());
             textArrayOffsetY.setNumber(a.offset.getY());

src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/MirrorSettingsGui.java

@@ -1,4 +1,4 @@
-package nl.requios.effortlessbuilding.gui;
+package nl.requios.effortlessbuilding.gui.buildmodifier;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
@@ -6,9 +6,13 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.fml.client.config.GuiCheckBox;
-import nl.requios.effortlessbuilding.BuildSettingsManager;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.Mirror;
+import nl.requios.effortlessbuilding.buildmodifier.Mirror;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.gui.elements.GuiCollapsibleScrollEntry;
+import nl.requios.effortlessbuilding.gui.elements.GuiIconButton;
+import nl.requios.effortlessbuilding.gui.elements.GuiNumberField;
+import nl.requios.effortlessbuilding.gui.elements.GuiScrollPane;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 
 import java.io.IOException;
@@ -94,9 +98,9 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry {
         buttonDrawPlanes.setTooltip("Show area");
         mirrorIconButtonList.add(buttonDrawPlanes);
 
-        BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(mc.player);
-        if (buildSettings != null) {
-            Mirror.MirrorSettings m = buildSettings.getMirrorSettings();
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player);
+        if (modifierSettings != null) {
+            Mirror.MirrorSettings m = modifierSettings.getMirrorSettings();
             buttonMirrorEnabled.setIsChecked(m.enabled);
             textMirrorPosX.setNumber(m.position.x);
             textMirrorPosY.setNumber(m.position.y);

src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifierSettingsGui.java

@@ -1,14 +1,19 @@
-package nl.requios.effortlessbuilding.gui;
+package nl.requios.effortlessbuilding.gui.buildmodifier;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
-import nl.requios.effortlessbuilding.*;
-import nl.requios.effortlessbuilding.network.BuildSettingsMessage;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmodifier.Array;
+import nl.requios.effortlessbuilding.buildmodifier.Mirror;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.buildmodifier.RadialMirror;
+import nl.requios.effortlessbuilding.gui.elements.GuiScrollPane;
+import nl.requios.effortlessbuilding.network.ModifierSettingsMessage;
 import nl.requios.effortlessbuilding.proxy.ClientProxy;
 
 import java.io.IOException;
 
-public class SettingsGui extends GuiScreen {
+public class ModifierSettingsGui extends GuiScreen {
 
     private GuiScrollPane scrollPane;
     private GuiButton buttonClose;
@@ -113,20 +118,20 @@ public class SettingsGui extends GuiScreen {
         Array.ArraySettings a = arraySettingsGui.getArraySettings();
         RadialMirror.RadialMirrorSettings r = radialMirrorSettingsGui.getRadialMirrorSettings();
 
-        BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(mc.player);
-        if (buildSettings == null) buildSettings = new BuildSettingsManager.BuildSettings();
-        buildSettings.setMirrorSettings(m);
-        buildSettings.setArraySettings(a);
-        buildSettings.setRadialMirrorSettings(r);
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player);
+        if (modifierSettings == null) modifierSettings = new ModifierSettingsManager.ModifierSettings();
+        modifierSettings.setMirrorSettings(m);
+        modifierSettings.setArraySettings(a);
+        modifierSettings.setRadialMirrorSettings(r);
 
         //Sanitize
-        String error = BuildSettingsManager.sanitize(buildSettings, mc.player);
+        String error = ModifierSettingsManager.sanitize(modifierSettings, mc.player);
         if (!error.isEmpty()) EffortlessBuilding.log(mc.player, error);
 
-        BuildSettingsManager.setBuildSettings(mc.player, buildSettings);
+        ModifierSettingsManager.setModifierSettings(mc.player, modifierSettings);
 
         //Send to server
-        EffortlessBuilding.packetHandler.sendToServer(new BuildSettingsMessage(buildSettings));
+        EffortlessBuilding.packetHandler.sendToServer(new ModifierSettingsMessage(modifierSettings));
     }
 
 }

src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/RadialMirrorSettingsGui.java

@@ -1,4 +1,4 @@
-package nl.requios.effortlessbuilding.gui;
+package nl.requios.effortlessbuilding.gui.buildmodifier;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
@@ -6,9 +6,13 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.fml.client.config.GuiCheckBox;
-import nl.requios.effortlessbuilding.BuildSettingsManager;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.RadialMirror;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.buildmodifier.RadialMirror;
+import nl.requios.effortlessbuilding.gui.elements.GuiCollapsibleScrollEntry;
+import nl.requios.effortlessbuilding.gui.elements.GuiIconButton;
+import nl.requios.effortlessbuilding.gui.elements.GuiNumberField;
+import nl.requios.effortlessbuilding.gui.elements.GuiScrollPane;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 
 import java.io.IOException;
@@ -94,9 +98,9 @@ public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry {
         buttonRadialMirrorAlternate = new GuiCheckBox(id++, left + 140, y, " Alternate", false);
         radialMirrorButtonList.add(buttonRadialMirrorAlternate);
 
-        BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(mc.player);
-        if (buildSettings != null) {
-            RadialMirror.RadialMirrorSettings r = buildSettings.getRadialMirrorSettings();
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player);
+        if (modifierSettings != null) {
+            RadialMirror.RadialMirrorSettings r = modifierSettings.getRadialMirrorSettings();
             buttonRadialMirrorEnabled.setIsChecked(r.enabled);
             textRadialMirrorPosX.setNumber(r.position.x);
             textRadialMirrorPosY.setNumber(r.position.y);

src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCollapsibleScrollEntry.java

@@ -1,4 +1,4 @@
-package nl.requios.effortlessbuilding.gui;
+package nl.requios.effortlessbuilding.gui.elements;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;

src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiIconButton.java

@@ -1,4 +1,4 @@
-package nl.requios.effortlessbuilding.gui;
+package nl.requios.effortlessbuilding.gui.elements;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;

src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiNumberField.java

@@ -1,4 +1,4 @@
-package nl.requios.effortlessbuilding.gui;
+package nl.requios.effortlessbuilding.gui.elements;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.*;
@@ -12,8 +12,8 @@ import java.util.List;
 
 public class GuiNumberField extends Gui {
 
-    int x, y, width, height;
-    int buttonWidth = 10;
+    public int x, y, width, height;
+    public int buttonWidth = 10;
 
     protected GuiTextField textField;
     protected GuiButton minusButton, plusButton;
@@ -106,7 +106,7 @@ public class GuiNumberField extends Gui {
 
     }
 
-    protected void actionPerformed(GuiButton button) {
+    public void actionPerformed(GuiButton button) {
         float valueChanged = 1f;
         if (GuiScreen.isCtrlKeyDown()) valueChanged = 5f;
         if (GuiScreen.isShiftKeyDown()) valueChanged = 10f;
@@ -123,7 +123,7 @@ public class GuiNumberField extends Gui {
         textField.updateCursorCounter();
     }
 
-    protected void keyTyped(char typedChar, int keyCode) throws IOException {
+    public void keyTyped(char typedChar, int keyCode) throws IOException {
         if (!textField.isFocused()) return;
 //        if (Character.isDigit(typedChar) || typedChar == '.' || typedChar == '-' || keyCode == Keyboard.KEY_BACK
 //            || keyCode == Keyboard.KEY_DELETE || keyCode == Keyboard.KEY_LEFT || keyCode == Keyboard.KEY_RIGHT

src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiScrollPane.java

@@ -1,4 +1,4 @@
-package nl.requios.effortlessbuilding.gui;
+package nl.requios.effortlessbuilding.gui.elements;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
@@ -10,6 +10,7 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.util.math.MathHelper;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import org.lwjgl.input.Mouse;
@@ -73,22 +74,24 @@ public class GuiScrollPane extends GuiListExtended {
             int insideLeft = this.left + this.width / 2 - this.getListWidth() / 2 + 2;
             int insideTop = this.top + 4 - (int)this.amountScrolled;
 
-            if (this.hasListHeader)
-            {
+            if (this.hasListHeader) {
                 this.drawListHeader(insideLeft, insideTop, tessellator);
             }
 
             //All entries
             this.drawSelectionBox(insideLeft, insideTop, mouseXIn, mouseYIn, partialTicks);
             GlStateManager.disableDepth();
+
             //Dirt overlays on top and bottom
 //            this.overlayBackground(0, this.top, 255, 255);
 //            this.overlayBackground(this.bottom, this.height, 255, 255);
+
             GlStateManager.enableBlend();
             GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ZERO, GlStateManager.DestFactor.ONE);
             GlStateManager.disableAlpha();
             GlStateManager.shadeModel(7425);
             GlStateManager.disableTexture2D();
+
 //            //top fade
 //            bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
 //            bufferbuilder.pos((double)this.left, (double)(this.top + 5), 0.0D).tex(0.0D, 1.0D).color(100, 100, 100, 0).endVertex();
@@ -96,6 +99,7 @@ public class GuiScrollPane extends GuiListExtended {
 //            bufferbuilder.pos((double)this.right, (double)this.top, 0.0D).tex(1.0D, 0.0D).color(100, 100, 100, 100).endVertex();
 //            bufferbuilder.pos((double)this.left, (double)this.top, 0.0D).tex(0.0D, 0.0D).color(100, 100, 100, 100).endVertex();
 //            tessellator.draw();
+
 //            //top line
 //            bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
 //            bufferbuilder.pos((double)this.left, (double)this.top, 0.0D).tex(0.0D, 1.0D).color(20, 20, 20, 255).endVertex();
@@ -103,6 +107,7 @@ public class GuiScrollPane extends GuiListExtended {
 //            bufferbuilder.pos((double)this.right, (double)(this.top - 1), 0.0D).tex(1.0D, 0.0D).color(20, 20, 20, 255).endVertex();
 //            bufferbuilder.pos((double)this.left, (double)(this.top - 1), 0.0D).tex(0.0D, 0.0D).color(20, 20, 20, 255).endVertex();
 //            tessellator.draw();
+
 //            //bottom fade
 //            bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
 //            bufferbuilder.pos((double)this.left, (double)this.bottom, 0.0D).tex(0.0D, 1.0D).color(10, 10, 10, 100).endVertex();
@@ -110,6 +115,7 @@ public class GuiScrollPane extends GuiListExtended {
 //            bufferbuilder.pos((double)this.right, (double)(this.bottom - 5), 0.0D).tex(1.0D, 0.0D).color(10, 10, 10, 0).endVertex();
 //            bufferbuilder.pos((double)this.left, (double)(this.bottom - 5), 0.0D).tex(0.0D, 0.0D).color(10, 10, 10, 0).endVertex();
 //            tessellator.draw();
+
 //            //bottom line
 //            bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
 //            bufferbuilder.pos((double)this.left, (double)(this.bottom + 1), 0.0D).tex(0.0D, 1.0D).color(20, 20, 20, 255).endVertex();
@@ -137,12 +143,14 @@ public class GuiScrollPane extends GuiListExtended {
                 bufferbuilder.pos((double)scrollBarRight, (double)this.top, 0.0D).tex(1.0D, 0.0D).color(0, 0, 0, 255).endVertex();
                 bufferbuilder.pos((double)scrollBarLeft, (double)this.top, 0.0D).tex(0.0D, 0.0D).color(0, 0, 0, 255).endVertex();
                 tessellator.draw();
+
                 bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
                 bufferbuilder.pos((double)scrollBarLeft, (double)(l1 + k1), 0.0D).tex(0.0D, 1.0D).color(128, 128, 128, 255).endVertex();
                 bufferbuilder.pos((double)scrollBarRight, (double)(l1 + k1), 0.0D).tex(1.0D, 1.0D).color(128, 128, 128, 255).endVertex();
                 bufferbuilder.pos((double)scrollBarRight, (double)l1, 0.0D).tex(1.0D, 0.0D).color(128, 128, 128, 255).endVertex();
                 bufferbuilder.pos((double)scrollBarLeft, (double)l1, 0.0D).tex(0.0D, 0.0D).color(128, 128, 128, 255).endVertex();
                 tessellator.draw();
+
                 bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
                 bufferbuilder.pos((double)scrollBarLeft, (double)(l1 + k1 - 1), 0.0D).tex(0.0D, 1.0D).color(192, 192, 192, 255).endVertex();
                 bufferbuilder.pos((double)(scrollBarRight - 1), (double)(l1 + k1 - 1), 0.0D).tex(1.0D, 1.0D).color(192, 192, 192, 255).endVertex();
@@ -184,8 +192,7 @@ public class GuiScrollPane extends GuiListExtended {
     public int getSlotIndexFromScreenCoords(int posX, int posY) {
         int left = this.left + (this.width - this.getListWidth()) / 2;
         int right = this.left + (this.width + this.getListWidth()) / 2;
-        int relativeMouseY = posY - this.top - this.headerPadding + (int)this.amountScrolled - 4; //click height in content dimensions
-        //int slotIndex = relativeMouseY / this.slotHeight;
+        int relativeMouseY = getRelativeMouseY(mouseY, 0);
 
         //Iterate over every entry until relativeMouseY falls within its height
         for (int i = 0; i < listEntries.size(); i++) {
@@ -201,24 +208,32 @@ public class GuiScrollPane extends GuiListExtended {
     @Override
     public boolean mouseClicked(int mouseX, int mouseY, int mouseEvent)
     {
-        if (this.isMouseYWithinSlotBounds(mouseY))
-        {
-            int i = this.getSlotIndexFromScreenCoords(mouseX, mouseY);
+        int selectedSlot = this.getSlotIndexFromScreenCoords(mouseX, mouseY);
+        int relativeX = getRelativeMouseX(mouseX);
 
-            if (i >= 0)
-            {
-                int j = this.left + this.width / 2 - this.getListWidth() / 2 + 2;
-                int k = this.top + 4 - this.getAmountScrolled() + getContentHeight(i) + this.headerPadding;
-                int relativeX = mouseX - j;
-                int relativeY = mouseY - k;
+        //Always pass through mouseclicked, to be able to unfocus textfields
+        for (int i = 0; i < this.listEntries.size(); i++) {
+            int relativeY = getRelativeMouseY(mouseY, i);
+            this.getListEntry(i).mousePressed(selectedSlot, mouseX, mouseY, mouseEvent, relativeX, relativeY);
+        }
 
-                if (this.getListEntry(i).mousePressed(i, mouseX, mouseY, mouseEvent, relativeX, relativeY))
-                {
-                    this.setEnabled(false);
-                    return true;
-                }
-            }
-        }
+
+//        if (this.isMouseYWithinSlotBounds(mouseY))
+//        {
+//            int i = this.getSlotIndexFromScreenCoords(mouseX, mouseY);
+//
+//            if (i >= 0)
+//            {
+//                int relativeX = getRelativeMouseX(mouseX);
+//                int relativeY = getRelativeMouseY(mouseY, i);
+//
+//                if (this.getListEntry(i).mousePressed(i, mouseX, mouseY, mouseEvent, relativeX, relativeY))
+//                {
+//                    this.setEnabled(false);
+//                    return true;
+//                }
+//            }
+//        }
 
         return false;
     }
@@ -228,10 +243,8 @@ public class GuiScrollPane extends GuiListExtended {
     {
         for (int i = 0; i < this.getSize(); ++i)
         {
-            int j = this.left + this.width / 2 - this.getListWidth() / 2 + 2;
-            int k = this.top + 4 - this.getAmountScrolled() + getContentHeight(i) + this.headerPadding;
-            int relativeX = x - j;
-            int relativeY = y - k;
+            int relativeX = getRelativeMouseX(mouseX);
+            int relativeY = getRelativeMouseY(mouseY, i);
             this.getListEntry(i).mouseReleased(i, x, y, mouseEvent, relativeX, relativeY);
         }
 
@@ -246,9 +259,8 @@ public class GuiScrollPane extends GuiListExtended {
                 this.mouseY <= this.bottom) {
                 int i = this.left + (this.width - this.getListWidth()) / 2;
                 int j = this.left + (this.width + this.getListWidth()) / 2;
-                int relativeMouseY = this.mouseY - this.top - this.headerPadding + (int) this.amountScrolled -
-                                     4; //click height in content dimensions
                 int slotIndex = getSlotIndexFromScreenCoords(this.mouseX, this.mouseY);
+                int relativeMouseY = getRelativeMouseY(mouseY, slotIndex);
 
                 if (slotIndex > -1) {
                     this.elementClicked(slotIndex, false, this.mouseX, this.mouseY);
@@ -265,9 +277,8 @@ public class GuiScrollPane extends GuiListExtended {
                     if (this.mouseY >= this.top && this.mouseY <= this.bottom) {
                         int i2 = this.left + (this.width - this.getListWidth()) / 2;
                         int j2 = this.left + (this.width + this.getListWidth()) / 2;
-                        int relativeMouseY = this.mouseY - this.top - this.headerPadding + (int) this.amountScrolled -
-                                             4; //click height in content dimensions
                         int slotIndex = getSlotIndexFromScreenCoords(this.mouseX, this.mouseY);
+                        int relativeMouseY = getRelativeMouseY(mouseY, slotIndex);
 
                         if (slotIndex > -1) {
                             boolean flag = slotIndex == this.selectedElement &&
@@ -383,6 +394,26 @@ public class GuiScrollPane extends GuiListExtended {
         }
     }
 
+    private int getRelativeMouseX(int mouseX) {
+        int j = this.left + this.width / 2 - this.getListWidth() / 2 + 2;
+        return mouseX - j;
+    }
+
+    private int getRelativeMouseY(int mouseY, int contentIndex) {
+        int k = this.top + 4 - this.getAmountScrolled() + getContentHeight(contentIndex) + this.headerPadding;
+        int relativeMouseY = mouseY - k;
+
+        //Content might be centered, adjust relative mouse y accordingly
+        int contentHeight = getContentHeight();
+        int insideHeight = this.bottom - this.top - 4;
+
+        if (contentHeight < insideHeight) {
+            //it fits, so we can center it vertically
+            relativeMouseY -= (insideHeight - contentHeight) / 2;
+        }
+        return relativeMouseY;
+    }
+
     //PASSTHROUGHS
     public int initGui(int id, List<GuiButton> buttonList) {
         for (IScrollEntry entry : this.listEntries) {

src/main/java/nl/requios/effortlessbuilding/helper/FixedStack.java

@@ -0,0 +1,54 @@
+package nl.requios.effortlessbuilding.helper;
+
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+
+//Stack with fixed size. Removes (overwrites) oldest element on push.
+public class FixedStack<T> {
+    private T[] stack;
+    private int size;
+    private int top;
+    private int filled = 0; //how many valid items are in the stack
+
+    public FixedStack(T[] stack) {
+        this.stack = stack;
+        this.top = 0;
+        this.size = stack.length;
+    }
+
+    public void push(T object) {
+        if (top == stack.length)
+            top = 0;
+
+        stack[top] = object;
+        top++;
+
+        if (filled < size)
+            filled++;
+    }
+
+    public T pop() {
+        if (filled <= 0) return null;
+
+        if (top - 1 < 0)
+            top = size;
+
+        top--;
+        T object = stack[top];
+        filled--;
+
+        return object;
+    }
+
+    public void clear() {
+        top = 0;
+        filled = 0;
+    }
+
+    public int size() {
+        return size;
+    }
+
+    public boolean isEmpty() {
+        return filled <= 0;
+    }
+}

src/main/java/nl/requios/effortlessbuilding/helper/InventoryHelper.java

@@ -0,0 +1,31 @@
+package nl.requios.effortlessbuilding.helper;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+
+public class InventoryHelper {
+
+    public static ItemStack findItemStackInInventory(EntityPlayer player, Block block) {
+        for (ItemStack invStack : player.inventory.mainInventory) {
+            if (!invStack.isEmpty() && invStack.getItem() instanceof ItemBlock &&
+                ((ItemBlock) invStack.getItem()).getBlock().equals(block)) {
+                return invStack;
+            }
+        }
+        return ItemStack.EMPTY;
+    }
+
+    public static int findTotalBlocksInInventory(EntityPlayer player, Block block) {
+        int total = 0;
+        for (ItemStack invStack : player.inventory.mainInventory) {
+            if (!invStack.isEmpty() && invStack.getItem() instanceof ItemBlock &&
+                ((ItemBlock) invStack.getItem()).getBlock().equals(block)) {
+                total += invStack.getCount();
+            }
+        }
+        return total;
+    }
+}

src/main/java/nl/requios/effortlessbuilding/helper/ReachHelper.java

@@ -1,8 +1,9 @@
 package nl.requios.effortlessbuilding.helper;
 
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.math.MathHelper;
 import nl.requios.effortlessbuilding.BuildConfig;
-import nl.requios.effortlessbuilding.BuildSettingsManager;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 
 public class ReachHelper {
     public static int getMaxReach(EntityPlayer player) {
@@ -11,7 +12,7 @@ public class ReachHelper {
         if (!BuildConfig.reach.enableReachUpgrades) return BuildConfig.reach.maxReachLevel3;
 
         //Check buildsettings for reachUpgrade
-        int reachUpgrade = BuildSettingsManager.getBuildSettings(player).getReachUpgrade();
+        int reachUpgrade = ModifierSettingsManager.getModifierSettings(player).getReachUpgrade();
         switch (reachUpgrade) {
             case 0: return BuildConfig.reach.maxReachLevel0;
             case 1: return BuildConfig.reach.maxReachLevel1;
@@ -21,6 +22,28 @@ public class ReachHelper {
         return BuildConfig.reach.maxReachLevel0;
     }
 
+    public static int getPlacementReach(EntityPlayer player) {
+        return getMaxReach(player) / 4;
+    }
+
+    public static int getMaxBlocksPlacedAtOnce(EntityPlayer player) {
+        if (player.isCreative()) return 1000000;
+        return MathHelper.ceil(Math.pow(getMaxReach(player), 1.6));
+        //Level 0: 121
+        //Level 1: 523
+        //Level 2: 1585
+        //Level 3: 4805
+    }
+
+    public static int getMaxBlocksPerAxis(EntityPlayer player) {
+        if (player.isCreative()) return 2000;
+        return MathHelper.ceil(getMaxReach(player) * 0.3);
+        //Level 0: 6
+        //Level 1: 15
+        //Level 2: 30
+        //Level 3: 60
+    }
+
     public static boolean canBreakFar(EntityPlayer player) {
         return player.isCreative() || BuildConfig.survivalBalancers.breakFar;
     }

src/main/java/nl/requios/effortlessbuilding/helper/RenderHelper.java

@@ -1,435 +0,0 @@
-package nl.requios.effortlessbuilding.helper;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.*;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.SoundCategory;
-import net.minecraft.util.SoundEvent;
-import net.minecraft.util.math.*;
-import net.minecraft.world.IWorldEventListener;
-import net.minecraft.world.World;
-import net.minecraftforge.client.event.RenderWorldLastEvent;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.relauncher.Side;
-import nl.requios.effortlessbuilding.*;
-import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
-import nl.requios.effortlessbuilding.proxy.ClientProxy;
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL14;
-import org.lwjgl.util.Color;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.List;
-
-@Mod.EventBusSubscriber(Side.CLIENT)
-public class RenderHelper implements IWorldEventListener {
-
-    private static final Color colorX = new Color(255, 72, 52);
-    private static final Color colorY = new Color(67, 204, 51);
-    private static final Color colorZ = new Color(52, 247, 255);
-    private static final Color colorRadial = new Color(52, 247, 255);
-    private static final int lineAlpha = 200;
-    private static final int planeAlpha = 75;
-    private static final Vec3d epsilon = new Vec3d(0.001, 0.001, 0.001); //prevents z-fighting
-
-    private static List<BlockPos> previousCoordinates;
-
-    private static void begin(float partialTicks) {
-        EntityPlayer player = Minecraft.getMinecraft().player;
-        double playerX = player.prevPosX + (player.posX - player.prevPosX) * partialTicks;
-        double playerY = player.prevPosY + (player.posY - player.prevPosY) * partialTicks;
-        double playerZ = player.prevPosZ + (player.posZ - player.prevPosZ) * partialTicks;
-        Vec3d playerPos = new Vec3d(playerX, playerY, playerZ);
-
-        GL11.glPushMatrix();
-        GL11.glTranslated(-playerPos.x, -playerPos.y, -playerPos.z);
-
-        GL11.glDepthMask(false);
-    }
-
-    private static void beginLines() {
-        GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
-        GL11.glDisable(GL11.GL_CULL_FACE);
-        GL11.glDisable(GL11.GL_LIGHTING);
-        GL11.glDisable(GL11.GL_TEXTURE_2D);
-
-        GL11.glEnable(GL11.GL_BLEND);
-        GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-
-        GL11.glLineWidth(2);
-    }
-
-    private static void endLines() {
-        GL11.glPopAttrib();
-    }
-
-    private static void beginBlockPreviews() {
-        GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
-        GL11.glEnable(GL11.GL_CULL_FACE);
-        GL11.glEnable(GL11.GL_TEXTURE_2D);
-        Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
-        GlStateManager.enableBlend();
-        GlStateManager.blendFunc(GL11.GL_CONSTANT_ALPHA, GL11.GL_ONE_MINUS_CONSTANT_ALPHA);
-        GL14.glBlendColor(1F, 1F, 1F, 0.8f);
-    }
-
-    private static void endBlockPreviews() {
-        GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-        GlStateManager.disableBlend();
-        GL11.glPopAttrib();
-    }
-
-    private static void end() {
-        GL11.glDepthMask(true);
-        GL11.glPopMatrix();
-    }
-
-    private static void renderBlockPreview(BlockRendererDispatcher dispatcher, BlockPos blockPos, IBlockState blockState) {
-        GlStateManager.pushMatrix();
-        GlStateManager.translate(blockPos.getX(), blockPos.getY(), blockPos.getZ());
-        GlStateManager.rotate(-90.0F, 0.0F, 1.0F, 0.0F);
-        GlStateManager.translate(-0.005f, -0.005f, 0.005f);
-        GlStateManager.scale(1.01f, 1.01f, 1.01f);
-        dispatcher.renderBlockBrightness(blockState, 0.85f);
-        GlStateManager.popMatrix();
-    }
-
-    public static void renderBlockOutline(BlockPos pos) {
-        renderBlockOutline(pos, pos);
-    }
-
-    //Renders outline. Pos1 has to be minimal x,y,z and pos2 maximal x,y,z
-    public static void renderBlockOutline(BlockPos pos1, BlockPos pos2) {
-        GL11.glLineWidth(2);
-
-        AxisAlignedBB aabb = new AxisAlignedBB(pos1, pos2.add(1, 1, 1)).grow(0.0020000000949949026);
-
-        RenderGlobal.drawSelectionBoundingBox(aabb, 0f, 0f, 0f, 0.4f);
-    }
-
-    @SubscribeEvent
-    public static void onRender(RenderWorldLastEvent event) {
-        EntityPlayer player = Minecraft.getMinecraft().player;
-        BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(player);
-
-        begin(event.getPartialTicks());
-
-        beginLines();
-        //Mirror lines and areas
-        Mirror.MirrorSettings m = buildSettings.getMirrorSettings();
-        if (m != null && m.enabled && (m.mirrorX || m.mirrorY || m.mirrorZ))
-        {
-            Vec3d pos = m.position.add(epsilon);
-            int radius = m.radius;
-
-            if (m.mirrorX)
-            {
-                Vec3d posA = new Vec3d(pos.x, pos.y - radius, pos.z - radius);
-                Vec3d posB = new Vec3d(pos.x, pos.y + radius, pos.z + radius);
-
-                drawMirrorPlane(posA, posB, colorX, m.drawLines, m.drawPlanes, true);
-            }
-            if (m.mirrorY)
-            {
-                Vec3d posA = new Vec3d(pos.x - radius, pos.y, pos.z - radius);
-                Vec3d posB = new Vec3d(pos.x + radius, pos.y, pos.z + radius);
-
-                drawMirrorPlaneY(posA, posB, colorY, m.drawLines, m.drawPlanes);
-            }
-            if (m.mirrorZ)
-            {
-                Vec3d posA = new Vec3d(pos.x - radius, pos.y - radius, pos.z);
-                Vec3d posB = new Vec3d(pos.x + radius, pos.y + radius, pos.z);
-
-                drawMirrorPlane(posA, posB, colorZ, m.drawLines, m.drawPlanes, true);
-            }
-
-            //Draw axis coordinated colors if two or more axes are enabled
-            //(If only one is enabled the lines are that planes color)
-            if (m.drawLines && ((m.mirrorX && m.mirrorY) || (m.mirrorX && m.mirrorZ) || (m.mirrorY && m.mirrorZ)))
-            {
-                drawMirrorLines(m);
-            }
-        }
-
-        //Radial mirror lines and areas
-        RadialMirror.RadialMirrorSettings r = buildSettings.getRadialMirrorSettings();
-        if (r != null && r.enabled)
-        {
-            Vec3d pos = r.position.add(epsilon);
-            int radius = r.radius;
-
-            float angle = 2f * ((float) Math.PI) / r.slices;
-            Vec3d relStartVec = new Vec3d(radius, 0, 0);
-            if (r.slices%4 == 2) relStartVec = relStartVec.rotateYaw(angle / 2f);
-
-            for (int i = 0; i < r.slices; i++) {
-                Vec3d relNewVec = relStartVec.rotateYaw(angle * i);
-                Vec3d newVec = pos.add(relNewVec);
-
-                Vec3d posA = new Vec3d(pos.x, pos.y - radius, pos.z);
-                Vec3d posB = new Vec3d(newVec.x, pos.y + radius, newVec.z);
-                drawMirrorPlane(posA, posB, colorRadial, r.drawLines, r.drawPlanes, false);
-            }
-        }
-        endLines();
-
-        //Render block previews
-        RayTraceResult lookingAt = ClientProxy.getLookingAt(player);
-        //Checking for null is necessary! Even in vanilla when looking down ladders it is occasionally null (instead of Type MISS)
-        if (lookingAt != null && lookingAt.typeOfHit == RayTraceResult.Type.BLOCK)
-        {
-            beginBlockPreviews();
-            BlockRendererDispatcher dispatcher = Minecraft.getMinecraft().getBlockRendererDispatcher();
-            BlockPos startPos = lookingAt.getBlockPos();
-
-            //Check if tool (or none) in hand
-            ItemStack mainhand = player.getHeldItemMainhand();
-            boolean toolInHand = !(!mainhand.isEmpty() && (mainhand.getItem() instanceof ItemBlock || mainhand.getItem() instanceof ItemRandomizerBag));
-            boolean replaceable =
-                    player.world.getBlockState(startPos).getBlock().isReplaceable(player.world, startPos);
-            if (!buildSettings.doQuickReplace() && !toolInHand && !replaceable) {
-                startPos = startPos.offset(lookingAt.sideHit);
-            }
-
-            //Get under tall grass and other replaceable blocks
-            if (buildSettings.doQuickReplace() && !toolInHand && replaceable) {
-                startPos = startPos.down();
-            }
-
-            if (BuildModifiers.isEnabled(buildSettings, startPos) || BuildConfig.visuals.alwaysShowBlockPreview) {
-                //get coordinates
-                List<BlockPos> newCoordinates = BuildModifiers.findCoordinates(player, startPos);
-
-                //check if they are different from previous
-                if (!BuildModifiers.compareCoordinates(previousCoordinates, newCoordinates)) {
-                    previousCoordinates = newCoordinates;
-                    //if so, renew randomness of randomizer bag
-                    ItemRandomizerBag.renewRandomness();
-                }
-
-                Vec3d hitVec = lookingAt.hitVec;
-                hitVec = new Vec3d(Math.abs(hitVec.x - ((int) hitVec.x)), Math.abs(hitVec.y - ((int) hitVec.y)),
-                        Math.abs(hitVec.z - ((int) hitVec.z)));
-                List<ItemStack> itemStacks = new ArrayList<>();
-                List<IBlockState> blockStates = BuildModifiers.findBlockStates(player, startPos, hitVec, lookingAt.sideHit, itemStacks);
-
-                //check if valid blockstates
-                if (blockStates.size() != 0 && newCoordinates.size() == blockStates.size()) {
-                    for (int i = newCoordinates.size() - 1; i >= 0; i--) {
-                        BlockPos blockPos = newCoordinates.get(i);
-                        IBlockState blockState = blockStates.get(i);
-                        ItemStack itemstack = itemStacks.get(i);
-                        //Check if can place
-                        if (!itemstack.isEmpty() && SurvivalHelper.canPlayerEdit(player, player.world, blockPos, itemstack) &&
-                            SurvivalHelper.mayPlace(player.world, Block.getBlockFromItem(itemstack.getItem()), blockState, blockPos, true, EnumFacing.UP, player) &&
-                            SurvivalHelper.canReplace(player.world, player, blockPos)) {
-                            renderBlockPreview(dispatcher, blockPos, blockState);
-                        }
-                    }
-                }
-            }
-            endBlockPreviews();
-
-            beginLines();
-            //Draw outlines if tool in hand
-            //Find proper raytrace: either normal range or increased range depending on canBreakFar
-            RayTraceResult objectMouseOver = Minecraft.getMinecraft().objectMouseOver;
-            RayTraceResult breakingRaytrace = ReachHelper.canBreakFar(player) ? lookingAt : objectMouseOver;
-            if (toolInHand && breakingRaytrace != null && breakingRaytrace.typeOfHit == RayTraceResult.Type.BLOCK) {
-                List<BlockPos> breakCoordinates = BuildModifiers.findCoordinates(player, breakingRaytrace.getBlockPos());
-
-                //Only render first outline if further than normal reach
-                boolean excludeFirst = objectMouseOver != null && objectMouseOver.typeOfHit == RayTraceResult.Type.BLOCK;
-                for (int i = excludeFirst ? 1 : 0; i < breakCoordinates.size(); i++) {
-                    BlockPos coordinate = breakCoordinates.get(i);
-
-                    IBlockState blockState = player.world.getBlockState(coordinate);
-                    if (!blockState.getBlock().isAir(blockState, player.world, coordinate)) {
-                        if (SurvivalHelper.canBreak(player.world, player, coordinate) || i == 0) {
-                            renderBlockOutline(coordinate);
-                        }
-                    }
-                }
-            }
-            endLines();
-        }
-
-        end();
-    }
-
-
-    //----Mirror----
-
-    public static void drawMirrorPlane(Vec3d posA, Vec3d posB, Color c, boolean drawLines, boolean drawPlanes, boolean drawVerticalLines) {
-
-        GL11.glColor4d(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha);
-        Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder bufferBuilder = tessellator.getBuffer();
-
-        if (drawPlanes) {
-            bufferBuilder.begin(GL11.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_COLOR);
-
-            bufferBuilder.pos(posA.x, posA.y, posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
-            bufferBuilder.pos(posA.x, posB.y, posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
-            bufferBuilder.pos(posB.x, posA.y, posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
-            bufferBuilder.pos(posB.x, posB.y, posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
-
-            tessellator.draw();
-        }
-
-        if (drawLines) {
-            Vec3d middle = posA.add(posB).scale(0.5);
-            bufferBuilder.begin(GL11.GL_LINES, DefaultVertexFormats.POSITION_COLOR);
-
-            bufferBuilder.pos(posA.x, middle.y, posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
-            bufferBuilder.pos(posB.x, middle.y, posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
-            if (drawVerticalLines) {
-                bufferBuilder.pos(middle.x, posA.y, middle.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
-                bufferBuilder.pos(middle.x, posB.y, middle.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
-            }
-
-            tessellator.draw();
-        }
-    }
-
-    public static void drawMirrorPlaneY(Vec3d posA, Vec3d posB, Color c, boolean drawLines, boolean drawPlanes) {
-
-        GL11.glColor4d(c.getRed(), c.getGreen(), c.getBlue(), c.getAlpha());
-        Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder bufferBuilder = tessellator.getBuffer();
-
-        if (drawPlanes) {
-            bufferBuilder.begin(GL11.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_COLOR);
-
-            bufferBuilder.pos(posA.x, posA.y, posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
-            bufferBuilder.pos(posA.x, posA.y, posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
-            bufferBuilder.pos(posB.x, posA.y, posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
-            bufferBuilder.pos(posB.x, posA.y, posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
-
-            tessellator.draw();
-        }
-
-        if (drawLines) {
-            Vec3d middle = posA.add(posB).scale(0.5);
-            bufferBuilder.begin(GL11.GL_LINES, DefaultVertexFormats.POSITION_COLOR);
-
-            bufferBuilder.pos(middle.x, middle.y, posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
-            bufferBuilder.pos(middle.x, middle.y, posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
-            bufferBuilder.pos(posA.x, middle.y, middle.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
-            bufferBuilder.pos(posB.x, middle.y, middle.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
-
-            tessellator.draw();
-        }
-    }
-
-    public static void drawMirrorLines(Mirror.MirrorSettings m) {
-
-        Vec3d pos = m.position.add(epsilon);
-
-        GL11.glColor4d(100, 100, 100, 255);
-        GL11.glLineWidth(2);
-        Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder bufferBuilder = tessellator.getBuffer();
-
-        bufferBuilder.begin(GL11.GL_LINES, DefaultVertexFormats.POSITION_COLOR);
-
-        bufferBuilder.pos(pos.x - m.radius, pos.y, pos.z).color(colorX.getRed(), colorX.getGreen(), colorX.getBlue(), lineAlpha).endVertex();
-        bufferBuilder.pos(pos.x + m.radius, pos.y, pos.z).color(colorX.getRed(), colorX.getGreen(), colorX.getBlue(), lineAlpha).endVertex();
-        bufferBuilder.pos(pos.x, pos.y - m.radius, pos.z).color(colorY.getRed(), colorY.getGreen(), colorY.getBlue(), lineAlpha).endVertex();
-        bufferBuilder.pos(pos.x, pos.y + m.radius, pos.z).color(colorY.getRed(), colorY.getGreen(), colorY.getBlue(), lineAlpha).endVertex();
-        bufferBuilder.pos(pos.x, pos.y, pos.z - m.radius).color(colorZ.getRed(), colorZ.getGreen(), colorZ.getBlue(), lineAlpha).endVertex();
-        bufferBuilder.pos(pos.x, pos.y, pos.z + m.radius).color(colorZ.getRed(), colorZ.getGreen(), colorZ.getBlue(), lineAlpha).endVertex();
-
-        tessellator.draw();
-    }
-
-    //IWORLDEVENTLISTENER IMPLEMENTATION
-    @Override
-    public void notifyBlockUpdate(World worldIn, BlockPos pos, IBlockState oldState, IBlockState newState, int flags) {
-
-    }
-
-    @Override
-    public void notifyLightSet(BlockPos pos) {
-
-    }
-
-    @Override
-    public void markBlockRangeForRenderUpdate(int x1, int y1, int z1, int x2, int y2, int z2) {
-
-    }
-
-    @Override
-    public void playSoundToAllNearExcept(@Nullable EntityPlayer player, SoundEvent soundIn, SoundCategory category,
-                                         double x, double y, double z, float volume, float pitch) {
-
-    }
-
-    @Override
-    public void playRecord(SoundEvent soundIn, BlockPos pos) {
-
-    }
-
-    @Override
-    public void spawnParticle(int particleID, boolean ignoreRange, double xCoord, double yCoord, double zCoord,
-                              double xSpeed, double ySpeed, double zSpeed, int... parameters) {
-
-    }
-
-    @Override
-    public void spawnParticle(int id, boolean ignoreRange, boolean p_190570_3_, double x, double y, double z,
-                              double xSpeed, double ySpeed, double zSpeed, int... parameters) {
-
-    }
-
-    @Override
-    public void onEntityAdded(Entity entityIn) {
-
-    }
-
-    @Override
-    public void onEntityRemoved(Entity entityIn) {
-
-    }
-
-    @Override
-    public void broadcastSound(int soundID, BlockPos pos, int data) {
-
-    }
-
-    @Override
-    public void playEvent(EntityPlayer player, int type, BlockPos blockPosIn, int data) {
-
-    }
-
-    //Sends breaking progress for all coordinates to renderglobal, so all blocks get visually broken
-    @Override
-    public void sendBlockBreakProgress(int breakerId, BlockPos pos, int progress) {
-        Minecraft mc = Minecraft.getMinecraft();
-
-        BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(mc.player);
-        if (!BuildModifiers.isEnabled(buildSettings, pos)) return;
-
-        List<BlockPos> coordinates = BuildModifiers.findCoordinates(mc.player, pos);
-        for (int i = 1; i < coordinates.size(); i++) {
-            BlockPos coordinate = coordinates.get(i);
-            if (SurvivalHelper.canBreak(mc.world, mc.player, coordinate)) {
-                //Send i as entity id because only one block can be broken per id
-                //Unless i happens to be the player id, then take something else
-                int fakeId = mc.player.getEntityId() != i ? i : coordinates.size();
-                mc.renderGlobal.sendBlockBreakProgress(fakeId, coordinate, progress);
-            }
-        }
-    }
-}

src/main/java/nl/requios/effortlessbuilding/helper/SurvivalHelper.java

@@ -2,100 +2,117 @@ package nl.requios.effortlessbuilding.helper;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockLiquid;
+import net.minecraft.block.BlockSlab;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
-import net.minecraft.init.Enchantments;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemSlab;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
 import net.minecraft.util.SoundCategory;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.items.IItemHandler;
-import net.minecraftforge.items.ItemHandlerHelper;
-import nl.requios.effortlessbuilding.BuildSettingsManager;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
+import nl.requios.effortlessbuilding.BuildConfig;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.compatibility.CompatHelper;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.util.List;
 
 public class SurvivalHelper {
 
     //Used for all placing of blocks in this mod.
     //Checks if area is loaded, if player has the right permissions, if existing block can be replaced (drops it if so) and consumes an item from the stack.
     //Based on ItemBlock#onItemUse
-    public static boolean placeBlock(World world, EntityPlayer player, BlockPos pos, IBlockState blockState, ItemStack itemstack, EnumFacing facing, boolean skipCollisionCheck, boolean playSound) {
+    public static boolean placeBlock(World world, EntityPlayer player, BlockPos pos, IBlockState blockState,
+                                     ItemStack origstack, EnumFacing facing, Vec3d hitVec, boolean skipPlaceCheck,
+                                     boolean skipCollisionCheck, boolean playSound) {
         if (!world.isBlockLoaded(pos, true)) return false;
+        ItemStack itemstack = origstack;
 
-        //Randomizer bag synergy
-        //Find itemstack that belongs to the blockstate
-        if (itemstack.getItem() == EffortlessBuilding.ITEM_RANDOMIZER_BAG) {
-            IItemHandler bagInventory = ItemRandomizerBag.getBagInventory(itemstack);
-            itemstack = ItemRandomizerBag.findStack(bagInventory, Item.getItemFromBlock(blockState.getBlock()));
+        if (blockState.getBlock().isAir(blockState, world, pos) || itemstack.isEmpty()) {
+            dropBlock(world, player, pos);
+            world.setBlockToAir(pos);
+            return true;
         }
 
-        //Check if itemstack is correct
-        if (!(itemstack.getItem() instanceof ItemBlock) || Block.getBlockFromItem(itemstack.getItem()) != blockState.getBlock()) {
-            EffortlessBuilding.log(player, "Cannot (re)place block", true);
-            EffortlessBuilding.log("SurvivalHelper#placeBlock: itemstack " + itemstack.toString() + " does not match blockstate " + blockState.toString());
+        //Randomizer bag, other proxy item synergy
+        //Preliminary compatibility code for other items that hold blocks
+        if (CompatHelper.isItemBlockProxy(itemstack))
+            itemstack = CompatHelper.getItemBlockByState(itemstack, blockState);
+
+        if (!(itemstack.getItem() instanceof ItemBlock))
             return false;
-        }
-
         Block block = ((ItemBlock) itemstack.getItem()).getBlock();
 
-        if (!itemstack.isEmpty() && canPlayerEdit(player, world, pos, itemstack) &&
-            mayPlace(world, block, blockState, pos, skipCollisionCheck, facing.getOpposite(), player) &&
-            canReplace(world, player, pos))
-        {
+
+        //More manual with ItemBlock#placeBlockAt
+        if (skipPlaceCheck || canPlace(world, player, pos, blockState, itemstack, skipCollisionCheck, facing.getOpposite())) {
             //Drop existing block
-            //TODO check if can replace
             dropBlock(world, player, pos);
 
-            //From ItemBlock#placeBlockAt
-            if (!world.setBlockState(pos, blockState, 11)) return false;
+            boolean placed = ((ItemBlock) itemstack.getItem()).placeBlockAt(itemstack, player, world, pos, facing, (float) hitVec.x, (float) hitVec.y, (float) hitVec.z, blockState);
+            if (!placed) return false;
 
-            IBlockState state = world.getBlockState(pos);
-            if (state.getBlock() == block)
-            {
-                ((ItemBlock) itemstack.getItem()).setTileEntityNBT(world, player, pos, itemstack);
-                block.onBlockPlacedBy(world, pos, state, player, itemstack);
-
-//                if (player instanceof EntityPlayerMP)
-//                    CriteriaTriggers.PLACED_BLOCK.trigger((EntityPlayerMP)player, pos, itemstack);
-            }
+            IBlockState afterState = world.getBlockState(pos);
 
             if (playSound) {
-                SoundType soundtype = state.getBlock().getSoundType(state, world, pos, player);
+                SoundType soundtype = afterState.getBlock().getSoundType(afterState, world, pos, player);
                 world.playSound(null, pos, soundtype.getPlaceSound(), SoundCategory.BLOCKS, (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F);
             }
 
             if (!player.isCreative() && Block.getBlockFromItem(itemstack.getItem()) == block) {
-                itemstack.shrink(1);
+                CompatHelper.shrinkStack(origstack, itemstack, player);
             }
 
             return true;
         }
         return false;
+
+        //Using ItemBlock#onItemUse
+//        EnumActionResult result;
+//        PlayerInteractEvent.RightClickBlock event = ForgeHooks.onRightClickBlock(player, EnumHand.MAIN_HAND, pos, facing, net.minecraftforge.common.ForgeHooks.rayTraceEyeHitVec(player, ReachHelper.getPlacementReach(player)));
+//        if (player.isCreative())
+//        {
+//            int i = itemstack.getMetadata();
+//            int j = itemstack.getCount();
+//            if (event.getUseItem() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY) {
+//                EnumActionResult enumactionresult = itemstack.getItem().onItemUse(player, world, pos, EnumHand.MAIN_HAND, facing, (float) hitVec.x, (float) hitVec.y, (float) hitVec.z);
+//                itemstack.setItemDamage(i);
+//                itemstack.setCount(j);
+//                return enumactionresult == EnumActionResult.SUCCESS;
+//            } else return false;
+//        }
+//        else
+//        {
+//            ItemStack copyForUse = itemstack.copy();
+//            if (event.getUseItem() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY)
+//                result = itemstack.getItem().onItemUse(player, world, pos, EnumHand.MAIN_HAND, facing, (float) hitVec.x, (float) hitVec.y, (float) hitVec.z);
+//            if (itemstack.isEmpty()) net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(player, copyForUse, EnumHand.MAIN_HAND);
+//            return false;
+//        }
+
     }
 
     //Used for all breaking of blocks in this mod.
     //Checks if area is loaded, if appropriate tool is used in survival mode, and drops the block directly into the players inventory
-    public static boolean breakBlock(World world, EntityPlayer player, BlockPos pos) {
+    public static boolean breakBlock(World world, EntityPlayer player, BlockPos pos, boolean skipChecks) {
         if (!world.isBlockLoaded(pos, false)) return false;
 
         //Check if can break
-        if (canBreak(world, player, pos))
-        {
+        if (skipChecks || canBreak(world, player, pos)) {
+//            player.addStat(StatList.getBlockStats(world.getNewBlockState(pos).getBlock()));
+//            player.addExhaustion(0.005F);
+
             //Drop existing block
             dropBlock(world, player, pos);
 
@@ -108,6 +125,145 @@ public class SurvivalHelper {
         return false;
     }
 
+    //Gives items directly to player
+    public static void dropBlock(World world, EntityPlayer player, BlockPos pos){
+        if (player.isCreative()) return;
+
+        IBlockState blockState = world.getBlockState(pos);
+        Block block = blockState.getBlock();
+
+        block.harvestBlock(world, player, pos, blockState, world.getTileEntity(pos), player.getHeldItemMainhand());
+
+        //TODO drop items in inventory instead of world
+
+//        List<ItemStack> drops = new ArrayList<>();
+//
+//        //From Block#harvestBlock
+//        int silktouch = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, player.getHeldItemMainhand());
+//        if (block.canSilkHarvest(world, pos, blockState, player) && silktouch > 0) {
+//
+//            //From Block#getSilkTouchDrop (protected)
+//            Item item = Item.getItemFromBlock(block);
+//            int i = 0;
+//
+//            if (item.getHasSubtypes())
+//            {
+//                i = block.getMetaFromState(blockState);
+//            }
+//
+//            drops.add(new ItemStack(item, 1, i));
+//
+//            net.minecraftforge.event.ForgeEventFactory.fireBlockHarvesting(drops, world, pos, blockState, 0, 1.0f, true, player);
+//        }
+//
+//        int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, player.getHeldItemMainhand());
+//        drops.addAll(block.getDrops(world, pos, blockState, fortune));
+//        for (ItemStack drop : drops)
+//        {
+//            ItemHandlerHelper.giveItemToPlayer(player, drop);
+//        }
+    }
+
+    /**
+     * Check if player can place a block.
+     * Turn randomizer bag into itemstack inside before.
+     * @param world
+     * @param player
+     * @param pos
+     * @param newBlockState the blockstate that is going to be placed
+     * @param itemStack the itemstack used for placing
+     * @param skipCollisionCheck skips collision check with entities
+     * @param sidePlacedOn
+     * @return Whether the player may place the block at pos with itemstack
+     */
+    public static boolean canPlace(World world, EntityPlayer player, BlockPos pos, IBlockState newBlockState, ItemStack itemStack, boolean skipCollisionCheck, EnumFacing sidePlacedOn) {
+
+        //Check if itemstack is correct
+        if (!(itemStack.getItem() instanceof ItemBlock) || Block.getBlockFromItem(itemStack.getItem()) != newBlockState.getBlock()) {
+//            EffortlessBuilding.log(player, "Cannot (re)place block", true);
+//            EffortlessBuilding.log("SurvivalHelper#canPlace: itemstack " + itemStack.toString() + " does not match blockstate " + newBlockState.toString());
+            //Happens when breaking blocks, no need to notify in that case
+            return false;
+        }
+
+        Block block = ((ItemBlock) itemStack.getItem()).getBlock();
+
+        return !itemStack.isEmpty() && canPlayerEdit(player, world, pos, itemStack) &&
+               mayPlace(world, block, newBlockState, pos, skipCollisionCheck, sidePlacedOn, player) &&
+               canReplace(world, player, pos);
+    }
+
+    //Can be harvested with hand? (or in creative)
+    private static boolean canReplace(World world, EntityPlayer player, BlockPos pos){
+        if (player.isCreative()) return true;
+
+        IBlockState state = world.getBlockState(pos);
+        state = state.getBlock().getActualState(state, world, pos);
+
+        switch (BuildConfig.survivalBalancers.quickReplaceMiningLevel) {
+            case -1: return state.getMaterial().isToolNotRequired();
+            case 0: return state.getBlock().getHarvestLevel(state) <= 0;
+            case 1: return state.getBlock().getHarvestLevel(state) <= 1;
+            case 2: return state.getBlock().getHarvestLevel(state) <= 2;
+            case 3: return state.getBlock().getHarvestLevel(state) <= 3;
+        }
+
+        return false;
+    }
+
+    //From EntityPlayer#canPlayerEdit
+    private static boolean canPlayerEdit(EntityPlayer player, World world, BlockPos pos, ItemStack stack)
+    {
+        if (player.capabilities.allowEdit)
+        {
+            //True in creative and survival mode
+            return true;
+        }
+        else
+        {
+            //Adventure mode
+            Block block = world.getBlockState(pos).getBlock();
+            return stack.canPlaceOn(block) || stack.canEditBlocks();
+        }
+    }
+
+    //From World#mayPlace
+    private static boolean mayPlace(World world, Block blockIn, IBlockState newBlockState, BlockPos pos, boolean skipCollisionCheck, EnumFacing sidePlacedOn, @Nullable Entity placer)
+    {
+        IBlockState iblockstate1 = world.getBlockState(pos);
+        AxisAlignedBB axisalignedbb = skipCollisionCheck ? Block.NULL_AABB : blockIn.getDefaultState().getCollisionBoundingBox(world, pos);
+
+        if (axisalignedbb != Block.NULL_AABB && !world.checkNoEntityCollision(axisalignedbb.offset(pos)))
+        {
+            return false;
+        }
+
+        //Check if double slab
+        if (placer != null && doesBecomeDoubleSlab(((EntityPlayer) placer), pos, sidePlacedOn)) {
+            return true;
+        }
+
+        //Check if same block
+        //Necessary otherwise extra items will be dropped
+        if (iblockstate1 == newBlockState) {
+            return false;
+        }
+
+        if (iblockstate1.getMaterial() == Material.CIRCUITS && blockIn == Blocks.ANVIL)
+        {
+            return true;
+        }
+
+        //Check quickreplace
+        if (placer instanceof EntityPlayer && ModifierSettingsManager.getModifierSettings(((EntityPlayer) placer)).doQuickReplace()) {
+            return true;
+        }
+
+        return iblockstate1.getBlock().isReplaceable(world, pos) && blockIn.canPlaceBlockOnSide(world, pos, sidePlacedOn);
+    }
+
+
+
     //Can break using held tool? (or in creative)
     public static boolean canBreak(World world, EntityPlayer player, BlockPos pos) {
         IBlockState blockState = world.getBlockState(pos);
@@ -123,6 +279,12 @@ public class SurvivalHelper {
     {
         IBlockState state = world.getBlockState(pos);
         state = state.getBlock().getActualState(state, world, pos);
+
+        //Dont break bedrock
+        if (state.getBlockHardness((World) world, pos) < 0) {
+            return false;
+        }
+
         if (state.getMaterial().isToolNotRequired())
         {
             return true;
@@ -146,74 +308,28 @@ public class SurvivalHelper {
         return toolLevel >= block.getHarvestLevel(state);
     }
 
-    //Can be harvested with hand? (or in creative)
-    public static boolean canReplace(World world, EntityPlayer player, BlockPos pos){
-        if (player.isCreative()) return true;
+    public static boolean doesBecomeDoubleSlab(EntityPlayer player, BlockPos pos, EnumFacing facing) {
+        IBlockState placedBlockState = player.world.getBlockState(pos);
 
-        IBlockState state = world.getBlockState(pos);
-        state = state.getBlock().getActualState(state, world, pos);
-        if (state.getMaterial().isToolNotRequired()) return true;
+        ItemStack itemstack = player.getHeldItem(EnumHand.MAIN_HAND);
+        if (CompatHelper.isItemBlockProxy(itemstack))
+            itemstack = CompatHelper.getItemBlockFromStack(itemstack);
 
-        return false;
-    }
+        if (itemstack.isEmpty() || !(itemstack.getItem() instanceof ItemSlab)) return false;
+        BlockSlab heldSlab = (BlockSlab) ((ItemSlab) itemstack.getItem()).getBlock();
 
-    //Gives items directly to player
-    public static void dropBlock(World world, EntityPlayer player, BlockPos pos){
-        if (player.isCreative()) return;
+        if (placedBlockState.getBlock() == heldSlab) {
+            IProperty<?> variantProperty = heldSlab.getVariantProperty();
+            Comparable<?> placedVariant = placedBlockState.getValue(variantProperty);
+            BlockSlab.EnumBlockHalf placedHalf = placedBlockState.getValue(BlockSlab.HALF);
 
-        IBlockState blockState = world.getBlockState(pos);
+            Comparable<?> heldVariant = heldSlab.getTypeForItem(itemstack);
 
-        int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, player.getHeldItemMainhand());
-        List<ItemStack> drops = blockState.getBlock().getDrops(world, pos, blockState, fortune);
-        for (ItemStack drop : drops)
-        {
-            ItemHandlerHelper.giveItemToPlayer(player, drop);
-        }
-    }
-
-    //From EntityPlayer#canPlayerEdit
-    public static boolean canPlayerEdit(EntityPlayer player, World world, BlockPos pos, ItemStack stack)
-    {
-        if (player.capabilities.allowEdit)
-        {
-            //True in creative and survival mode
-            return true;
-        }
-        else
-        {
-            //Adventure mode
-            Block block = world.getBlockState(pos).getBlock();
-            return stack.canPlaceOn(block) || stack.canEditBlocks();
-        }
-    }
-
-    //From World#mayPlace
-    public static boolean mayPlace(World world, Block blockIn, IBlockState newBlockState, BlockPos pos, boolean skipCollisionCheck, EnumFacing sidePlacedOn, @Nullable Entity placer)
-    {
-        IBlockState iblockstate1 = world.getBlockState(pos);
-        AxisAlignedBB axisalignedbb = skipCollisionCheck ? null : blockIn.getDefaultState().getCollisionBoundingBox(world, pos);
-
-        if (axisalignedbb != Block.NULL_AABB && !world.checkNoEntityCollision(axisalignedbb.offset(pos), placer))
-        {
-            return false;
-        }
-
-        //Check if same block
-        //Necessary otherwise extra items will be dropped
-        if (iblockstate1 == newBlockState) {
-            return false;
-        }
-
-        if (iblockstate1.getMaterial() == Material.CIRCUITS && blockIn == Blocks.ANVIL)
+            if ((facing == EnumFacing.UP && placedHalf == BlockSlab.EnumBlockHalf.BOTTOM || facing == EnumFacing.DOWN && placedHalf == BlockSlab.EnumBlockHalf.TOP) && placedVariant == heldVariant)
             {
                 return true;
             }
-
-        //Check quickreplace
-        if (placer instanceof EntityPlayer && BuildSettingsManager.getBuildSettings(((EntityPlayer) placer)).doQuickReplace()) {
-            return true;
         }
-
-        return iblockstate1.getBlock().isReplaceable(world, pos) && blockIn.canPlaceBlockOnSide(world, pos, sidePlacedOn);
+        return false;
     }
 }

src/main/java/nl/requios/effortlessbuilding/item/ItemRandomizerBag.java

@@ -13,12 +13,16 @@ import net.minecraft.util.EnumActionResult;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.ICapabilityProvider;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
+import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.capability.ItemHandlerCapabilityProvider;
 import nl.requios.effortlessbuilding.helper.SurvivalHelper;
 
@@ -36,7 +40,7 @@ public class ItemRandomizerBag extends Item {
 
     public ItemRandomizerBag() {
         this.setRegistryName(EffortlessBuilding.MODID, "randomizer_bag");
-        this.setUnlocalizedName(this.getRegistryName().toString());
+        this.setTranslationKey(this.getRegistryName().toString());
 
         this.maxStackSize = 1;
         this.setCreativeTab(CreativeTabs.TOOLS);
@@ -51,6 +55,14 @@ public class ItemRandomizerBag extends Item {
             player.openGui(EffortlessBuilding.instance, EffortlessBuilding.RANDOMIZER_BAG_GUI, world, 0, 0, 0);
         } else {
             if (world.isRemote) return EnumActionResult.SUCCESS;
+
+            //Only place manually if in normal vanilla mode
+            BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
+            ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+            if (buildMode != BuildModes.BuildModeEnum.NORMAL || modifierSettings.doQuickReplace()) {
+                return EnumActionResult.FAIL;
+            }
+
             //Use item
             //Get bag inventory
             ItemStack bag = player.getHeldItem(hand);
@@ -72,7 +84,7 @@ public class ItemRandomizerBag extends Item {
             IBlockState blockState = Block.getBlockFromItem(toPlace.getItem()).getStateForPlacement(world, pos, facing,
                     hitX, hitY, hitZ, toPlace.getMetadata(), player, hand);
 
-            SurvivalHelper.placeBlock(world, player, pos, blockState, toPlace, facing, false, true);
+            SurvivalHelper.placeBlock(world, player, pos, blockState, toPlace, facing, new Vec3d(hitX, hitY, hitZ), false, false, true);
 
             //Synergy
             //Works without calling
@@ -181,8 +193,8 @@ public class ItemRandomizerBag extends Item {
     }
 
     @Override
-    public String getUnlocalizedName() {
-        return super.getUnlocalizedName();
+    public String getTranslationKey() {
+        return super.getTranslationKey();
     }
 
     public static void resetRandomness() {

src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade1.java

@@ -10,8 +10,8 @@ import net.minecraft.util.*;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
 import nl.requios.effortlessbuilding.BuildConfig;
-import nl.requios.effortlessbuilding.BuildSettingsManager;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 
 import javax.annotation.Nullable;
@@ -21,7 +21,7 @@ public class ItemReachUpgrade1 extends Item {
 
     public ItemReachUpgrade1() {
         this.setRegistryName(EffortlessBuilding.MODID, "reach_upgrade1");
-        this.setUnlocalizedName(this.getRegistryName().toString());
+        this.setTranslationKey(this.getRegistryName().toString());
 
         this.maxStackSize = 1;
         this.setCreativeTab(CreativeTabs.TOOLS);
@@ -35,12 +35,12 @@ public class ItemReachUpgrade1 extends Item {
             return new ActionResult<>(EnumActionResult.PASS, player.getHeldItem(hand));
         }
 
-        BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(player);
-        int currentLevel = buildSettings.getReachUpgrade();
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+        int currentLevel = modifierSettings.getReachUpgrade();
         if (currentLevel == 0) {
-            buildSettings.setReachUpgrade(1);
+            modifierSettings.setReachUpgrade(1);
 
-            if (world.isRemote) EffortlessBuilding.log(player, "Upgraded reach to level " + ReachHelper.getMaxReach(player));
+            if (world.isRemote) EffortlessBuilding.log(player, "Upgraded reach to " + ReachHelper.getMaxReach(player));
             player.setHeldItem(hand, ItemStack.EMPTY);
 
             SoundEvent soundEvent = new SoundEvent(new ResourceLocation("entity.player.levelup"));
@@ -55,19 +55,13 @@ public class ItemReachUpgrade1 extends Item {
         return new ActionResult<>(EnumActionResult.PASS, player.getHeldItem(hand));
     }
 
-    @Override
-    public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityLivingBase entityLiving) {
-        EffortlessBuilding.log("used");
-        return ItemStack.EMPTY;
-    }
-
     @Override
     public void addInformation(ItemStack stack, @Nullable World world, List<String> tooltip, ITooltipFlag flag) {
         tooltip.add(TextFormatting.GRAY + "Consume to increase reach to " + TextFormatting.BLUE + BuildConfig.reach.maxReachLevel1);
     }
 
     @Override
-    public String getUnlocalizedName() {
-        return super.getUnlocalizedName();
+    public String getTranslationKey() {
+        return super.getTranslationKey();
     }
 }

src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade2.java

@@ -9,8 +9,8 @@ import net.minecraft.util.*;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
 import nl.requios.effortlessbuilding.BuildConfig;
-import nl.requios.effortlessbuilding.BuildSettingsManager;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 
 import javax.annotation.Nullable;
@@ -20,7 +20,7 @@ public class ItemReachUpgrade2 extends Item {
 
     public ItemReachUpgrade2() {
         this.setRegistryName(EffortlessBuilding.MODID, "reach_upgrade2");
-        this.setUnlocalizedName(this.getRegistryName().toString());
+        this.setTranslationKey(this.getRegistryName().toString());
 
         this.maxStackSize = 1;
         this.setCreativeTab(CreativeTabs.TOOLS);
@@ -34,11 +34,11 @@ public class ItemReachUpgrade2 extends Item {
             return new ActionResult<>(EnumActionResult.PASS, player.getHeldItem(hand));
         }
 
-        BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(player);
-        int currentLevel = buildSettings.getReachUpgrade();
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+        int currentLevel = modifierSettings.getReachUpgrade();
         if (currentLevel == 1) {
-            buildSettings.setReachUpgrade(2);
-            if (world.isRemote) EffortlessBuilding.log(player, "Upgraded reach to level " + ReachHelper.getMaxReach(player));
+            modifierSettings.setReachUpgrade(2);
+            if (world.isRemote) EffortlessBuilding.log(player, "Upgraded reach to " + ReachHelper.getMaxReach(player));
             player.setHeldItem(hand, ItemStack.EMPTY);
 
             SoundEvent soundEvent = new SoundEvent(new ResourceLocation("entity.player.levelup"));
@@ -65,7 +65,7 @@ public class ItemReachUpgrade2 extends Item {
     }
 
     @Override
-    public String getUnlocalizedName() {
-        return super.getUnlocalizedName();
+    public String getTranslationKey() {
+        return super.getTranslationKey();
     }
 }

src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade3.java

@@ -9,8 +9,8 @@ import net.minecraft.util.*;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
 import nl.requios.effortlessbuilding.BuildConfig;
-import nl.requios.effortlessbuilding.BuildSettingsManager;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 
 import javax.annotation.Nullable;
@@ -20,7 +20,7 @@ public class ItemReachUpgrade3 extends Item {
 
     public ItemReachUpgrade3() {
         this.setRegistryName(EffortlessBuilding.MODID, "reach_upgrade3");
-        this.setUnlocalizedName(this.getRegistryName().toString());
+        this.setTranslationKey(this.getRegistryName().toString());
 
         this.maxStackSize = 1;
         this.setCreativeTab(CreativeTabs.TOOLS);
@@ -34,11 +34,11 @@ public class ItemReachUpgrade3 extends Item {
             return new ActionResult<>(EnumActionResult.PASS, player.getHeldItem(hand));
         }
 
-        BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(player);
-        int currentLevel = buildSettings.getReachUpgrade();
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+        int currentLevel = modifierSettings.getReachUpgrade();
         if (currentLevel == 2) {
-            buildSettings.setReachUpgrade(3);
-            if (world.isRemote) EffortlessBuilding.log(player, "Upgraded reach to level " + ReachHelper.getMaxReach(player));
+            modifierSettings.setReachUpgrade(3);
+            if (world.isRemote) EffortlessBuilding.log(player, "Upgraded reach to " + ReachHelper.getMaxReach(player));
             player.setHeldItem(hand, ItemStack.EMPTY);
 
             SoundEvent soundEvent = new SoundEvent(new ResourceLocation("entity.player.levelup"));
@@ -68,7 +68,7 @@ public class ItemReachUpgrade3 extends Item {
     }
 
     @Override
-    public String getUnlocalizedName() {
-        return super.getUnlocalizedName();
+    public String getTranslationKey() {
+        return super.getTranslationKey();
     }
 }

src/main/java/nl/requios/effortlessbuilding/network/AddUndoMessage.java

@@ -0,0 +1,94 @@
+package nl.requios.effortlessbuilding.network;
+
+import io.netty.buffer.ByteBuf;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
+import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
+import net.minecraftforge.fml.relauncher.Side;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmodifier.BlockSet;
+import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
+import nl.requios.effortlessbuilding.proxy.ClientProxy;
+
+import java.util.ArrayList;
+
+/***
+ * Sends a message to the client asking to add a block to the undo stack.
+ */
+public class AddUndoMessage implements IMessage {
+    private BlockPos coordinate;
+    private IBlockState previousBlockState;
+    private IBlockState newBlockState;
+
+    public AddUndoMessage() {
+        coordinate = BlockPos.ORIGIN;
+        previousBlockState = null;
+        newBlockState = null;
+    }
+
+    public AddUndoMessage(BlockPos coordinate, IBlockState previousBlockState, IBlockState newBlockState) {
+        this.coordinate = coordinate;
+        this.previousBlockState = previousBlockState;
+        this.newBlockState = newBlockState;
+    }
+
+    public BlockPos getCoordinate() {
+        return coordinate;
+    }
+
+    public IBlockState getPreviousBlockState() {
+        return previousBlockState;
+    }
+
+    public IBlockState getNewBlockState() {
+        return newBlockState;
+    }
+
+    @Override
+    public void toBytes(ByteBuf buf) {
+        buf.writeInt(this.coordinate.getX());
+        buf.writeInt(this.coordinate.getY());
+        buf.writeInt(this.coordinate.getZ());
+        buf.writeInt(Block.getStateId(this.previousBlockState));
+        buf.writeInt(Block.getStateId(this.newBlockState));
+    }
+
+    @Override
+    public void fromBytes(ByteBuf buf) {
+        coordinate = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt());
+        previousBlockState = Block.getStateById(buf.readInt());
+        newBlockState = Block.getStateById(buf.readInt());
+    }
+
+    // The params of the IMessageHandler are <REQ, REPLY>
+    public static class MessageHandler implements IMessageHandler<AddUndoMessage, IMessage> {
+        // Do note that the default constructor is required, but implicitly defined in this case
+
+        @Override
+        public IMessage onMessage(AddUndoMessage message, MessageContext ctx) {
+            //EffortlessBuilding.log("message received on " + ctx.side + " side");
+
+            if (ctx.side == Side.CLIENT){
+                //Received clientside
+
+                EffortlessBuilding.proxy.getThreadListenerFromContext(ctx).addScheduledTask(() -> {
+                    EntityPlayer player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
+
+                    //Add to undo stack clientside
+                    UndoRedo.addUndo(player, new BlockSet(
+                            new ArrayList<BlockPos>() {{add(message.getCoordinate());}},
+                            new ArrayList<IBlockState>() {{add(message.getPreviousBlockState());}},
+                            new ArrayList<IBlockState>() {{add(message.getNewBlockState());}},
+                            new Vec3d(0,0,0),
+                            message.getCoordinate(), message.getCoordinate()));
+                });
+            }
+            return null;
+        }
+    }
+}

src/main/java/nl/requios/effortlessbuilding/network/BlockBrokenMessage.java

@@ -9,9 +9,13 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
 import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
 import net.minecraftforge.fml.relauncher.Side;
-import nl.requios.effortlessbuilding.BuildModifiers;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
+import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers;
 
+/***
+ * Sends a message to the server indicating that a player wants to break a block
+ */
 public class BlockBrokenMessage implements IMessage {
 
     private boolean blockHit;
@@ -65,7 +69,7 @@ public class BlockBrokenMessage implements IMessage {
     public void fromBytes(ByteBuf buf) {
         blockHit = buf.readBoolean();
         blockPos = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt());
-        sideHit = EnumFacing.getFront(buf.readInt());
+        sideHit = EnumFacing.byIndex(buf.readInt());
         hitVec = new Vec3d(buf.readDouble(), buf.readDouble(), buf.readDouble());
     }
 
@@ -80,7 +84,7 @@ public class BlockBrokenMessage implements IMessage {
             if (ctx.side == Side.SERVER) {
                 //Received serverside
                 EffortlessBuilding.proxy.getThreadListenerFromContext(ctx).addScheduledTask(() -> {
-                    BuildModifiers.onBlockBrokenMessage(ctx.getServerHandler().player, message);
+                    BuildModes.onBlockBrokenMessage(ctx.getServerHandler().player, message);
                 });
             }
             // No response packet

src/main/java/nl/requios/effortlessbuilding/network/BlockPlacedMessage.java

@@ -9,29 +9,38 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
 import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
 import net.minecraftforge.fml.relauncher.Side;
-import nl.requios.effortlessbuilding.BuildModifiers;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
+import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers;
 import nl.requios.effortlessbuilding.proxy.ClientProxy;
+import nl.requios.effortlessbuilding.render.BlockPreviewRenderer;
 
+/***
+ * Sends a message to the server indicating that a player wants to place a block.
+ * Received clientside: server has placed blocks and its letting the client know.
+ */
 public class BlockPlacedMessage implements IMessage {
 
     private boolean blockHit;
     private BlockPos blockPos;
     private EnumFacing sideHit;
     private Vec3d hitVec;
+    private boolean placeStartPos; //prevent double placing in normal mode
 
     public BlockPlacedMessage() {
         this.blockHit = false;
         this.blockPos = BlockPos.ORIGIN;
         this.sideHit = EnumFacing.UP;
         this.hitVec = new Vec3d(0, 0, 0);
+        this.placeStartPos = true;
     }
 
-    public BlockPlacedMessage(RayTraceResult result) {
+    public BlockPlacedMessage(RayTraceResult result, boolean placeStartPos) {
         this.blockHit = result.typeOfHit == RayTraceResult.Type.BLOCK;
         this.blockPos = result.getBlockPos();
         this.sideHit = result.sideHit;
         this.hitVec = result.hitVec;
+        this.placeStartPos = placeStartPos;
     }
 
     public boolean isBlockHit() {
@@ -50,6 +59,10 @@ public class BlockPlacedMessage implements IMessage {
         return hitVec;
     }
 
+    public boolean getPlaceStartPos() {
+        return placeStartPos;
+    }
+
     @Override
     public void toBytes(ByteBuf buf) {
         buf.writeBoolean(blockHit);
@@ -60,14 +73,16 @@ public class BlockPlacedMessage implements IMessage {
         buf.writeDouble(hitVec.x);
         buf.writeDouble(hitVec.y);
         buf.writeDouble(hitVec.z);
+        buf.writeBoolean(placeStartPos);
     }
 
     @Override
     public void fromBytes(ByteBuf buf) {
         blockHit = buf.readBoolean();
         blockPos = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt());
-        sideHit = EnumFacing.getFront(buf.readInt());
+        sideHit = EnumFacing.byIndex(buf.readInt());
         hitVec = new Vec3d(buf.readDouble(), buf.readDouble(), buf.readDouble());
+        placeStartPos = buf.readBoolean();
     }
 
     // The params of the IMessageHandler are <REQ, REPLY>
@@ -80,12 +95,15 @@ public class BlockPlacedMessage implements IMessage {
 
             if (ctx.side == Side.CLIENT){
                 //Received clientside
-                //Send back your info
-                return new BlockPlacedMessage(ClientProxy.previousLookAt);
+                EffortlessBuilding.proxy.getThreadListenerFromContext(ctx).addScheduledTask(() -> {
+                    //Nod RenderHandler to do the dissolve shader effect
+                    BlockPreviewRenderer.onBlocksPlaced();
+                });
+                return null;
             } else {
                 //Received serverside
                 EffortlessBuilding.proxy.getThreadListenerFromContext(ctx).addScheduledTask(() -> {
-                    BuildModifiers.onBlockPlacedMessage(ctx.getServerHandler().player, message);
+                    BuildModes.onBlockPlacedMessage(ctx.getServerHandler().player, message);
                 });
                 // No response packet
                 return null;

src/main/java/nl/requios/effortlessbuilding/network/CancelModeMessage.java

@@ -0,0 +1,45 @@
+package nl.requios.effortlessbuilding.network;
+
+import io.netty.buffer.ByteBuf;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.IThreadListener;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
+import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
+
+/**
+ * Sends a message to the server indicating that a buildmode needs to be canceled for a player
+ */
+public class CancelModeMessage implements IMessage {
+
+    @Override
+    public void toBytes(ByteBuf buf) {
+
+    }
+
+    @Override
+    public void fromBytes(ByteBuf buf) {
+
+    }
+
+    // The params of the IMessageHandler are <REQ, REPLY>
+    public static class MessageHandler implements IMessageHandler<CancelModeMessage, IMessage> {
+        // Do note that the default constructor is required, but implicitly defined in this case
+
+        @Override
+        public IMessage onMessage(CancelModeMessage message, MessageContext ctx) {
+
+            // Execute the action on the main server thread by adding it as a scheduled task
+            IThreadListener threadListener = EffortlessBuilding.proxy.getThreadListenerFromContext(ctx);
+            threadListener.addScheduledTask(() -> {
+                EntityPlayer player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
+
+                BuildModes.initializeMode(player);
+            });
+            // No response packet
+            return null;
+        }
+    }
+}

src/main/java/nl/requios/effortlessbuilding/network/ClearUndoMessage.java

@@ -0,0 +1,57 @@
+package nl.requios.effortlessbuilding.network;
+
+import io.netty.buffer.ByteBuf;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
+import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
+import net.minecraftforge.fml.relauncher.Side;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmodifier.BlockSet;
+import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
+import nl.requios.effortlessbuilding.proxy.ClientProxy;
+
+import java.util.ArrayList;
+
+/***
+ * Sends a message to the client asking to clear the undo and redo stacks.
+ */
+public class ClearUndoMessage implements IMessage {
+
+    public ClearUndoMessage() {
+    }
+
+    @Override
+    public void toBytes(ByteBuf buf) {
+    }
+
+    @Override
+    public void fromBytes(ByteBuf buf) {
+    }
+
+    // The params of the IMessageHandler are <REQ, REPLY>
+    public static class MessageHandler implements IMessageHandler<ClearUndoMessage, IMessage> {
+        // Do note that the default constructor is required, but implicitly defined in this case
+
+        @Override
+        public IMessage onMessage(ClearUndoMessage message, MessageContext ctx) {
+            //EffortlessBuilding.log("message received on " + ctx.side + " side");
+
+            if (ctx.side == Side.CLIENT){
+                //Received clientside
+
+                EffortlessBuilding.proxy.getThreadListenerFromContext(ctx).addScheduledTask(() -> {
+                    EntityPlayer player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
+
+                    //Add to undo stack clientside
+                    UndoRedo.clear(player);
+                });
+            }
+            return null;
+        }
+    }
+}

src/main/java/nl/requios/effortlessbuilding/network/ModeActionMessage.java

@@ -0,0 +1,62 @@
+package nl.requios.effortlessbuilding.network;
+
+import io.netty.buffer.ByteBuf;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.IThreadListener;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
+import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions;
+import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
+
+import static nl.requios.effortlessbuilding.buildmode.ModeSettingsManager.*;
+
+/**
+ * Shares mode settings (see ModeSettingsManager) between server and client
+ */
+public class ModeActionMessage implements IMessage {
+
+    private ModeOptions.ActionEnum action;
+
+    public ModeActionMessage() {
+    }
+
+    public ModeActionMessage(ModeOptions.ActionEnum action) {
+        this.action = action;
+    }
+
+    @Override
+    public void toBytes(ByteBuf buf) {
+        buf.writeInt(action.ordinal());
+    }
+
+    @Override
+    public void fromBytes(ByteBuf buf) {
+        action = ModeOptions.ActionEnum.values()[buf.readInt()];
+    }
+
+    // The params of the IMessageHandler are <REQ, REPLY>
+    public static class MessageHandler implements IMessageHandler<ModeActionMessage, IMessage> {
+        // Do note that the default constructor is required, but implicitly defined in this case
+
+        @Override
+        public IMessage onMessage(ModeActionMessage message, MessageContext ctx) {
+            //EffortlessBuilding.log("message received on " + ctx.side + " side");
+
+            // The value that was sent
+            ModeOptions.ActionEnum action = message.action;
+
+            // Execute the action on the main server thread by adding it as a scheduled task
+            IThreadListener threadListener = EffortlessBuilding.proxy.getThreadListenerFromContext(ctx);
+            threadListener.addScheduledTask(() -> {
+                EntityPlayer player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
+
+                ModeOptions.performAction(player, action);
+            });
+            // No response packet
+            return null;
+        }
+    }
+}

src/main/java/nl/requios/effortlessbuilding/network/ModeSettingsMessage.java

@@ -0,0 +1,66 @@
+package nl.requios.effortlessbuilding.network;
+
+import io.netty.buffer.ByteBuf;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.IThreadListener;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
+import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
+import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
+
+import static nl.requios.effortlessbuilding.buildmode.ModeSettingsManager.*;
+
+/**
+ * Shares mode settings (see ModeSettingsManager) between server and client
+ */
+public class ModeSettingsMessage implements IMessage {
+
+    private ModeSettings modeSettings;
+
+    public ModeSettingsMessage() {
+    }
+
+    public ModeSettingsMessage(ModeSettings modeSettings) {
+        this.modeSettings = modeSettings;
+    }
+
+    @Override
+    public void toBytes(ByteBuf buf) {
+        buf.writeInt(modeSettings.getBuildMode().ordinal());
+    }
+
+    @Override
+    public void fromBytes(ByteBuf buf) {
+        BuildModes.BuildModeEnum buildMode = BuildModes.BuildModeEnum.values()[buf.readInt()];
+
+        modeSettings = new ModeSettings(buildMode);
+    }
+
+    // The params of the IMessageHandler are <REQ, REPLY>
+    public static class MessageHandler implements IMessageHandler<ModeSettingsMessage, IMessage> {
+        // Do note that the default constructor is required, but implicitly defined in this case
+
+        @Override
+        public IMessage onMessage(ModeSettingsMessage message, MessageContext ctx) {
+            //EffortlessBuilding.log("message received on " + ctx.side + " side");
+
+            // The value that was sent
+            ModeSettings modeSettings = message.modeSettings;
+
+            // Execute the action on the main server thread by adding it as a scheduled task
+            IThreadListener threadListener = EffortlessBuilding.proxy.getThreadListenerFromContext(ctx);
+            threadListener.addScheduledTask(() -> {
+                EntityPlayer player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
+
+                // Sanitize
+                ModeSettingsManager.sanitize(modeSettings, player);
+
+                ModeSettingsManager.setModeSettings(player, modeSettings);
+            });
+            // No response packet
+            return null;
+        }
+    }
+}

src/main/java/nl/requios/effortlessbuilding/network/ModifierSettingsMessage.java

@@ -8,24 +8,32 @@ import net.minecraft.util.math.Vec3d;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
 import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
-import nl.requios.effortlessbuilding.*;
-import nl.requios.effortlessbuilding.BuildSettingsManager.BuildSettings;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmodifier.Array;
+import nl.requios.effortlessbuilding.buildmodifier.Mirror;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.buildmodifier.RadialMirror;
 
-public class BuildSettingsMessage implements IMessage {
+import static nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager.*;
 
-    private BuildSettings buildSettings;
+/**
+ * Shares modifier settings (see ModifierSettingsManager) between server and client
+ */
+public class ModifierSettingsMessage implements IMessage {
 
-    public BuildSettingsMessage() {
+    private ModifierSettings modifierSettings;
+
+    public ModifierSettingsMessage() {
     }
 
-    public BuildSettingsMessage(BuildSettings buildSettings) {
-        this.buildSettings = buildSettings;
+    public ModifierSettingsMessage(ModifierSettings modifierSettings) {
+        this.modifierSettings = modifierSettings;
     }
 
     @Override
     public void toBytes(ByteBuf buf) {
         //MIRROR
-        Mirror.MirrorSettings m = buildSettings.getMirrorSettings();
+        Mirror.MirrorSettings m = modifierSettings.getMirrorSettings();
         buf.writeBoolean(m != null);
         if (m != null) {
             buf.writeBoolean(m.enabled);
@@ -41,7 +49,7 @@ public class BuildSettingsMessage implements IMessage {
         }
 
         //ARRAY
-        Array.ArraySettings a = buildSettings.getArraySettings();
+        Array.ArraySettings a = modifierSettings.getArraySettings();
         buf.writeBoolean(a != null);
         if (a != null) {
             buf.writeBoolean(a.enabled);
@@ -51,12 +59,12 @@ public class BuildSettingsMessage implements IMessage {
             buf.writeInt(a.count);
         }
 
-        buf.writeBoolean(buildSettings.doQuickReplace());
+        buf.writeBoolean(modifierSettings.doQuickReplace());
 
-        buf.writeInt(buildSettings.getReachUpgrade());
+        buf.writeInt(modifierSettings.getReachUpgrade());
 
         //RADIAL MIRROR
-        RadialMirror.RadialMirrorSettings r = buildSettings.getRadialMirrorSettings();
+        RadialMirror.RadialMirrorSettings r = modifierSettings.getRadialMirrorSettings();
         buf.writeBoolean(r != null);
         if (r != null) {
             buf.writeBoolean(r.enabled);
@@ -115,19 +123,19 @@ public class BuildSettingsMessage implements IMessage {
                             radialMirrorAlternate, radialMirrorRadius, radialMirrorDrawLines, radialMirrorDrawPlanes);
         }
 
-        buildSettings = new BuildSettings(m, a, r, quickReplace, reachUpgrade);
+        modifierSettings = new ModifierSettings(m, a, r, quickReplace, reachUpgrade);
     }
 
     // The params of the IMessageHandler are <REQ, REPLY>
-    public static class MessageHandler implements IMessageHandler<BuildSettingsMessage, IMessage> {
+    public static class MessageHandler implements IMessageHandler<ModifierSettingsMessage, IMessage> {
         // Do note that the default constructor is required, but implicitly defined in this case
 
         @Override
-        public IMessage onMessage(BuildSettingsMessage message, MessageContext ctx) {
+        public IMessage onMessage(ModifierSettingsMessage message, MessageContext ctx) {
             //EffortlessBuilding.log("message received on " + ctx.side + " side");
 
             // The value that was sent
-            BuildSettings buildSettings = message.buildSettings;
+            ModifierSettings modifierSettings = message.modifierSettings;
 
             // Execute the action on the main server thread by adding it as a scheduled task
             IThreadListener threadListener = EffortlessBuilding.proxy.getThreadListenerFromContext(ctx);
@@ -135,9 +143,9 @@ public class BuildSettingsMessage implements IMessage {
                 EntityPlayer player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
 
                 // Sanitize
-                BuildSettingsManager.sanitize(buildSettings, player);
+                ModifierSettingsManager.sanitize(modifierSettings, player);
 
-                BuildSettingsManager.setBuildSettings(player, buildSettings);
+                ModifierSettingsManager.setModifierSettings(player, modifierSettings);
             });
             // No response packet
             return null;

src/main/java/nl/requios/effortlessbuilding/network/RequestLookAtMessage.java

@@ -0,0 +1,73 @@
+package nl.requios.effortlessbuilding.network;
+
+import io.netty.buffer.ByteBuf;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
+import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
+import net.minecraftforge.fml.relauncher.Side;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmodifier.BlockSet;
+import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
+import nl.requios.effortlessbuilding.proxy.ClientProxy;
+
+import java.util.ArrayList;
+
+/***
+ * Sends a message to the client asking for its lookat (objectmouseover) data.
+ * This is then sent back with a BlockPlacedMessage.
+ */
+public class RequestLookAtMessage implements IMessage {
+    private boolean placeStartPos;
+
+    public RequestLookAtMessage() {
+        placeStartPos = false;
+    }
+
+    public RequestLookAtMessage(boolean placeStartPos) {
+        this.placeStartPos = placeStartPos;
+    }
+
+    public boolean getPlaceStartPos() {
+        return placeStartPos;
+    }
+
+    @Override
+    public void toBytes(ByteBuf buf) {
+        buf.writeBoolean(this.placeStartPos);
+    }
+
+    @Override
+    public void fromBytes(ByteBuf buf) {
+        placeStartPos = buf.readBoolean();
+    }
+
+    // The params of the IMessageHandler are <REQ, REPLY>
+    public static class MessageHandler implements IMessageHandler<RequestLookAtMessage, IMessage> {
+        // Do note that the default constructor is required, but implicitly defined in this case
+
+        @Override
+        public IMessage onMessage(RequestLookAtMessage message, MessageContext ctx) {
+            //EffortlessBuilding.log("message received on " + ctx.side + " side");
+
+            if (ctx.side == Side.CLIENT){
+                //Received clientside
+                //Send back your info
+
+//                EffortlessBuilding.proxy.getThreadListenerFromContext(ctx).addScheduledTask(() -> {
+//                    EntityPlayer player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
+//
+//                });
+
+                //Prevent double placing in normal mode with placeStartPos false.
+                //Unless QuickReplace is on, then we do need to place start pos.
+                return new BlockPlacedMessage(ClientProxy.previousLookAt, message.getPlaceStartPos());
+            }
+            return null;
+        }
+    }
+}

src/main/java/nl/requios/effortlessbuilding/proxy/ClientProxy.java

@@ -5,7 +5,11 @@ import net.minecraft.block.SoundType;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.resources.I18n;
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -14,12 +18,18 @@ import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.IThreadListener;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundCategory;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.text.TextFormatting;
+import net.minecraftforge.client.event.GuiOpenEvent;
 import net.minecraftforge.client.event.ModelRegistryEvent;
+import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.client.model.ModelLoader;
+import net.minecraftforge.client.settings.IKeyConflictContext;
+import net.minecraftforge.client.settings.KeyConflictContext;
+import net.minecraftforge.client.settings.KeyModifier;
 import net.minecraftforge.event.entity.EntityJoinWorldEvent;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
 import net.minecraftforge.fml.common.Mod;
@@ -27,45 +37,68 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
-import net.minecraftforge.fml.common.eventhandler.Event;
 import net.minecraftforge.fml.common.eventhandler.EventPriority;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.InputEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
 import net.minecraftforge.fml.relauncher.Side;
-import nl.requios.effortlessbuilding.BuildModifiers;
-import nl.requios.effortlessbuilding.BuildSettingsManager;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.gui.SettingsGui;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions;
+import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.gui.buildmode.RadialMenu;
+import nl.requios.effortlessbuilding.gui.buildmodifier.ModifierSettingsGui;
+import nl.requios.effortlessbuilding.compatibility.CompatHelper;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
-import nl.requios.effortlessbuilding.helper.RenderHelper;
-import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
-import nl.requios.effortlessbuilding.network.BlockBrokenMessage;
-import nl.requios.effortlessbuilding.network.BlockPlacedMessage;
-import nl.requios.effortlessbuilding.network.BuildSettingsMessage;
+import nl.requios.effortlessbuilding.render.RenderHandler;
+import nl.requios.effortlessbuilding.render.ShaderHandler;
+import nl.requios.effortlessbuilding.network.*;
 import org.lwjgl.input.Keyboard;
 
+import javax.annotation.Nullable;
+import java.util.HashMap;
+
 @Mod.EventBusSubscriber(Side.CLIENT)
 public class ClientProxy implements IProxy {
     public static KeyBinding[] keyBindings;
     public static RayTraceResult previousLookAt;
     public static RayTraceResult currentLookAt;
+    private static int placeCooldown = 0;
     private static int breakCooldown = 0;
 
+    public static int ticksInGame = 0;
+
+    private static final HashMap<BuildModes.BuildModeEnum, TextureAtlasSprite> buildModeIcons = new HashMap<>();
+    private static final HashMap<ModeOptions.ActionEnum, TextureAtlasSprite> modeOptionIcons = new HashMap<>();
+
     @Override
     public void preInit(FMLPreInitializationEvent event) {
+        ShaderHandler.init();
     }
 
     @Override
     public void init(FMLInitializationEvent event) {
         // register key bindings
-        keyBindings = new KeyBinding[3];
+        keyBindings = new KeyBinding[7];
 
         // instantiate the key bindings
-        keyBindings[0] = new KeyBinding("key.effortlessbuilding.hud.desc", Keyboard.KEY_ADD, "key.effortlessbuilding.category");
-        keyBindings[1] = new KeyBinding("key.effortlessbuilding.replace.desc", Keyboard.KEY_SUBTRACT, "key.effortlessbuilding.category");
-        keyBindings[2] = new KeyBinding("key.effortlessbuilding.creative.desc", Keyboard.KEY_F4, "key.effortlessbuilding.category");
+        keyBindings[0] = new KeyBinding("key.effortlessbuilding.hud.desc", KeyConflictContext.UNIVERSAL, Keyboard.KEY_ADD, "key.effortlessbuilding.category");
+        keyBindings[1] = new KeyBinding("key.effortlessbuilding.replace.desc", KeyConflictContext.IN_GAME, Keyboard.KEY_SUBTRACT, "key.effortlessbuilding.category");
+        keyBindings[2] = new KeyBinding("key.effortlessbuilding.creative.desc", KeyConflictContext.IN_GAME, Keyboard.KEY_NONE, "key.effortlessbuilding.category");
+        keyBindings[3] = new KeyBinding("key.effortlessbuilding.mode.desc", KeyConflictContext.IN_GAME, Keyboard.KEY_LMENU, "key.effortlessbuilding.category") {
+            @Override
+            public boolean conflicts(KeyBinding other) {
+                //Does not conflict with Chisels and Bits radial menu
+                if (other.getKeyCode() == getKeyCode() && other.getKeyDescription().equals("mod.chiselsandbits.other.mode")) return false;
+                return super.conflicts(other);
+            }
+        };
+        keyBindings[4] = new KeyBinding("key.effortlessbuilding.undo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, Keyboard.KEY_Z, "key.effortlessbuilding.category");
+        keyBindings[5] = new KeyBinding("key.effortlessbuilding.redo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, Keyboard.KEY_Y, "key.effortlessbuilding.category");
+        keyBindings[6] = new KeyBinding("key.effortlessbuilding.altplacement.desc", KeyConflictContext.IN_GAME, Keyboard.KEY_LCONTROL, "key.effortlessbuilding.category");
+//        keyBindings[7] = new KeyBinding("Reload shaders", Keyboard.KEY_TAB, "key.effortlessbuilding.category");
 
         // register all the key bindings
         for (int i = 0; i < keyBindings.length; ++i) {
@@ -107,111 +140,43 @@ public class ClientProxy implements IProxy {
     @SubscribeEvent
     public static void onEntityJoinWorld(EntityJoinWorldEvent event) {
         if (event.getEntity() == Minecraft.getMinecraft().player) {
-            event.getWorld().addEventListener(new RenderHelper());
+            event.getWorld().addEventListener(new RenderHandler());
         }
     }
 
     @SubscribeEvent
-    public static void onMouseInput(InputEvent.MouseInputEvent event) {
-        Minecraft mc = Minecraft.getMinecraft();
-        EntityPlayerSP player = mc.player;
+    public static void onTextureStitch(final TextureStitchEvent.Pre event) {
+        //register icon textures
+        final TextureMap map = event.getMap();
 
-        if (!BuildModifiers.isEnabled(BuildSettingsManager.getBuildSettings(player), player.getPosition())) return;
-
-        if (mc.gameSettings.keyBindUseItem.isPressed()) {
-            //KeyBinding.setKeyBindState(mc.gameSettings.keyBindUseItem.getKeyCode(), false);
-
-            ItemStack currentItemStack = player.getHeldItem(EnumHand.MAIN_HAND);
-            if (currentItemStack.getItem() instanceof ItemBlock ||
-                (currentItemStack.getItem() instanceof ItemRandomizerBag && !player.isSneaking())) {
-                //find position in distance
-                RayTraceResult lookingAt = getLookingAt(player);
-                if (lookingAt != null && lookingAt.typeOfHit == RayTraceResult.Type.BLOCK) {
-                    EffortlessBuilding.packetHandler.sendToServer(new BlockPlacedMessage(lookingAt));
-
-                    //play sound if further than normal
-                    if ((lookingAt.hitVec.subtract(player.getPositionEyes(1f))).lengthSquared() > 25f) {
-                        BlockPos blockPos = lookingAt.getBlockPos();
-                        IBlockState state = player.world.getBlockState(blockPos);
-                        SoundType soundtype = state.getBlock().getSoundType(state, player.world, blockPos, player);
-                        player.world.playSound(player, blockPos, soundtype.getPlaceSound(), SoundCategory.BLOCKS,
-                                (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F);
-                        player.swingArm(EnumHand.MAIN_HAND);
-                    }
+        for ( final BuildModes.BuildModeEnum mode : BuildModes.BuildModeEnum.values() )
+        {
+            final ResourceLocation sprite = new ResourceLocation("effortlessbuilding", "icons/" + mode.name().toLowerCase());
+            buildModeIcons.put( mode, map.registerSprite(sprite));
         }
+
+        for ( final ModeOptions.ActionEnum action : ModeOptions.ActionEnum.values() )
+        {
+            final ResourceLocation sprite = new ResourceLocation("effortlessbuilding", "icons/" + action.name().toLowerCase());
+            modeOptionIcons.put( action, map.registerSprite(sprite));
         }
     }
 
-        if (mc.gameSettings.keyBindAttack.isKeyDown()) {
-            //KeyBinding.setKeyBindState(mc.gameSettings.keyBindAttack.getKeyCode(), false);
-
-            //Break block in distance in creative (or survival if enabled in config)
-            if (ReachHelper.canBreakFar(player)) {
-                if (breakCooldown <= 0) {
-                    breakCooldown = 6;
-                    RayTraceResult lookingAt = getLookingAt(player);
-                    if (lookingAt != null && lookingAt.typeOfHit == RayTraceResult.Type.BLOCK) {
-                        EffortlessBuilding.packetHandler.sendToServer(new BlockBrokenMessage(lookingAt));
-
-                        //play sound
-                        BlockPos blockPos = lookingAt.getBlockPos();
-                        IBlockState state = player.world.getBlockState(blockPos);
-                        SoundType soundtype = state.getBlock().getSoundType(state, player.world, blockPos, player);
-                        player.world.playSound(player, blockPos, soundtype.getBreakSound(), SoundCategory.BLOCKS,
-                                (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F);
-                        player.swingArm(EnumHand.MAIN_HAND);
-                    }
-                } else {
-                    breakCooldown--;
-                }
-            }
-        } else {
-            breakCooldown = 0;
-        }
-        event.setResult(Event.Result.ALLOW);
+    public static TextureAtlasSprite getBuildModeIcon(BuildModes.BuildModeEnum mode) {
+        return buildModeIcons.get(mode);
     }
 
-    @SubscribeEvent(priority = EventPriority.NORMAL, receiveCanceled = true)
-    public static void onKeyPress(InputEvent.KeyInputEvent event) {
-        EntityPlayerSP player = Minecraft.getMinecraft().player;
-
-        //Remember to send packet to server if necessary
-        //Show HUD
-        if (keyBindings[0].isPressed()) {
-            //Disabled if max reach is 0, might be set in the config that way.
-            if (ReachHelper.getMaxReach(player) == 0) {
-                EffortlessBuilding.log(player, "Effortless Building is disabled until your reach has increased. Increase your reach with craftable reach upgrades.");
-            } else {
-                if (Minecraft.getMinecraft().currentScreen == null) {
-                    Minecraft.getMinecraft().displayGuiScreen(new SettingsGui());
-                } else {
-                    player.closeScreen();
-                }
-            }
-        }
-
-        //QuickReplace toggle
-        if (keyBindings[1].isPressed()) {
-            BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(player);
-            buildSettings.setQuickReplace(!buildSettings.doQuickReplace());
-            EffortlessBuilding.log(player, "Set "+ TextFormatting.GOLD + "Quick Replace " + TextFormatting.RESET + (buildSettings.doQuickReplace() ? "on" : "off"));
-            EffortlessBuilding.packetHandler.sendToServer(new BuildSettingsMessage(buildSettings));
-        }
-
-        //Creative/survival mode toggle
-        if (keyBindings[2].isPressed()) {
-            if (player.isCreative()) {
-                player.sendChatMessage("/gamemode 0");
-            } else {
-                player.sendChatMessage("/gamemode 1");
-            }
-        }
+    public static TextureAtlasSprite getModeOptionIcon(ModeOptions.ActionEnum action) {
+        return modeOptionIcons.get(action);
     }
 
     @SubscribeEvent
     public static void onClientTick(TickEvent.ClientTickEvent event) {
-        if (event.phase != TickEvent.Phase.START) return;
 
+        if (event.phase == TickEvent.Phase.START) {
+            onMouseInput();
+
+            //Update previousLookAt
             RayTraceResult objectMouseOver = Minecraft.getMinecraft().objectMouseOver;
             //Checking for null is necessary! Even in vanilla when looking down ladders it is occasionally null (instead of Type MISS)
             if (objectMouseOver == null) return;
@@ -227,19 +192,217 @@ public class ClientProxy implements IProxy {
                     currentLookAt = objectMouseOver;
                     previousLookAt = objectMouseOver;
                 } else {
-                if (currentLookAt.getBlockPos() != objectMouseOver.getBlockPos()){
+                    if (currentLookAt.getBlockPos() != objectMouseOver.getBlockPos()) {
                         previousLookAt = currentLookAt;
                         currentLookAt = objectMouseOver;
                     }
                 }
             }
+        } else if (event.phase == TickEvent.Phase.END){
+            GuiScreen gui = Minecraft.getMinecraft().currentScreen;
+            if(gui == null || !gui.doesGuiPauseGame()) {
+                ticksInGame++;
+            }
         }
 
+    }
+
+    private static void onMouseInput() {
+        Minecraft mc = Minecraft.getMinecraft();
+        EntityPlayerSP player = mc.player;
+        if (player == null) return;
+        BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
+
+        if (Minecraft.getMinecraft().currentScreen != null ||
+            buildMode == BuildModes.BuildModeEnum.NORMAL ||
+            RadialMenu.instance.isVisible()) {
+            return;
+        }
+
+        if (mc.gameSettings.keyBindUseItem.isKeyDown()) {
+            //KeyBinding.setKeyBindState(mc.gameSettings.keyBindUseItem.getKeyCode(), false);
+
+            if (placeCooldown <= 0) {
+                placeCooldown = 4;
+
+                ItemStack currentItemStack = player.getHeldItem(EnumHand.MAIN_HAND);
+                if (currentItemStack.getItem() instanceof ItemBlock ||
+                    (CompatHelper.isItemBlockProxy(currentItemStack) && !player.isSneaking())) {
+
+                    ItemStack itemStack = CompatHelper.getItemBlockFromStack(currentItemStack);
+
+                    //find position in distance
+                    RayTraceResult lookingAt = getLookingAt(player);
+                    BuildModes.onBlockPlacedMessage(player, lookingAt == null ? new BlockPlacedMessage() : new BlockPlacedMessage(lookingAt, true));
+                    EffortlessBuilding.packetHandler.sendToServer(lookingAt == null ? new BlockPlacedMessage() : new BlockPlacedMessage(lookingAt, true));
+
+                    //play sound if further than normal
+                    if (lookingAt != null && lookingAt.typeOfHit == RayTraceResult.Type.BLOCK &&
+                        (lookingAt.hitVec.subtract(player.getPositionEyes(1f))).lengthSquared() > 25f &&
+                        itemStack.getItem() instanceof ItemBlock) {
+
+                        IBlockState state = ((ItemBlock) itemStack.getItem()).getBlock().getDefaultState();
+                        BlockPos blockPos = lookingAt.getBlockPos();
+                        SoundType soundType = state.getBlock().getSoundType(state, player.world, blockPos, player);
+                        player.world.playSound(player, player.getPosition(), soundType.getPlaceSound(), SoundCategory.BLOCKS,
+                                0.4f, soundType.getPitch() * 1f);
+                        player.swingArm(EnumHand.MAIN_HAND);
+                    }
+                }
+            } else if (buildMode == BuildModes.BuildModeEnum.NORMAL_PLUS) {
+                placeCooldown--;
+                if (ModeOptions.getBuildSpeed() == ModeOptions.ActionEnum.FAST_SPEED) placeCooldown = 0;
+            }
+        } else {
+            placeCooldown = 0;
+        }
+
+        if (mc.gameSettings.keyBindAttack.isKeyDown()) {
+
+            //Break block in distance in creative (or survival if enabled in config)
+            if (breakCooldown <= 0) {
+                breakCooldown = 4;
+
+                //Early out if cant break far, coming from own mouse event (not block broken event)
+                //To make breaking blocks in survival possible like array
+                //TODO this causes not being able to cancel placement in survival
+                //  moving it to after buildmodes fixes that, but introduces this bug
+                if (!ReachHelper.canBreakFar(player)) return;
+
+                RayTraceResult lookingAt = getLookingAt(player);
+                BuildModes.onBlockBrokenMessage(player, lookingAt == null ? new BlockBrokenMessage() : new BlockBrokenMessage(lookingAt));
+                EffortlessBuilding.packetHandler.sendToServer(lookingAt == null ? new BlockBrokenMessage() : new BlockBrokenMessage(lookingAt));
+
+                //play sound if further than normal
+                if (lookingAt != null && lookingAt.typeOfHit == RayTraceResult.Type.BLOCK &&
+                    (lookingAt.hitVec.subtract(player.getPositionEyes(1f))).lengthSquared() > 25f) {
+
+                    BlockPos blockPos = lookingAt.getBlockPos();
+                    IBlockState state = player.world.getBlockState(blockPos);
+                    SoundType soundtype = state.getBlock().getSoundType(state, player.world, blockPos, player);
+                    player.world.playSound(player, player.getPosition(), soundtype.getBreakSound(), SoundCategory.BLOCKS,
+                            0.4f, soundtype.getPitch() * 1f);
+                    player.swingArm(EnumHand.MAIN_HAND);
+                }
+            } else if (buildMode == BuildModes.BuildModeEnum.NORMAL_PLUS) {
+                breakCooldown--;
+                if (ModeOptions.getBuildSpeed() == ModeOptions.ActionEnum.FAST_SPEED) breakCooldown = 0;
+            }
+
+            //EffortlessBuilding.packetHandler.sendToServer(new CancelModeMessage());
+
+        } else {
+            breakCooldown = 0;
+        }
+
+        if (mc.gameSettings.keyBindAttack.isPressed()) {
+            if (RadialMenu.instance.isVisible()) {
+                EffortlessBuilding.log(player, "mouse click");
+            }
+        }
+
+    }
+
+    @SubscribeEvent(priority = EventPriority.NORMAL, receiveCanceled = true)
+    public static void onKeyPress(InputEvent.KeyInputEvent event) {
+        EntityPlayerSP player = Minecraft.getMinecraft().player;
+
+        //Remember to send packet to server if necessary
+        //Show Modifier Settings GUI
+        if (keyBindings[0].isPressed()) {
+            openModifierSettings();
+        }
+
+        //QuickReplace toggle
+        if (keyBindings[1].isPressed()) {
+            ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+            modifierSettings.setQuickReplace(!modifierSettings.doQuickReplace());
+            EffortlessBuilding.log(player, "Set "+ TextFormatting.GOLD + "Quick Replace " + TextFormatting.RESET + (
+                    modifierSettings.doQuickReplace() ? "on" : "off"));
+            EffortlessBuilding.packetHandler.sendToServer(new ModifierSettingsMessage(modifierSettings));
+        }
+
+        //Creative/survival mode toggle
+        if (keyBindings[2].isPressed()) {
+            if (player.isCreative()) {
+                player.sendChatMessage("/gamemode 0");
+            } else {
+                player.sendChatMessage("/gamemode 1");
+            }
+        }
+
+        //Undo (Ctrl+Z)
+        if (keyBindings[4].isPressed()) {
+            ModeOptions.ActionEnum action = ModeOptions.ActionEnum.UNDO;
+            ModeOptions.performAction(player, action);
+            EffortlessBuilding.packetHandler.sendToServer(new ModeActionMessage(action));
+        }
+
+        //Redo (Ctrl+Y)
+        if (keyBindings[5].isPressed()) {
+            ModeOptions.ActionEnum action = ModeOptions.ActionEnum.REDO;
+            ModeOptions.performAction(player, action);
+            EffortlessBuilding.packetHandler.sendToServer(new ModeActionMessage(action));
+        }
+
+        //Change placement mode
+        if (keyBindings[6].isPressed()) {
+            //Toggle between first two actions of the first option of the current build mode
+            BuildModes.BuildModeEnum currentBuildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
+            if (currentBuildMode.options.length > 0) {
+                ModeOptions.OptionEnum option = currentBuildMode.options[0];
+                if (option.actions.length >= 2) {
+                    if (ModeOptions.getOptionSetting(option) == option.actions[0]) {
+                        ModeOptions.performAction(player, option.actions[1]);
+                        EffortlessBuilding.packetHandler.sendToServer(new ModeActionMessage(option.actions[1]));
+                    } else {
+                        ModeOptions.performAction(player, option.actions[0]);
+                        EffortlessBuilding.packetHandler.sendToServer(new ModeActionMessage(option.actions[0]));
+                    }
+                }
+            }
+        }
+
+        //For shader development
+        if (keyBindings.length >= 8 && keyBindings[7].isPressed()) {
+            ShaderHandler.init();
+            EffortlessBuilding.log(player, "Reloaded shaders");
+        }
+
+    }
+
+    public static void openModifierSettings() {
+        Minecraft mc = Minecraft.getMinecraft();
+        EntityPlayerSP player = mc.player;
+
+        RadialMenu.instance.setVisibility(0f);
+
+        //Disabled if max reach is 0, might be set in the config that way.
+        if (ReachHelper.getMaxReach(player) == 0) {
+            EffortlessBuilding.log(player, "Build modifiers are disabled until your reach has increased. Increase your reach with craftable reach upgrades.");
+        } else {
+            if (mc.currentScreen == null) {
+                mc.displayGuiScreen(new ModifierSettingsGui());
+            } else {
+                player.closeScreen();
+            }
+        }
+    }
+
+    @SubscribeEvent
+    public static void onGuiOpen(GuiOpenEvent event) {
+        EntityPlayer player = Minecraft.getMinecraft().player;
+        if (player != null) {
+            BuildModes.initializeMode(player);
+        }
+    }
+
+    @Nullable
     public static RayTraceResult getLookingAt(EntityPlayer player) {
 //        World world = player.world;
 
         //base distance off of player ability (config)
-        float raytraceRange = ReachHelper.getMaxReach(player) / 4f;
+        float raytraceRange = ReachHelper.getPlacementReach(player);
 
 //        Vec3d look = player.getLookVec();
 //        Vec3d start = new Vec3d(player.posX, player.posY + player.getEyeHeight(), player.posZ);
@@ -247,4 +410,8 @@ public class ClientProxy implements IProxy {
         return player.rayTrace(raytraceRange, 1f);
 //        return world.rayTraceBlocks(start, end, false, false, false);
     }
+
+    public static void logTranslate(String key) {
+        EffortlessBuilding.log(Minecraft.getMinecraft().player, I18n.format(key), true);
+    }
 }

src/main/java/nl/requios/effortlessbuilding/render/BlockPreviewRenderer.java

@@ -0,0 +1,436 @@
+package nl.requios.effortlessbuilding.render;
+
+import net.minecraft.block.SoundType;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.renderer.BlockRendererDispatcher;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.SoundCategory;
+import net.minecraft.util.math.*;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import nl.requios.effortlessbuilding.BuildConfig;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
+import nl.requios.effortlessbuilding.buildmode.IBuildMode;
+import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
+import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager.ModeSettings;
+import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager.ModifierSettings;
+import nl.requios.effortlessbuilding.compatibility.CompatHelper;
+import nl.requios.effortlessbuilding.helper.InventoryHelper;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+import nl.requios.effortlessbuilding.helper.SurvivalHelper;
+import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
+import nl.requios.effortlessbuilding.proxy.ClientProxy;
+import org.lwjgl.opengl.ARBMultitexture;
+import org.lwjgl.opengl.ARBShaderObjects;
+import org.lwjgl.opengl.GL11;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Consumer;
+
+@SideOnly(Side.CLIENT)
+public class BlockPreviewRenderer {
+    private static List<BlockPos> previousCoordinates;
+    private static List<IBlockState> previousBlockStates;
+    private static List<ItemStack> previousItemStacks;
+    private static BlockPos previousFirstPos;
+    private static BlockPos previousSecondPos;
+    private static int soundTime = 0;
+
+    static class PlacedData {
+        float time;
+        List<BlockPos> coordinates;
+        List<IBlockState> blockStates;
+        List<ItemStack> itemStacks;
+        BlockPos firstPos;
+        BlockPos secondPos;
+        boolean breaking;
+
+        public PlacedData(float time, List<BlockPos> coordinates, List<IBlockState> blockStates,
+                          List<ItemStack> itemStacks, BlockPos firstPos, BlockPos secondPos, boolean breaking) {
+            this.time = time;
+            this.coordinates = coordinates;
+            this.blockStates = blockStates;
+            this.itemStacks = itemStacks;
+            this.firstPos = firstPos;
+            this.secondPos = secondPos;
+            this.breaking = breaking;
+        }
+    }
+
+    private static List<PlacedData> placedDataList = new ArrayList<>();
+
+    private static final int primaryTextureUnit = 0;
+    private static final int secondaryTextureUnit = 2;
+
+    public static void render(EntityPlayer player, ModifierSettings modifierSettings, ModeSettings modeSettings) {
+
+        //Render placed blocks with dissolve effect
+        //Use fancy shader if config allows, otherwise no dissolve
+        if (BuildConfig.visuals.useShaders) {
+            RenderHandler.beginBlockPreviews();
+            for (int i = 0; i < placedDataList.size(); i++) {
+                PlacedData placed = placedDataList.get(i);
+                if (placed.coordinates != null && !placed.coordinates.isEmpty()) {
+
+                    double totalTime = MathHelper.clampedLerp(30, 60, placed.firstPos.distanceSq(placed.secondPos) / 100.0) * BuildConfig.visuals.dissolveTimeMultiplier;
+                    float dissolve = (ClientProxy.ticksInGame - placed.time) / (float) totalTime;
+                    renderBlockPreviews(placed.coordinates, placed.blockStates, placed.itemStacks, dissolve, placed.firstPos, placed.secondPos, false, placed.breaking);
+                }
+            }
+            RenderHandler.endBlockPreviews();
+        }
+        //Expire
+        placedDataList.removeIf(placed -> {
+            double totalTime = MathHelper.clampedLerp(30, 60, placed.firstPos.distanceSq(placed.secondPos) / 100.0) * BuildConfig.visuals.dissolveTimeMultiplier;
+            return placed.time + totalTime < ClientProxy.ticksInGame;
+        });
+
+        //Render block previews
+        RayTraceResult lookingAt = ClientProxy.getLookingAt(player);
+        if (modeSettings.getBuildMode() == BuildModes.BuildModeEnum.NORMAL) lookingAt = Minecraft.getMinecraft().objectMouseOver;
+
+        ItemStack mainhand = player.getHeldItemMainhand();
+        boolean toolInHand = !(!mainhand.isEmpty() && CompatHelper.isItemBlockProxy(mainhand));
+
+        BlockPos startPos = null;
+        EnumFacing sideHit = null;
+        Vec3d hitVec = null;
+
+        //Checking for null is necessary! Even in vanilla when looking down ladders it is occasionally null (instead of Type MISS)
+        if (lookingAt != null && lookingAt.typeOfHit == RayTraceResult.Type.BLOCK) {
+            startPos = lookingAt.getBlockPos();
+
+            //Check if tool (or none) in hand
+            boolean replaceable = player.world.getBlockState(startPos).getBlock().isReplaceable(player.world, startPos);
+            boolean becomesDoubleSlab = SurvivalHelper.doesBecomeDoubleSlab(player, startPos, lookingAt.sideHit);
+            if (!modifierSettings.doQuickReplace() && !toolInHand && !replaceable && !becomesDoubleSlab) {
+                startPos = startPos.offset(lookingAt.sideHit);
+            }
+
+            //Get under tall grass and other replaceable blocks
+            if (modifierSettings.doQuickReplace() && !toolInHand && replaceable) {
+                startPos = startPos.down();
+            }
+
+            sideHit = lookingAt.sideHit;
+            hitVec = lookingAt.hitVec;
+        }
+
+        //Dont render if in normal mode and modifiers are disabled
+        //Unless alwaysShowBlockPreview is true in config
+        if (doRenderBlockPreviews(modifierSettings, modeSettings, startPos)) {
+
+            //Keep blockstate the same for every block in the buildmode
+            //So dont rotate blocks when in the middle of placing wall etc.
+            if (BuildModes.isActive(player)) {
+                IBuildMode buildModeInstance = modeSettings.getBuildMode().instance;
+                if (buildModeInstance.getSideHit(player) != null) sideHit = buildModeInstance.getSideHit(player);
+                if (buildModeInstance.getHitVec(player) != null) hitVec = buildModeInstance.getHitVec(player);
+            }
+
+            if (sideHit != null) {
+
+                //Should be red?
+                boolean breaking = BuildModes.currentlyBreakingClient.get(player) != null && BuildModes.currentlyBreakingClient.get(player);
+
+                //get coordinates
+                List<BlockPos> startCoordinates = BuildModes.findCoordinates(player, startPos, breaking || modifierSettings.doQuickReplace());
+
+                BlockPos firstPos = BlockPos.ORIGIN, secondPos = BlockPos.ORIGIN;
+                //Remember first and last pos for the shader
+                if (!startCoordinates.isEmpty()) {
+                    firstPos = startCoordinates.get(0);
+                    secondPos = startCoordinates.get(startCoordinates.size() - 1);
+                }
+
+                //Limit number of blocks you can place
+                int limit = ReachHelper.getMaxBlocksPlacedAtOnce(player);
+                if (startCoordinates.size() > limit) {
+                    startCoordinates = startCoordinates.subList(0, limit);
+                }
+
+                List<BlockPos> newCoordinates = BuildModifiers.findCoordinates(player, startCoordinates);
+
+                sortOnDistanceToPlayer(newCoordinates, player);
+
+                hitVec = new Vec3d(Math.abs(hitVec.x - ((int) hitVec.x)), Math.abs(hitVec.y - ((int) hitVec.y)),
+                        Math.abs(hitVec.z - ((int) hitVec.z)));
+
+                //Get blockstates
+                List<ItemStack> itemStacks = new ArrayList<>();
+                List<IBlockState> blockStates = new ArrayList<>();
+                if (breaking) {
+                    //Find blockstate of world
+                    for (BlockPos coordinate : newCoordinates) {
+                        blockStates.add(player.world.getBlockState(coordinate));
+                    }
+                } else {
+                    blockStates = BuildModifiers.findBlockStates(player, startCoordinates, hitVec, sideHit, itemStacks);
+                }
+
+
+                //Check if they are different from previous
+                //TODO fix triggering when moving player
+                if (!BuildModifiers.compareCoordinates(previousCoordinates, newCoordinates)) {
+                    previousCoordinates = newCoordinates;
+                    //remember the rest for placed blocks
+                    previousBlockStates = blockStates;
+                    previousItemStacks = itemStacks;
+                    previousFirstPos = firstPos;
+                    previousSecondPos = secondPos;
+
+                    //if so, renew randomness of randomizer bag
+                    ItemRandomizerBag.renewRandomness();
+                    //and play sound (max once every tick)
+                    if (newCoordinates.size() > 1 && blockStates.size() > 1 && soundTime < ClientProxy.ticksInGame - 0) {
+                        soundTime = ClientProxy.ticksInGame;
+
+                        if (blockStates.get(0) != null) {
+                            SoundType soundType = blockStates.get(0).getBlock().getSoundType(blockStates.get(0), player.world,
+                                    newCoordinates.get(0), player);
+                            player.world.playSound(player, player.getPosition(), breaking ? soundType.getBreakSound() : soundType.getPlaceSound(),
+                                    SoundCategory.BLOCKS, 0.3f, 0.8f);
+                        }
+                    }
+                }
+
+                //Render block previews
+                if (blockStates.size() != 0 && newCoordinates.size() == blockStates.size()) {
+                    int blockCount;
+
+                    //Use fancy shader if config allows, otherwise outlines
+                    if (BuildConfig.visuals.useShaders && newCoordinates.size() < BuildConfig.visuals.shaderTreshold) {
+
+                        RenderHandler.beginBlockPreviews();
+
+                        blockCount = renderBlockPreviews(newCoordinates, blockStates, itemStacks, 0f, firstPos, secondPos, !breaking, breaking);
+
+                        RenderHandler.endBlockPreviews();
+                    } else {
+
+                        RenderHandler.beginLines();
+
+                        Vec3d color = new Vec3d(1f, 1f, 1f);
+                        if (breaking) color = new Vec3d(1f, 0f, 0f);
+
+                        for (int i = newCoordinates.size() - 1; i >= 0; i--) {
+                            AxisAlignedBB boundingBox = blockStates.get(i).getBoundingBox(player.world, newCoordinates.get(i));
+                            RenderHandler.renderBlockOutline(newCoordinates.get(i), boundingBox, color);
+                        }
+
+                        RenderHandler.endLines();
+
+                        blockCount = newCoordinates.size();
+                    }
+
+                    //Display block count and dimensions in actionbar
+                    if (BuildModes.isActive(player)) {
+
+                        //Find min and max values (not simply firstPos and secondPos because that doesn't work with circles)
+                        int minX = Integer.MAX_VALUE, maxX = Integer.MIN_VALUE;
+                        int minY = Integer.MAX_VALUE, maxY = Integer.MIN_VALUE;
+                        int minZ = Integer.MAX_VALUE, maxZ = Integer.MIN_VALUE;
+                        for (BlockPos pos : startCoordinates) {
+                            if (pos.getX() < minX) minX = pos.getX();
+                            if (pos.getX() > maxX) maxX = pos.getX();
+                            if (pos.getY() < minY) minY = pos.getY();
+                            if (pos.getY() > maxY) maxY = pos.getY();
+                            if (pos.getZ() < minZ) minZ = pos.getZ();
+                            if (pos.getZ() > maxZ) maxZ = pos.getZ();
+                        }
+                        BlockPos dim = new BlockPos(maxX - minX + 1, maxY - minY + 1, maxZ - minZ + 1);
+
+                        String dimensions = "(";
+                        if (dim.getX() > 1) dimensions += dim.getX() + "x";
+                        if (dim.getZ() > 1) dimensions += dim.getZ() + "x";
+                        if (dim.getY() > 1) dimensions += dim.getY() + "x";
+                        dimensions = dimensions.substring(0, dimensions.length() - 1);
+                        if (dimensions.length() > 1) dimensions += ")";
+
+                        EffortlessBuilding.log(player, blockCount + " blocks " + dimensions, true);
+                    }
+                }
+
+
+            }
+
+            RenderHandler.beginLines();
+            //Draw outlines if tool in hand
+            //Find proper raytrace: either normal range or increased range depending on canBreakFar
+            RayTraceResult objectMouseOver = Minecraft.getMinecraft().objectMouseOver;
+            RayTraceResult breakingRaytrace = ReachHelper.canBreakFar(player) ? lookingAt : objectMouseOver;
+            if (toolInHand && breakingRaytrace != null && breakingRaytrace.typeOfHit == RayTraceResult.Type.BLOCK) {
+                List<BlockPos> breakCoordinates = BuildModifiers.findCoordinates(player, breakingRaytrace.getBlockPos());
+
+                //Only render first outline if further than normal reach
+                boolean excludeFirst = objectMouseOver != null && objectMouseOver.typeOfHit == RayTraceResult.Type.BLOCK;
+                for (int i = excludeFirst ? 1 : 0; i < breakCoordinates.size(); i++) {
+                    BlockPos coordinate = breakCoordinates.get(i);
+
+                    IBlockState blockState = player.world.getBlockState(coordinate);
+                    if (!blockState.getBlock().isAir(blockState, player.world, coordinate)) {
+                        if (SurvivalHelper.canBreak(player.world, player, coordinate) || i == 0) {
+                            AxisAlignedBB boundingBox = blockState.getBoundingBox(player.world, coordinate);
+                            RenderHandler.renderBlockOutline(coordinate, boundingBox, new Vec3d(0f, 0f, 0f));
+                        }
+                    }
+                }
+            }
+            RenderHandler.endLines();
+        }
+    }
+
+    //Whether to draw any block previews or outlines
+    public static boolean doRenderBlockPreviews(ModifierSettings modifierSettings, ModeSettings modeSettings, BlockPos startPos) {
+        return modeSettings.getBuildMode() != BuildModes.BuildModeEnum.NORMAL ||
+               (startPos != null && BuildModifiers.isEnabled(modifierSettings, startPos)) ||
+               BuildConfig.visuals.alwaysShowBlockPreview;
+    }
+
+    protected static int renderBlockPreviews(List<BlockPos> coordinates, List<IBlockState> blockStates,
+                                              List<ItemStack> itemStacks, float dissolve, BlockPos firstPos,
+                                              BlockPos secondPos, boolean checkCanPlace, boolean red) {
+        EntityPlayer player = Minecraft.getMinecraft().player;
+        ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+        BlockRendererDispatcher dispatcher = Minecraft.getMinecraft().getBlockRendererDispatcher();
+        int blocksValid = 0;
+
+        if (coordinates.isEmpty()) return blocksValid;
+
+        for (int i = coordinates.size() - 1; i >= 0; i--) {
+            BlockPos blockPos = coordinates.get(i);
+            IBlockState blockState = blockStates.get(i);
+            ItemStack itemstack = itemStacks.isEmpty() ? ItemStack.EMPTY : itemStacks.get(i);
+            if (CompatHelper.isItemBlockProxy(itemstack))
+                itemstack = CompatHelper.getItemBlockByState(itemstack, blockState);
+
+            //Check if can place
+            //If check is turned off, check if blockstate is the same (for dissolve effect)
+            if ((!checkCanPlace /*&& player.world.getNewBlockState(blockPos) == blockState*/) || //TODO enable (breaks breaking shader)
+                SurvivalHelper.canPlace(player.world, player, blockPos, blockState, itemstack, modifierSettings.doQuickReplace(), EnumFacing.UP)) {
+
+                ShaderHandler.useShader(ShaderHandler.dissolve, generateShaderCallback(dissolve,
+                        new Vec3d(blockPos), new Vec3d(firstPos), new Vec3d(secondPos),
+                        blockPos == secondPos, red));
+                RenderHandler.renderBlockPreview(dispatcher, blockPos, blockState);
+                blocksValid++;
+            }
+        }
+        return blocksValid;
+    }
+
+    public static void onBlocksPlaced() {
+        onBlocksPlaced(previousCoordinates, previousItemStacks, previousBlockStates, previousFirstPos, previousSecondPos);
+    }
+
+    public static void onBlocksPlaced(List<BlockPos> coordinates, List<ItemStack> itemStacks, List<IBlockState> blockStates,
+                                      BlockPos firstPos, BlockPos secondPos) {
+        EntityPlayerSP player = Minecraft.getMinecraft().player;
+        ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+        ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
+
+        //Check if block previews are enabled
+        if (doRenderBlockPreviews(modifierSettings, modeSettings, firstPos)) {
+
+            //Save current coordinates, blockstates and itemstacks
+            if (!coordinates.isEmpty() && blockStates.size() == coordinates.size() &&
+                coordinates.size() > 1 && coordinates.size() < BuildConfig.visuals.shaderTreshold) {
+
+                placedDataList.add(new PlacedData(ClientProxy.ticksInGame, coordinates, blockStates,
+                        itemStacks, firstPos, secondPos, false));
+            }
+        }
+
+    }
+
+    public static void onBlocksBroken() {
+        onBlocksBroken(previousCoordinates, previousItemStacks, previousBlockStates, previousFirstPos, previousSecondPos);
+    }
+
+    public static void onBlocksBroken(List<BlockPos> coordinates, List<ItemStack> itemStacks, List<IBlockState> blockStates,
+                                      BlockPos firstPos, BlockPos secondPos) {
+        EntityPlayerSP player = Minecraft.getMinecraft().player;
+        ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+        ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
+
+        //Check if block previews are enabled
+        if (doRenderBlockPreviews(modifierSettings, modeSettings, firstPos)) {
+
+            //Save current coordinates, blockstates and itemstacks
+            if (!coordinates.isEmpty() && blockStates.size() == coordinates.size() &&
+                coordinates.size() > 1 && coordinates.size() < BuildConfig.visuals.shaderTreshold) {
+
+                sortOnDistanceToPlayer(coordinates, player);
+
+                placedDataList.add(new PlacedData(ClientProxy.ticksInGame, coordinates, blockStates,
+                        itemStacks, firstPos, secondPos, true));
+            }
+        }
+
+    }
+
+    private static Consumer<Integer> generateShaderCallback(final float dissolve, final Vec3d blockpos,
+                                                            final Vec3d firstpos, final Vec3d secondpos,
+                                                            final boolean highlight, final boolean red) {
+        Minecraft mc = Minecraft.getMinecraft();
+        return (Integer shader) -> {
+            int percentileUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "dissolve");
+            int highlightUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "highlight");
+            int redUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "red");
+            int blockposUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "blockpos");
+            int firstposUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "firstpos");
+            int secondposUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "secondpos");
+            int imageUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "image");
+            int maskUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "mask");
+
+            GlStateManager.enableTexture2D();
+            GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D);
+
+            //mask
+            ARBShaderObjects.glUniform1iARB(maskUniform, secondaryTextureUnit);
+            OpenGlHelper.setActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + secondaryTextureUnit);
+            GL11.glBindTexture(GL11.GL_TEXTURE_2D, mc.renderEngine.getTexture(ShaderHandler.shaderMaskTextureLocation).getGlTextureId());
+
+            //image
+            ARBShaderObjects.glUniform1iARB(imageUniform, primaryTextureUnit);
+            OpenGlHelper.setActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + primaryTextureUnit);
+            GL11.glBindTexture(GL11.GL_TEXTURE_2D, mc.renderEngine.getTexture(TextureMap.LOCATION_BLOCKS_TEXTURE).getGlTextureId());
+
+            //blockpos
+            ARBShaderObjects.glUniform3fARB(blockposUniform, (float) blockpos.x, (float) blockpos.y, (float) blockpos.z);
+            ARBShaderObjects.glUniform3fARB(firstposUniform, (float) firstpos.x, (float) firstpos.y, (float) firstpos.z);
+            ARBShaderObjects.glUniform3fARB(secondposUniform, (float) secondpos.x, (float) secondpos.y, (float) secondpos.z);
+
+            //dissolve
+            ARBShaderObjects.glUniform1fARB(percentileUniform, dissolve);
+            //highlight
+            ARBShaderObjects.glUniform1iARB(highlightUniform, highlight ? 1 : 0);
+            //red
+            ARBShaderObjects.glUniform1iARB(redUniform, red ? 1 : 0);
+        };
+    }
+
+    private static void sortOnDistanceToPlayer(List<BlockPos> coordinates, EntityPlayer player) {
+
+        Collections.sort(coordinates, (lhs, rhs) -> {
+            // -1 - less than, 1 - greater than, 0 - equal
+            double lhsDistanceToPlayer = new Vec3d(lhs).subtract(player.getPositionEyes(1f)).lengthSquared();
+            double rhsDistanceToPlayer = new Vec3d(rhs).subtract(player.getPositionEyes(1f)).lengthSquared();
+            return (int) Math.signum(lhsDistanceToPlayer - rhsDistanceToPlayer);
+        });
+
+    }
+}

src/main/java/nl/requios/effortlessbuilding/render/ModifierRenderer.java

@@ -0,0 +1,175 @@
+package nl.requios.effortlessbuilding.render;
+
+import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.util.math.Vec3d;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import nl.requios.effortlessbuilding.buildmodifier.Mirror;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.buildmodifier.RadialMirror;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.util.Color;
+
+@SideOnly(Side.CLIENT)
+public class ModifierRenderer {
+
+    protected static final Color colorX = new Color(255, 72, 52);
+    protected static final Color colorY = new Color(67, 204, 51);
+    protected static final Color colorZ = new Color(52, 247, 255);
+    protected static final Color colorRadial = new Color(52, 247, 255);
+    protected static final int lineAlpha = 200;
+    protected static final int planeAlpha = 75;
+    protected static final Vec3d epsilon = new Vec3d(0.001, 0.001, 0.001); //prevents z-fighting
+
+    public static void render(ModifierSettingsManager.ModifierSettings modifierSettings) {
+        RenderHandler.beginLines();
+
+        //Mirror lines and areas
+        Mirror.MirrorSettings m = modifierSettings.getMirrorSettings();
+        if (m != null && m.enabled && (m.mirrorX || m.mirrorY || m.mirrorZ))
+        {
+            Vec3d pos = m.position.add(epsilon);
+            int radius = m.radius;
+
+            if (m.mirrorX)
+            {
+                Vec3d posA = new Vec3d(pos.x, pos.y - radius, pos.z - radius);
+                Vec3d posB = new Vec3d(pos.x, pos.y + radius, pos.z + radius);
+
+                drawMirrorPlane(posA, posB, colorX, m.drawLines, m.drawPlanes, true);
+            }
+            if (m.mirrorY)
+            {
+                Vec3d posA = new Vec3d(pos.x - radius, pos.y, pos.z - radius);
+                Vec3d posB = new Vec3d(pos.x + radius, pos.y, pos.z + radius);
+
+                drawMirrorPlaneY(posA, posB, colorY, m.drawLines, m.drawPlanes);
+            }
+            if (m.mirrorZ)
+            {
+                Vec3d posA = new Vec3d(pos.x - radius, pos.y - radius, pos.z);
+                Vec3d posB = new Vec3d(pos.x + radius, pos.y + radius, pos.z);
+
+                drawMirrorPlane(posA, posB, colorZ, m.drawLines, m.drawPlanes, true);
+            }
+
+            //Draw axis coordinated colors if two or more axes are enabled
+            //(If only one is enabled the lines are that planes color)
+            if (m.drawLines && ((m.mirrorX && m.mirrorY) || (m.mirrorX && m.mirrorZ) || (m.mirrorY && m.mirrorZ)))
+            {
+                drawMirrorLines(m);
+            }
+        }
+
+        //Radial mirror lines and areas
+        RadialMirror.RadialMirrorSettings r = modifierSettings.getRadialMirrorSettings();
+        if (r != null && r.enabled)
+        {
+            Vec3d pos = r.position.add(epsilon);
+            int radius = r.radius;
+
+            float angle = 2f * ((float) Math.PI) / r.slices;
+            Vec3d relStartVec = new Vec3d(radius, 0, 0);
+            if (r.slices%4 == 2) relStartVec = relStartVec.rotateYaw(angle / 2f);
+
+            for (int i = 0; i < r.slices; i++) {
+                Vec3d relNewVec = relStartVec.rotateYaw(angle * i);
+                Vec3d newVec = pos.add(relNewVec);
+
+                Vec3d posA = new Vec3d(pos.x, pos.y - radius, pos.z);
+                Vec3d posB = new Vec3d(newVec.x, pos.y + radius, newVec.z);
+                drawMirrorPlane(posA, posB, colorRadial, r.drawLines, r.drawPlanes, false);
+            }
+        }
+
+        RenderHandler.endLines();
+    }
+
+
+    //----Mirror----
+
+    protected static void drawMirrorPlane(Vec3d posA, Vec3d posB, Color c, boolean drawLines, boolean drawPlanes, boolean drawVerticalLines) {
+
+        GL11.glColor4d(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha);
+        Tessellator tessellator = Tessellator.getInstance();
+        BufferBuilder bufferBuilder = tessellator.getBuffer();
+
+        if (drawPlanes) {
+            bufferBuilder.begin(GL11.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_COLOR);
+
+            bufferBuilder.pos(posA.x, posA.y, posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
+            bufferBuilder.pos(posA.x, posB.y, posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
+            bufferBuilder.pos(posB.x, posA.y, posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
+            bufferBuilder.pos(posB.x, posB.y, posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
+
+            tessellator.draw();
+        }
+
+        if (drawLines) {
+            Vec3d middle = posA.add(posB).scale(0.5);
+            bufferBuilder.begin(GL11.GL_LINES, DefaultVertexFormats.POSITION_COLOR);
+
+            bufferBuilder.pos(posA.x, middle.y, posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
+            bufferBuilder.pos(posB.x, middle.y, posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
+            if (drawVerticalLines) {
+                bufferBuilder.pos(middle.x, posA.y, middle.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
+                bufferBuilder.pos(middle.x, posB.y, middle.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
+            }
+
+            tessellator.draw();
+        }
+    }
+
+    protected static void drawMirrorPlaneY(Vec3d posA, Vec3d posB, Color c, boolean drawLines, boolean drawPlanes) {
+
+        GL11.glColor4d(c.getRed(), c.getGreen(), c.getBlue(), c.getAlpha());
+        Tessellator tessellator = Tessellator.getInstance();
+        BufferBuilder bufferBuilder = tessellator.getBuffer();
+
+        if (drawPlanes) {
+            bufferBuilder.begin(GL11.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_COLOR);
+
+            bufferBuilder.pos(posA.x, posA.y, posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
+            bufferBuilder.pos(posA.x, posA.y, posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
+            bufferBuilder.pos(posB.x, posA.y, posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
+            bufferBuilder.pos(posB.x, posA.y, posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
+
+            tessellator.draw();
+        }
+
+        if (drawLines) {
+            Vec3d middle = posA.add(posB).scale(0.5);
+            bufferBuilder.begin(GL11.GL_LINES, DefaultVertexFormats.POSITION_COLOR);
+
+            bufferBuilder.pos(middle.x, middle.y, posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
+            bufferBuilder.pos(middle.x, middle.y, posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
+            bufferBuilder.pos(posA.x, middle.y, middle.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
+            bufferBuilder.pos(posB.x, middle.y, middle.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
+
+            tessellator.draw();
+        }
+    }
+
+    protected static void drawMirrorLines(Mirror.MirrorSettings m) {
+
+        Vec3d pos = m.position.add(epsilon);
+
+        GL11.glColor4d(100, 100, 100, 255);
+        GL11.glLineWidth(2);
+        Tessellator tessellator = Tessellator.getInstance();
+        BufferBuilder bufferBuilder = tessellator.getBuffer();
+
+        bufferBuilder.begin(GL11.GL_LINES, DefaultVertexFormats.POSITION_COLOR);
+
+        bufferBuilder.pos(pos.x - m.radius, pos.y, pos.z).color(colorX.getRed(), colorX.getGreen(), colorX.getBlue(), lineAlpha).endVertex();
+        bufferBuilder.pos(pos.x + m.radius, pos.y, pos.z).color(colorX.getRed(), colorX.getGreen(), colorX.getBlue(), lineAlpha).endVertex();
+        bufferBuilder.pos(pos.x, pos.y - m.radius, pos.z).color(colorY.getRed(), colorY.getGreen(), colorY.getBlue(), lineAlpha).endVertex();
+        bufferBuilder.pos(pos.x, pos.y + m.radius, pos.z).color(colorY.getRed(), colorY.getGreen(), colorY.getBlue(), lineAlpha).endVertex();
+        bufferBuilder.pos(pos.x, pos.y, pos.z - m.radius).color(colorZ.getRed(), colorZ.getGreen(), colorZ.getBlue(), lineAlpha).endVertex();
+        bufferBuilder.pos(pos.x, pos.y, pos.z + m.radius).color(colorZ.getRed(), colorZ.getGreen(), colorZ.getBlue(), lineAlpha).endVertex();
+
+        tessellator.draw();
+    }
+}

src/main/java/nl/requios/effortlessbuilding/render/RenderHandler.java

@@ -0,0 +1,336 @@
+package nl.requios.effortlessbuilding.render;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.audio.PositionedSoundRecord;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.renderer.BlockRendererDispatcher;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderGlobal;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.SoundEvents;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.SoundCategory;
+import net.minecraft.util.SoundEvent;
+import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.IWorldEventListener;
+import net.minecraft.world.World;
+import net.minecraftforge.client.event.RenderGameOverlayEvent;
+import net.minecraftforge.client.event.RenderWorldLastEvent;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.relauncher.Side;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions;
+import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
+import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.gui.buildmode.RadialMenu;
+import nl.requios.effortlessbuilding.compatibility.CompatHelper;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+import nl.requios.effortlessbuilding.helper.SurvivalHelper;
+import nl.requios.effortlessbuilding.network.ModeActionMessage;
+import nl.requios.effortlessbuilding.network.ModeSettingsMessage;
+import nl.requios.effortlessbuilding.proxy.ClientProxy;
+import org.lwjgl.input.Mouse;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL14;
+
+import javax.annotation.Nullable;
+import java.util.List;
+
+/***
+ * Main render class for Effortless Building
+ */
+@Mod.EventBusSubscriber(Side.CLIENT)
+public class RenderHandler implements IWorldEventListener {
+
+    @SubscribeEvent
+    public static void onRender(RenderWorldLastEvent event) {
+        EntityPlayer player = Minecraft.getMinecraft().player;
+        ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+
+        begin(event.getPartialTicks());
+
+        //Mirror and radial mirror lines and areas
+        ModifierRenderer.render(modifierSettings);
+
+        //Render block previews
+        BlockPreviewRenderer.render(player, modifierSettings, modeSettings);
+
+        end();
+    }
+
+    @SubscribeEvent
+    //Display Radial Menu
+    public static void onRenderGameOverlay(final RenderGameOverlayEvent.Post event ) {
+        Minecraft mc = Minecraft.getMinecraft();
+        EntityPlayerSP player = mc.player;
+
+        //check if chisel and bits tool in hand (and has menu)
+        final boolean hasChiselInHand = CompatHelper.chiselsAndBitsProxy.isHoldingChiselTool(EnumHand.MAIN_HAND);
+
+        final RenderGameOverlayEvent.ElementType type = event.getType();
+        if (type == RenderGameOverlayEvent.ElementType.ALL && !hasChiselInHand) {
+            final boolean wasVisible = RadialMenu.instance.isVisible();
+
+            if (ClientProxy.keyBindings[3].isKeyDown()) {
+                if (ReachHelper.getMaxReach(player) > 0) {
+                    RadialMenu.instance.actionUsed = false;
+                    RadialMenu.instance.raiseVisibility();
+                } else if (ClientProxy.keyBindings[3].isPressed()) {
+                    EffortlessBuilding.log(player, "Build modes are disabled until your reach has increased. Increase your reach with craftable reach upgrades.");
+                }
+            } else {
+                if (!RadialMenu.instance.actionUsed) {
+                    ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
+
+                    if (RadialMenu.instance.switchTo != null) {
+                        playRadialMenuSound();
+                        modeSettings.setBuildMode(RadialMenu.instance.switchTo);
+                        ModeSettingsManager.setModeSettings(player, modeSettings);
+                        EffortlessBuilding.packetHandler.sendToServer(new ModeSettingsMessage(modeSettings));
+
+                        EffortlessBuilding.log(player, I18n.format(modeSettings.getBuildMode().name), true);
+                    }
+
+                    //Perform button action
+                    ModeOptions.ActionEnum action = RadialMenu.instance.doAction;
+                    if (action != null) {
+                        ModeOptions.performAction(player, action);
+                        EffortlessBuilding.packetHandler.sendToServer(new ModeActionMessage(action));
+                    }
+
+                    playRadialMenuSound();
+                }
+
+                RadialMenu.instance.actionUsed = true;
+                RadialMenu.instance.decreaseVisibility();
+            }
+
+            if (RadialMenu.instance.isVisible()) {
+
+                final ScaledResolution res = event.getResolution();
+                RadialMenu.instance.configure(res.getScaledWidth(), res.getScaledHeight());
+
+                if (!wasVisible) {
+                    mc.inGameHasFocus = false;
+                    mc.mouseHelper.ungrabMouseCursor();
+                }
+
+                if (mc.inGameHasFocus) {
+                    KeyBinding.unPressAllKeys();
+                }
+
+                final int mouseX = Mouse.getX() * res.getScaledWidth() / mc.displayWidth;
+                final int mouseY = res.getScaledHeight() - Mouse.getY() * res.getScaledHeight() / mc.displayHeight - 1;
+
+                net.minecraftforge.client.ForgeHooksClient.drawScreen(RadialMenu.instance, mouseX, mouseY, event.getPartialTicks());
+            } else {
+                if (wasVisible && RadialMenu.instance.doAction != ModeOptions.ActionEnum.OPEN_MODIFIER_SETTINGS) {
+                    mc.setIngameFocus();
+                }
+            }
+        }
+    }
+
+    public static void playRadialMenuSound() {
+        final float volume = 0.1f;
+        if (volume >= 0.0001f) {
+            final PositionedSoundRecord psr = new PositionedSoundRecord(SoundEvents.UI_BUTTON_CLICK, SoundCategory.MASTER,
+                    volume, 1.0f, Minecraft.getMinecraft().player.getPosition());
+            Minecraft.getMinecraft().getSoundHandler().playSound(psr);
+        }
+    }
+
+    private static void begin(float partialTicks) {
+        EntityPlayer player = Minecraft.getMinecraft().player;
+        double playerX = player.prevPosX + (player.posX - player.prevPosX) * partialTicks;
+        double playerY = player.prevPosY + (player.posY - player.prevPosY) * partialTicks;
+        double playerZ = player.prevPosZ + (player.posZ - player.prevPosZ) * partialTicks;
+        Vec3d playerPos = new Vec3d(playerX, playerY, playerZ);
+
+        GL11.glPushMatrix();
+        GL11.glTranslated(-playerPos.x, -playerPos.y, -playerPos.z);
+
+        GL11.glDepthMask(false);
+    }
+
+    protected static void beginLines() {
+        GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
+        GL11.glDisable(GL11.GL_CULL_FACE);
+        GL11.glDisable(GL11.GL_LIGHTING);
+        GL11.glDisable(GL11.GL_TEXTURE_2D);
+
+        GL11.glEnable(GL11.GL_BLEND);
+        GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+
+        GL11.glLineWidth(2);
+    }
+
+    protected static void endLines() {
+        GL11.glPopAttrib();
+    }
+
+    protected static void beginBlockPreviews() {
+        GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
+        GL11.glEnable(GL11.GL_CULL_FACE);
+        GL11.glEnable(GL11.GL_TEXTURE_2D);
+//        Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
+        Minecraft.getMinecraft().renderEngine.bindTexture(ShaderHandler.shaderMaskTextureLocation);
+
+        GlStateManager.enableBlend();
+        GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+        GL14.glBlendColor(1F, 1F, 1F, 0.8f);
+    }
+
+    protected static void endBlockPreviews() {
+        ShaderHandler.releaseShader();
+        GlStateManager.disableBlend();
+
+        GL11.glPopAttrib();
+    }
+
+    private static void end() {
+        GL11.glDepthMask(true);
+        GL11.glPopMatrix();
+    }
+
+    protected static void renderBlockPreview(BlockRendererDispatcher dispatcher, BlockPos blockPos, IBlockState blockState) {
+        if (blockState == null) return;
+
+        GlStateManager.pushMatrix();
+        GlStateManager.translate(blockPos.getX(), blockPos.getY(), blockPos.getZ());
+        GlStateManager.rotate(-90.0F, 0.0F, 1.0F, 0.0F);
+        GlStateManager.translate(-0.01f, -0.01f, 0.01f);
+        GlStateManager.scale(1.02f, 1.02f, 1.02f);
+
+        try {
+            dispatcher.renderBlockBrightness(blockState, 0.85f);
+        } catch (NullPointerException e) {
+            EffortlessBuilding.logger.warn("RenderHandler::renderBlockPreview cannot render " + blockState.getBlock().toString());
+
+            //Render outline as backup
+            GlStateManager.popMatrix();
+//            ShaderHandler.releaseShader();
+            GL11.glDisable(GL11.GL_LIGHTING);
+            renderBlockOutline(blockPos, new Vec3d(1f, 1f, 1f));
+            GL11.glEnable(GL11.GL_LIGHTING);
+            GlStateManager.pushMatrix();
+        }
+
+        GlStateManager.popMatrix();
+    }
+
+    protected static void renderBlockOutline(BlockPos pos, Vec3d color) {
+        renderBlockOutline(pos, pos, color);
+    }
+
+    //Renders outline. Pos1 has to be minimal x,y,z and pos2 maximal x,y,z
+    protected static void renderBlockOutline(BlockPos pos1, BlockPos pos2, Vec3d color) {
+        GL11.glLineWidth(2);
+
+        AxisAlignedBB aabb = new AxisAlignedBB(pos1, pos2.add(1, 1, 1)).grow(0.0020000000949949026);
+
+        RenderGlobal.drawSelectionBoundingBox(aabb, (float) color.x, (float) color.y, (float) color.z, 0.4f);
+    }
+
+    //Renders outline with given bounding box
+    protected static void renderBlockOutline(BlockPos pos, AxisAlignedBB boundingBox, Vec3d color) {
+        GL11.glLineWidth(2);
+
+        AxisAlignedBB aabb = boundingBox.offset(pos).grow(0.0020000000949949026);
+
+        RenderGlobal.drawSelectionBoundingBox(aabb, (float) color.x, (float) color.y, (float) color.z, 0.4f);
+    }
+
+
+
+    //IWORLDEVENTLISTENER IMPLEMENTATION
+    @Override
+    public void notifyBlockUpdate(World worldIn, BlockPos pos, IBlockState oldState, IBlockState newState, int flags) {
+
+    }
+
+    @Override
+    public void notifyLightSet(BlockPos pos) {
+
+    }
+
+    @Override
+    public void markBlockRangeForRenderUpdate(int x1, int y1, int z1, int x2, int y2, int z2) {
+
+    }
+
+    @Override
+    public void playSoundToAllNearExcept(@Nullable EntityPlayer player, SoundEvent soundIn, SoundCategory category,
+                                         double x, double y, double z, float volume, float pitch) {
+
+    }
+
+    @Override
+    public void playRecord(SoundEvent soundIn, BlockPos pos) {
+
+    }
+
+    @Override
+    public void spawnParticle(int particleID, boolean ignoreRange, double xCoord, double yCoord, double zCoord,
+                              double xSpeed, double ySpeed, double zSpeed, int... parameters) {
+
+    }
+
+    @Override
+    public void spawnParticle(int id, boolean ignoreRange, boolean p_190570_3_, double x, double y, double z,
+                              double xSpeed, double ySpeed, double zSpeed, int... parameters) {
+
+    }
+
+    @Override
+    public void onEntityAdded(Entity entityIn) {
+
+    }
+
+    @Override
+    public void onEntityRemoved(Entity entityIn) {
+
+    }
+
+    @Override
+    public void broadcastSound(int soundID, BlockPos pos, int data) {
+
+    }
+
+    @Override
+    public void playEvent(EntityPlayer player, int type, BlockPos blockPosIn, int data) {
+
+    }
+
+    //Sends breaking progress for all coordinates to renderglobal, so all blocks get visually broken
+    @Override
+    public void sendBlockBreakProgress(int breakerId, BlockPos pos, int progress) {
+        Minecraft mc = Minecraft.getMinecraft();
+
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player);
+        if (!BuildModifiers.isEnabled(modifierSettings, pos)) return;
+
+        List<BlockPos> coordinates = BuildModifiers.findCoordinates(mc.player, pos);
+        for (int i = 1; i < coordinates.size(); i++) {
+            BlockPos coordinate = coordinates.get(i);
+            if (SurvivalHelper.canBreak(mc.world, mc.player, coordinate)) {
+                //Send i as entity id because only one block can be broken per id
+                //Unless i happens to be the player id, then take something else
+                int fakeId = mc.player.getEntityId() != i ? i : coordinates.size();
+                mc.renderGlobal.sendBlockBreakProgress(fakeId, coordinate, progress);
+            }
+        }
+    }
+}

src/main/java/nl/requios/effortlessbuilding/render/ShaderHandler.java

@@ -0,0 +1,195 @@
+/**
+ * This class was created by <Vazkii>. It's distributed as
+ * part of the Botania Mod. Get the Source Code in github:
+ * https://github.com/Vazkii/Botania
+ *
+ * Modified by Requios
+ *
+ * Botania is Open Source and distributed under the
+ * Botania License: http://botaniamod.net/license.php
+ *
+ * File Created @ [Apr 9, 2014, 11:20:26 PM (GMT)]
+ */
+package nl.requios.effortlessbuilding.render;
+
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.util.ResourceLocation;
+import nl.requios.effortlessbuilding.BuildConfig;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.proxy.ClientProxy;
+import org.apache.logging.log4j.Level;
+import org.lwjgl.opengl.*;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.function.Consumer;
+
+public final class ShaderHandler {
+
+    private static final int VERT_ST = ARBVertexShader.GL_VERTEX_SHADER_ARB;
+    private static final int FRAG_ST = ARBFragmentShader.GL_FRAGMENT_SHADER_ARB;
+
+    private static final int VERT = 1;
+    private static final int FRAG = 2;
+
+    private static final String VERT_EXTENSION = ".vert";
+    private static final String FRAG_EXTENSION = ".frag";
+
+    public static int rawColor;
+    public static int dissolve;
+
+    public static ResourceLocation shaderMaskTextureLocation = new ResourceLocation(EffortlessBuilding.MODID, "textures/shader_mask.png");
+
+    public static void init() {
+        if(!doUseShaders())
+            return;
+
+        rawColor = createProgram("/assets/effortlessbuilding/shaders/raw_color", FRAG);
+        dissolve = createProgram("/assets/effortlessbuilding/shaders/dissolve", VERT + FRAG);
+    }
+
+    public static void useShader(int shader, Consumer<Integer> callback) {
+        if(!doUseShaders())
+            return;
+
+        ARBShaderObjects.glUseProgramObjectARB(shader);
+
+        if(shader != 0) {
+            int time = ARBShaderObjects.glGetUniformLocationARB(shader, "time");
+            ARBShaderObjects.glUniform1iARB(time, ClientProxy.ticksInGame);
+
+            if(callback != null)
+                callback.accept(shader);
+        }
+    }
+
+    public static void useShader(int shader) {
+        useShader(shader, null);
+    }
+
+    public static void releaseShader() {
+        useShader(0);
+    }
+
+    public static boolean doUseShaders() {
+        return BuildConfig.visuals.useShaders && OpenGlHelper.shadersSupported;
+    }
+
+    private static int createProgram(String s, int sides) {
+        boolean vert = (sides & VERT) != 0;
+        boolean frag = (sides & FRAG) != 0;
+
+        return createProgram(vert ? s + VERT_EXTENSION : null, frag ? s + FRAG_EXTENSION : null);
+    }
+
+    // Most of the code taken from the LWJGL wiki
+    // http://lwjgl.org/wiki/index.php?title=GLSL_Shaders_with_LWJGL
+
+    private static int createProgram(String vert, String frag) {
+        int vertId = 0, fragId = 0, program;
+        if(vert != null)
+            vertId = createShader(vert, VERT_ST);
+        if(frag != null)
+            fragId = createShader(frag, FRAG_ST);
+
+        program = ARBShaderObjects.glCreateProgramObjectARB();
+        if(program == 0)
+            return 0;
+
+        if(vert != null)
+            ARBShaderObjects.glAttachObjectARB(program, vertId);
+        if(frag != null)
+            ARBShaderObjects.glAttachObjectARB(program, fragId);
+
+        ARBShaderObjects.glLinkProgramARB(program);
+        if(ARBShaderObjects.glGetObjectParameteriARB(program, ARBShaderObjects.GL_OBJECT_LINK_STATUS_ARB) == GL11.GL_FALSE) {
+            EffortlessBuilding.logger.log(Level.ERROR, getLogInfo(program));
+            return 0;
+        }
+
+        ARBShaderObjects.glValidateProgramARB(program);
+        if (ARBShaderObjects.glGetObjectParameteriARB(program, ARBShaderObjects.GL_OBJECT_VALIDATE_STATUS_ARB) == GL11.GL_FALSE) {
+            EffortlessBuilding.logger.log(Level.ERROR, getLogInfo(program));
+            return 0;
+        }
+
+        return program;
+    }
+
+    private static int createShader(String filename, int shaderType){
+        int shader = 0;
+        try {
+            shader = ARBShaderObjects.glCreateShaderObjectARB(shaderType);
+
+            if(shader == 0)
+                return 0;
+
+            ARBShaderObjects.glShaderSourceARB(shader, readFileAsString(filename));
+            ARBShaderObjects.glCompileShaderARB(shader);
+
+            if (ARBShaderObjects.glGetObjectParameteriARB(shader, ARBShaderObjects.GL_OBJECT_COMPILE_STATUS_ARB) == GL11.GL_FALSE)
+                throw new RuntimeException("Error creating shader: " + getLogInfo(shader));
+
+            return shader;
+        }
+        catch(Exception e) {
+            ARBShaderObjects.glDeleteObjectARB(shader);
+            e.printStackTrace();
+            return -1;
+        }
+    }
+
+    private static String getLogInfo(int obj) {
+        return ARBShaderObjects.glGetInfoLogARB(obj, ARBShaderObjects.glGetObjectParameteriARB(obj, ARBShaderObjects.GL_OBJECT_INFO_LOG_LENGTH_ARB));
+    }
+
+    private static String readFileAsString(String filename) throws Exception {
+        StringBuilder source = new StringBuilder();
+        InputStream in = ShaderHandler.class.getResourceAsStream(filename);
+        Exception exception = null;
+        BufferedReader reader;
+
+        if(in == null)
+            return "";
+
+        try {
+            reader = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
+
+            Exception innerExc= null;
+            try {
+                String line;
+                while((line = reader.readLine()) != null)
+                    source.append(line).append('\n');
+            } catch(Exception exc) {
+                exception = exc;
+            } finally {
+                try {
+                    reader.close();
+                } catch(Exception exc) {
+                    innerExc = exc;
+                }
+            }
+
+            if(innerExc != null)
+                throw innerExc;
+        } catch(Exception exc) {
+            exception = exc;
+        } finally {
+            try {
+                in.close();
+            } catch(Exception exc) {
+                if(exception == null)
+                    exception = exc;
+                else exc.printStackTrace();
+            }
+
+            if(exception != null)
+                throw exception;
+        }
+
+        return source.toString();
+    }
+
+}

src/main/resources/assets/effortlessbuilding/lang/en_us.lang

@@ -1,11 +1,52 @@
 key.effortlessbuilding.category=Effortless Building
-key.effortlessbuilding.hud.desc=Open Settings
+key.effortlessbuilding.hud.desc=Modifier Menu
 key.effortlessbuilding.replace.desc=Toggle QuickReplace
 key.effortlessbuilding.creative.desc=Toggle Survival/Creative Mode
+key.effortlessbuilding.mode.desc=Radial Menu
+key.effortlessbuilding.undo.desc=Undo
+key.effortlessbuilding.redo.desc=Redo
+key.effortlessbuilding.altplacement.desc=Alternative placement
 
 item.effortlessbuilding:randomizer_bag.name=Randomizer Bag
 item.effortlessbuilding:reach_upgrade1.name=Reach Upgrade 1
 item.effortlessbuilding:reach_upgrade2.name=Reach Upgrade 2
 item.effortlessbuilding:reach_upgrade3.name=Reach Upgrade 3
 
+effortlessbuilding.mode.normal=Normal
+effortlessbuilding.mode.normal_plus=Normal+
+effortlessbuilding.mode.line=Line
+effortlessbuilding.mode.wall=Wall
+effortlessbuilding.mode.floor=Floor
+effortlessbuilding.mode.diagonal_line=Diagonal Line
+effortlessbuilding.mode.diagonal_wall=Diagonal Wall
+effortlessbuilding.mode.slope_floor=Slope Floor
+effortlessbuilding.mode.cube=Cube
+effortlessbuilding.mode.circle=Circle
+effortlessbuilding.mode.cylinder=Cylinder
+effortlessbuilding.mode.sphere=Sphere
+
+effortlessbuilding.action.undo=Undo
+effortlessbuilding.action.redo=Redo
+effortlessbuilding.action.replace=Replace
+effortlessbuilding.action.open_modifier_settings=Open Modifier Settings
+
+effortlessbuilding.action.build_speed=Build Speed
+effortlessbuilding.action.filling=Filling
+effortlessbuilding.action.raised_edge=Raised Edge
+effortlessbuilding.action.thickness=Line Thickness
+effortlessbuilding.action.circle_start=Start Point
+
+effortlessbuilding.action.normal_speed=Normal
+effortlessbuilding.action.fast_speed=Fast
+effortlessbuilding.action.full=Filled
+effortlessbuilding.action.hollow=Hollow
+effortlessbuilding.action.skeleton=Skeleton
+effortlessbuilding.action.short_edge=Short Edge
+effortlessbuilding.action.long_edge=Long Edge
+effortlessbuilding.action.thickness_1=1 Block Thick
+effortlessbuilding.action.thickness_3=3 Blocks Thick
+effortlessbuilding.action.thickness_5=5 Blocks Thick
+effortlessbuilding.action.start_center=Middle
+effortlessbuilding.action.start_corner=Corner
+
 commands.reach.usage=/reach <level>

src/main/resources/assets/effortlessbuilding/shaders/dissolve.frag

@@ -0,0 +1,104 @@
+#version 120
+
+uniform int time; // Passed in, see ShaderHelper.java
+
+uniform float dissolve; // Passed in via Callback
+uniform int highlight;
+uniform int red;
+uniform vec3 blockpos;
+uniform vec3 firstpos;
+uniform vec3 secondpos;
+uniform sampler2D image;
+uniform sampler2D mask;
+
+varying vec4 position;
+varying vec3 normal;
+
+void main() {
+
+    vec3 pixelposition = floor(position.xyz * 8.0) / 8.0;
+    vec3 worldpos = blockpos + pixelposition.xyz;
+    vec2 texcoord = vec2(gl_TexCoord[0]);
+    vec4 texcolor = texture2D(image, texcoord);
+    vec4 color = texcolor;
+    vec3 firstposc = firstpos + 0.51; //center in block
+    vec3 secondposc = secondpos + 0.5;
+
+    //find place in between first and second pos
+    float firstToSecond = length(secondposc - firstposc);
+    float place = 0.0;
+    if (firstToSecond > 0.5) {
+        float placeFromFirst = length(worldpos - firstposc) / firstToSecond;
+        float placeFromSecond = length(worldpos - secondposc) / firstToSecond;
+        place = (placeFromFirst + (1.0 - placeFromSecond)) / 2.0;
+    } //else only one block
+
+    //find 2d texture coordinate for noise texture based on world position
+    vec2 maskcoord = vec2(worldpos.y, worldpos.z);
+    if (abs(normal.y) > 0.5)
+        maskcoord = vec2(worldpos.x, worldpos.z);
+    if (abs(normal.z) > 0.5)
+        maskcoord = vec2(worldpos.x, worldpos.y);
+
+    maskcoord /= 20.0;
+    vec4 maskColor = texture2D(mask, maskcoord);
+    float maskgs = maskColor.r;
+
+    color.rgb *= gl_Color.rgb;
+
+    //desaturate
+    color.rgb *= vec3(0.8);
+
+    //add blueish hue
+    color.rgb += vec3(-0.1, 0.0, 0.2);
+
+    //add pulsing blue
+    float pulse = (sin(time / 5.0) + 1.0) / 2.0;
+    color.rgb += 0.4 * vec3(-0.5, 0.2, 0.6) * pulse;
+
+    //add diagonal highlights
+    float diagTime = mod(time / 40.0, 1.4) - 0.2;
+    float diag = smoothstep(diagTime - 0.2, diagTime, place) - smoothstep(diagTime, diagTime + 0.2, place);
+    color.rgb += 0.2 * diag * vec3(0.0, 0.2, 0.4);
+
+    float diagTime2 = mod(time / 70.0, 1.4) - 0.2;
+    float diag2 = smoothstep(diagTime2 - 0.2, diagTime2, place) - smoothstep(diagTime2, diagTime2 + 0.2, place);
+    color.rgb += 0.2 * diag2 * vec3(0.0, 0.4, 0.8);
+
+    //add edge shading
+//    vec3 p1;
+//    //if (firstpos.x < secondpos.x)
+//
+//    vec3 wmf = worldpos - firstposc;
+//    vec3 wms = worldpos - (secondposc + vec3(0.0, 1.0, 1.0));
+//    float distToEdge1 = min(length(wmf.xy), length(wmf.xz));
+//    float distToEdge2 = min(length(wmf.yz), length(wms.xy));
+//    float distToEdge3 = min(length(wms.xz), length(wms.yz));
+//    float distToEdge = min(min(distToEdge1, distToEdge2), distToEdge3);
+//    color.rgb += vec3(0.5 - smoothstep(0, 0.5, distToEdge)) * 0.5;
+
+    //add flat shading
+//    if (abs(normal.x) > 0.5)
+//        color.rgb -= 0.0;
+    if (abs(normal.y) > 0.5)
+        color.rgb += 0.05;
+    if (abs(normal.z) > 0.5)
+        color.rgb -= 0.05;
+
+
+    if (highlight == 1 && dissolve == 0.0) {
+        color.rgb += vec3(0.0, 0.1, -0.2);
+    }
+
+    if (red == 1) {
+        color.rgb += vec3(0.4, -0.3, -0.5);
+    }
+
+    color.r = max(0, min(1, color.r));
+    color.g = max(0, min(1, color.g));
+    color.b = max(0, min(1, color.b));
+
+    if (maskgs * 0.3 + place * 0.7 <= dissolve)
+    	gl_FragColor = vec4(texcolor.rgb, 0.0);
+    else gl_FragColor = color;
+}

src/main/resources/assets/effortlessbuilding/shaders/dissolve.vert

@@ -0,0 +1,14 @@
+#version 120
+
+varying vec4 position;
+varying vec3 normal;
+
+void main() {
+    gl_Position = ftransform();//gl_ProjectionMatrix * gl_ModelViewMatrix * gl_Vertex;
+    gl_TexCoord[0]  = gl_TextureMatrix[0] * gl_MultiTexCoord0;
+    gl_FrontColor = gl_Color;
+    //gl_BackColor = gl_Color;
+
+    position = gl_Vertex;
+    normal = gl_Normal;
+}

src/main/resources/assets/effortlessbuilding/shaders/raw_color.frag

@@ -0,0 +1,15 @@
+#version 120
+
+uniform sampler2D bgl_RenderedTexture;
+
+void main() {
+    vec2 texcoord = vec2(gl_TexCoord[0]);
+    vec4 color = texture2D(bgl_RenderedTexture, texcoord);
+
+    float r = color.b * gl_Color.r;
+    float g = color.g * gl_Color.g;
+    float b = color.r * gl_Color.b;
+    float a = color.a * gl_Color.a;
+
+    gl_FragColor = vec4(r, g, b, a);
+}