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.12.2-2.9"
+version = "1.12.2-2.16"
 group = "nl.requios.effortlessbuilding" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "effortlessbuilding"
 

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
+# Escape application args
-function splitJvmOpts() {
+save () {
-    JVM_OPTS=("$@")
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+APP_ARGS=$(save "$@")
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
-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

@@ -65,7 +65,7 @@ public class BuildConfig {
 
         @Comment({"How many placements are remembered for the undo functionality."})
         @RequiresMcRestart
-        public int undoStackSize = 5;
+        public int undoStackSize = 10;
     }
 
     public static class Visuals {

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

@@ -39,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.12.2-2.9";
+    public static final String VERSION = "1.12.2-2.16";
 
     @Mod.Instance(EffortlessBuilding.MODID)
     public static EffortlessBuilding instance;
@@ -93,11 +93,20 @@ public class EffortlessBuilding
         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);
     }
 

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

@@ -5,6 +5,7 @@ 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;
@@ -30,6 +31,9 @@ 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;
 
@@ -91,14 +95,20 @@ public class EventHandler
         BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
         ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
 
-        if (buildMode != BuildModes.BuildModeEnum.NORMAL || modifierSettings.doQuickReplace()) {
+        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 and QuickReplace should still work
+            //But modifiers should still work
 
             //Send message to client, which sends message back with raytrace info
-            EffortlessBuilding.packetHandler.sendTo(new RequestLookAtMessage(event.getPos(), event.getBlockSnapshot().getReplacedBlock(), event.getState()), (EntityPlayerMP) player);
+            EffortlessBuilding.packetHandler.sendTo(new RequestLookAtMessage(false), (EntityPlayerMP) player);
+            EffortlessBuilding.packetHandler.sendTo(new AddUndoMessage(event.getPos(), event.getBlockSnapshot().getReplacedBlock(), event.getState()), (EntityPlayerMP) player);
         }
     }
 
@@ -113,9 +123,12 @@ public class EventHandler
             event.setCanceled(true);
         } else {
             //NORMAL mode, let vanilla handle block breaking
-            //But modifiers and QuickReplace should still work
+            //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());
         }
     }
 
@@ -165,8 +178,11 @@ public class EventHandler
 
     @SubscribeEvent
     public static void onPlayerLoggedOut(PlayerLoggedOutEvent event) {
-        UndoRedo.clear(event.player);
+        EntityPlayer player = event.player;
-        //TODO call clientside
+        if (player.getEntityWorld().isRemote) return;
+
+        UndoRedo.clear(player);
+        EffortlessBuilding.packetHandler.sendTo(new ClearUndoMessage(), (EntityPlayerMP) player);
     }
 
     @SubscribeEvent
@@ -179,10 +195,12 @@ public class EventHandler
     @SubscribeEvent
     public static void onPlayerChangedDimension(PlayerChangedDimensionEvent event) {
         EntityPlayer player = event.player;
+        if (player.getEntityWorld().isRemote) return;
+
         ModifierSettingsManager.handleNewPlayer(player);
         ModeSettingsManager.handleNewPlayer(player);
 
-        UndoRedo.clear(event.player);
+        UndoRedo.clear(player);
-        //TODO call clientside
+        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

@@ -4,11 +4,14 @@ 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.ModeOptions.ActionEnum;
+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.compatibility.CompatHelper;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 import nl.requios.effortlessbuilding.helper.SurvivalHelper;
 import nl.requios.effortlessbuilding.network.BlockBrokenMessage;
@@ -19,6 +22,8 @@ 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
@@ -27,21 +32,24 @@ public class BuildModes {
     public static Dictionary<EntityPlayer, Boolean> currentlyBreakingServer = new Hashtable<>();
 
     public enum BuildModeEnum {
-        NORMAL("effortlessbuilding.mode.normal", new Normal(), new ActionEnum[]{}),
+        NORMAL("effortlessbuilding.mode.normal", new Normal()),
-        NORMAL_PLUS("effortlessbuilding.mode.normal_plus", new NormalPlus(), new ActionEnum[]{ActionEnum.NORMAL_SPEED, ActionEnum.FAST_SPEED}),
+        NORMAL_PLUS("effortlessbuilding.mode.normal_plus", new NormalPlus(), OptionEnum.BUILD_SPEED),
-        LINE("effortlessbuilding.mode.line", new Line(), new ActionEnum[]{/*ActionEnum.THICKNESS_1, ActionEnum.THICKNESS_3, ActionEnum.THICKNESS_5*/}),
+        LINE("effortlessbuilding.mode.line", new Line() /*, OptionEnum.THICKNESS*/),
-        WALL("effortlessbuilding.mode.wall", new Wall(), new ActionEnum[]{ActionEnum.FULL, ActionEnum.HOLLOW}),
+        WALL("effortlessbuilding.mode.wall", new Wall(), OptionEnum.FILL),
-        FLOOR("effortlessbuilding.mode.floor", new Floor(), new ActionEnum[]{ActionEnum.FULL, ActionEnum.HOLLOW}),
+        FLOOR("effortlessbuilding.mode.floor", new Floor(), OptionEnum.FILL),
-        DIAGONAL_LINE("effortlessbuilding.mode.diagonal_line", new DiagonalLine(), new ActionEnum[]{/*ActionEnum.THICKNESS_1, ActionEnum.THICKNESS_3, ActionEnum.THICKNESS_5*/}),
+        DIAGONAL_LINE("effortlessbuilding.mode.diagonal_line", new DiagonalLine() /*, OptionEnum.THICKNESS*/),
-        DIAGONAL_WALL("effortlessbuilding.mode.diagonal_wall", new DiagonalWall(), new ActionEnum[]{/*ActionEnum.FULL, ActionEnum.HOLLOW*/}),
+        DIAGONAL_WALL("effortlessbuilding.mode.diagonal_wall", new DiagonalWall() /*, OptionEnum.FILL*/),
-        SLOPE_FLOOR("effortlessbuilding.mode.slope_floor", new SlopeFloor(), new ActionEnum[]{ActionEnum.SHORT_EDGE, ActionEnum.LONG_EDGE}),
+        SLOPE_FLOOR("effortlessbuilding.mode.slope_floor", new SlopeFloor(), OptionEnum.RAISED_EDGE),
-        CUBE("effortlessbuilding.mode.cube", new Cube(), new ActionEnum[]{ActionEnum.CUBE_FULL, ActionEnum.CUBE_HOLLOW, ActionEnum.CUBE_SKELETON});
+        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 ActionEnum[] options;
+        public OptionEnum[] options;
 
-        BuildModeEnum(String name, IBuildMode instance, ActionEnum[] options) {
+        BuildModeEnum(String name, IBuildMode instance, OptionEnum... options) {
             this.name = name;
             this.instance = instance;
             this.options = options;
@@ -135,16 +143,16 @@ public class BuildModes {
             return;
         }
 
-        if (!ReachHelper.canBreakFar(player)) return;
-
         //If first click
         if (currentlyBreaking.get(player) == null) {
             //If startpos is null, dont do anything
             if (startPos == null) return;
         }
 
-        //Get coordinates
+        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);
 
@@ -220,4 +228,18 @@ public class BuildModes {
         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/Cube.java

@@ -1,208 +0,0 @@
-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.*;
-
-public class Cube 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
-    private Dictionary<UUID, Integer> rightClickClientTable = new Hashtable<>();
-    private Dictionary<UUID, Integer> rightClickServerTable = new Hashtable<>();
-    private Dictionary<UUID, BlockPos> firstPosTable = new Hashtable<>();
-    private Dictionary<UUID, BlockPos> secondPosTable = new Hashtable<>();
-    private Dictionary<UUID, EnumFacing> sideHitTable = new Hashtable<>();
-    private 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 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 = Floor.findFloor(player, firstPos, skipRaytrace);
-
-            if (secondPos == null) {
-                rightClickTable.put(player.getUniqueID(), 1);
-                return list;
-            }
-
-            secondPosTable.put(player.getUniqueID(), secondPos);
-
-        } else {
-            //Third click, place cube 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 = Floor.findFloor(player, firstPos, skipRaytrace);
-            if (secondPos == null) return list;
-
-            //Add whole floor
-            //Limit amount of blocks you can place per row
-            int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
-
-            int x1 = firstPos.getX(), x2 = secondPos.getX();
-            int y = firstPos.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 (z2 - z1 >= axisLimit) z2 = z1 + axisLimit - 1;
-            if (z1 - z2 >= axisLimit) z2 = z1 - axisLimit + 1;
-
-            if (ModeOptions.getCubeFill() == ModeOptions.ActionEnum.CUBE_SKELETON) {
-                //Hollow floor
-                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);
-            } else {
-                //Filled floor
-                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));
-                    }
-                }
-            }
-
-        } else {
-            BlockPos firstPos = firstPosTable.get(player.getUniqueID());
-            BlockPos secondPos = secondPosTable.get(player.getUniqueID());
-
-            BlockPos thirdPos = DiagonalLine.findHeight(player, secondPos, skipRaytrace);
-            if (thirdPos == null) return list;
-
-            //Add whole cube
-            //Limit amount of blocks you can place per row
-            int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
-
-            int x1 = firstPos.getX(), x2 = thirdPos.getX();
-            int y1 = firstPos.getY(), y2 = thirdPos.getY();
-            int z1 = firstPos.getZ(), z2 = 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;
-
-            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);
-    }
-
-    @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/DiagonalWall.java

@@ -1,138 +0,0 @@
-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.*;
-
-public class DiagonalWall 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
-    private Dictionary<UUID, Integer> rightClickClientTable = new Hashtable<>();
-    private Dictionary<UUID, Integer> rightClickServerTable = new Hashtable<>();
-    private Dictionary<UUID, BlockPos> firstPosTable = new Hashtable<>();
-    private Dictionary<UUID, BlockPos> secondPosTable = new Hashtable<>();
-    private Dictionary<UUID, EnumFacing> sideHitTable = new Hashtable<>();
-    private 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 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 = Floor.findFloor(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 = Floor.findFloor(player, firstPos, true);
-            if (secondPos == null) return list;
-
-            //Add diagonal line
-            list.addAll(DiagonalLine.getDiagonalLineBlocks(player, firstPos, secondPos, 1));
-
-        } else {
-            BlockPos firstPos = firstPosTable.get(player.getUniqueID());
-            BlockPos secondPos = secondPosTable.get(player.getUniqueID());
-
-            BlockPos thirdPos = DiagonalLine.findHeight(player, secondPos, skipRaytrace);
-            if (thirdPos == null) return list;
-
-            //Add diagonal wall
-            list.addAll(getDiagonalWallBlocks(player, firstPos, secondPos, thirdPos));
-        }
-
-        return list;
-    }
-
-    //Add diagonal wall from first to second
-    public static List<BlockPos> getDiagonalWallBlocks(EntityPlayer player, BlockPos firstPos, BlockPos secondPos, BlockPos thirdPos) {
-        List<BlockPos> list = new ArrayList<>();
-
-        int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
-
-        //Get diagonal line blocks
-        List<BlockPos> diagonalLineBlocks = DiagonalLine.getDiagonalLineBlocks(player, firstPos, secondPos, 1);
-
-        //Limit amount of blocks we can place
-        int lowest = Math.min(firstPos.getY(), thirdPos.getY());
-        int highest = Math.max(firstPos.getY(), thirdPos.getY());
-
-        if (highest - lowest >= axisLimit) highest = lowest + axisLimit - 1;
-
-        //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;
-    }
-
-    @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/Floor.java

@@ -1,183 +0,0 @@
-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.RayTraceResult;
-import net.minecraft.util.math.Vec3d;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
-
-import java.util.*;
-
-public class Floor 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
-    private Dictionary<UUID, Integer> rightClickClientTable = new Hashtable<>();
-    private Dictionary<UUID, Integer> rightClickServerTable = new Hashtable<>();
-    private Dictionary<UUID, BlockPos> firstPosTable = new Hashtable<>();
-    private Dictionary<UUID, EnumFacing> sideHitTable = new Hashtable<>();
-    private Dictionary<UUID, Vec3d> hitVecTable = new Hashtable<>();
-
-    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) {
-
-            boolean intersects = false;
-            if (!skipRaytrace) {
-                //collision within a 1 block radius to selected is fine
-                RayTraceResult rayTraceResult = player.world.rayTraceBlocks(start, planeBound, 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;
-        }
-    }
-
-    @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 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 wall
-
-            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 = findFloor(player, firstPos, skipRaytrace);
-            if (secondPos == null) return list;
-
-            //Add whole floor
-            list.addAll(getFloorBlocks(player, firstPos, secondPos));
-        }
-
-        return list;
-    }
-
-    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);
-    }
-
-    public static List<BlockPos> getFloorBlocks(EntityPlayer player, BlockPos firstPos, BlockPos secondPos) {
-        List<BlockPos> list = new ArrayList<>();
-
-        //Limit amount of blocks you can place per row
-        int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
-
-        int x1 = firstPos.getX(), x2 = secondPos.getX();
-        int y = firstPos.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 (z2 - z1 >= axisLimit) z2 = z1 + axisLimit - 1;
-        if (z1 - z2 >= axisLimit) z2 = z1 - axisLimit + 1;
-
-        if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
-            addFloorBlocks(list, x1, x2, y, z1, z2);
-        else
-            addHollowFloorBlocks(list, x1, x2, y, 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);
-    }
-
-    @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/ModeOptions.java

@@ -1,16 +1,11 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
-import nl.requios.effortlessbuilding.gui.buildmode.RadialMenu;
+import nl.requios.effortlessbuilding.proxy.ClientProxy;
-import nl.requios.effortlessbuilding.gui.buildmodifier.ModifierSettingsGui;
 
 public class ModeOptions {
 
@@ -35,7 +30,10 @@ public class ModeOptions {
 
         THICKNESS_1("effortlessbuilding.action.thickness_1"),
         THICKNESS_3("effortlessbuilding.action.thickness_3"),
-        THICKNESS_5("effortlessbuilding.action.thickness_5");
+        THICKNESS_5("effortlessbuilding.action.thickness_5"),
+
+        CIRCLE_START_CORNER("effortlessbuilding.action.start_corner"),
+        CIRCLE_START_CENTER("effortlessbuilding.action.start_center");
 
         public String name;
 
@@ -44,11 +42,48 @@ public class ModeOptions {
         }
     }
 
+    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;
@@ -70,10 +105,13 @@ public class ModeOptions {
         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;
-        BuildModes.BuildModeEnum currentBuildMode = ModeSettingsManager.getModeSettings(Minecraft.getMinecraft().player).getBuildMode();
 
         switch (action) {
             case UNDO:
@@ -90,7 +128,7 @@ public class ModeOptions {
                 break;
             case OPEN_MODIFIER_SETTINGS:
                 if (player.world.isRemote)
-                    openModifierSettings();
+                    ClientProxy.openModifierSettings();
                 break;
 
             case NORMAL_SPEED:
@@ -129,22 +167,16 @@ public class ModeOptions {
             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) {
-            logAction(action);
+            ClientProxy.logTranslate(action.name);
         }
     }
-
-    //TODO fix client class import giving error on server (nothing happens, it's just ugly)
-    @SideOnly(Side.CLIENT)
-    private static void openModifierSettings() {
-        Minecraft.getMinecraft().displayGuiScreen(new ModifierSettingsGui());
-        RadialMenu.instance.setVisibility(0f);
-    }
-
-    @SideOnly(Side.CLIENT)
-    private static void logAction(ActionEnum action) {
-        EffortlessBuilding.log(Minecraft.getMinecraft().player, I18n.format(action.name), true);
-    }
 }

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

@@ -3,8 +3,6 @@ package nl.requios.effortlessbuilding.buildmode;
 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.EffortlessBuilding;
 import nl.requios.effortlessbuilding.capability.ModeCapabilityManager;
 import nl.requios.effortlessbuilding.helper.ReachHelper;

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

@@ -1,178 +0,0 @@
-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.*;
-
-public class SlopeFloor 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
-    private Dictionary<UUID, Integer> rightClickClientTable = new Hashtable<>();
-    private Dictionary<UUID, Integer> rightClickServerTable = new Hashtable<>();
-    private Dictionary<UUID, BlockPos> firstPosTable = new Hashtable<>();
-    private Dictionary<UUID, BlockPos> secondPosTable = new Hashtable<>();
-    private Dictionary<UUID, EnumFacing> sideHitTable = new Hashtable<>();
-    private 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 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 = Floor.findFloor(player, firstPos, true);
-
-            if (secondPos == null) {
-                rightClickTable.put(player.getUniqueID(), 1);
-                return list;
-            }
-
-            secondPosTable.put(player.getUniqueID(), secondPos);
-
-        } else {
-            //Third click, place slope floor 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 = Floor.findFloor(player, firstPos, true);
-            if (secondPos == null) return list;
-
-            //Add whole floor
-            list.addAll(Floor.getFloorBlocks(player, firstPos, secondPos));
-
-        } else {
-            BlockPos firstPos = firstPosTable.get(player.getUniqueID());
-            BlockPos secondPos = secondPosTable.get(player.getUniqueID());
-
-            BlockPos thirdPos = DiagonalLine.findHeight(player, secondPos, skipRaytrace);
-            if (thirdPos == null) return list;
-
-            //Add slope floor blocks
-            list.addAll(getSlopeFloorBlocks(player, firstPos, secondPos, thirdPos));
-        }
-
-        return list;
-    }
-
-    //Add slope floor from first to second
-    public static List<BlockPos> getSlopeFloorBlocks(EntityPlayer player, BlockPos firstPos, BlockPos secondPos, BlockPos thirdPos) {
-        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(secondPos.getX() - firstPos.getX());
-        int zLength = Math.abs(secondPos.getZ() - firstPos.getZ());
-
-        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
-            BlockPos linePoint = new BlockPos(secondPos.getX(), thirdPos.getY(), firstPos.getZ());
-            List<BlockPos> diagonalLineBlocks = DiagonalLine.getDiagonalLineBlocks(player, firstPos, linePoint, 1f);
-
-            //Limit amount of blocks we can place
-            int lowest = Math.min(firstPos.getZ(), secondPos.getZ());
-            int highest = Math.max(firstPos.getZ(), secondPos.getZ());
-
-            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
-            BlockPos linePoint = new BlockPos(firstPos.getX(), thirdPos.getY(), secondPos.getZ());
-            List<BlockPos> diagonalLineBlocks = DiagonalLine.getDiagonalLineBlocks(player, firstPos, linePoint, 1f);
-
-            //Limit amount of blocks we can place
-            int lowest = Math.min(firstPos.getX(), secondPos.getX());
-            int highest = Math.max(firstPos.getX(), secondPos.getX());
-
-            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;
-    }
-
-    @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/ThreeClicksBuildMode.java

@@ -3,21 +3,15 @@ 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.RayTraceResult;
 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 class DiagonalLine implements IBuildMode {
+public abstract class ThreeClicksBuildMode extends BaseBuildMode {
-    //In singleplayer client and server variables are shared
+    protected Dictionary<UUID, BlockPos> secondPosTable = new Hashtable<>();
-    //Split everything that needs separate values and may not be called twice in one click
-    private Dictionary<UUID, Integer> rightClickClientTable = new Hashtable<>();
-    private Dictionary<UUID, Integer> rightClickServerTable = new Hashtable<>();
-    private Dictionary<UUID, BlockPos> firstPosTable = new Hashtable<>();
-    private Dictionary<UUID, BlockPos> secondPosTable = new Hashtable<>();
-    private Dictionary<UUID, EnumFacing> sideHitTable = new Hashtable<>();
-    private Dictionary<UUID, Vec3d> hitVecTable = new Hashtable<>();
 
     static class HeightCriteria {
         Vec3d planeBound;
@@ -42,27 +36,14 @@ public class DiagonalLine implements IBuildMode {
         //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) {
 
-            boolean intersects = false;
+            return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, lineBound, planeBound, distToPlayerSq);
-            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;
         }
     }
-    
+
     @Override
     public void initialize(EntityPlayer player) {
-        rightClickClientTable.put(player.getUniqueID(), 0);
+        super.initialize(player);
-        rightClickServerTable.put(player.getUniqueID(), 0);
+        secondPosTable.put(player.getUniqueID(), BlockPos.ORIGIN);
-        firstPosTable.put(player.getUniqueID(), BlockPos.ORIGIN);
-        sideHitTable.put(player.getUniqueID(), EnumFacing.UP);
-        hitVecTable.put(player.getUniqueID(), Vec3d.ZERO);
     }
 
     @Override
@@ -89,7 +70,7 @@ public class DiagonalLine implements IBuildMode {
         } else if (rightClickNr == 2) {
             //Second click, find other floor point
             BlockPos firstPos = firstPosTable.get(player.getUniqueID());
-            BlockPos secondPos = Floor.findFloor(player, firstPos, true);
+            BlockPos secondPos = findSecondPos(player, firstPos, true);
 
             if (secondPos == null) {
                 rightClickTable.put(player.getUniqueID(), 1);
@@ -99,7 +80,7 @@ public class DiagonalLine implements IBuildMode {
             secondPosTable.put(player.getUniqueID(), secondPos);
 
         } else {
-            //Third click, place diagonal line with height
+            //Third click, place diagonal wall with height
             list = findCoordinates(player, blockPos, skipRaytrace);
             rightClickTable.put(player.getUniqueID(), 0);
         }
@@ -119,26 +100,75 @@ public class DiagonalLine implements IBuildMode {
         } else if (rightClickNr == 1) {
             BlockPos firstPos = firstPosTable.get(player.getUniqueID());
 
-            BlockPos secondPos = Floor.findFloor(player, firstPos, true);
+            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(getDiagonalLineBlocks(player , firstPos, secondPos, 10));
+            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 = findHeight(player, secondPos, skipRaytrace);
+            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(getDiagonalLineBlocks(player , firstPos, thirdPos, 10));
+            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();
@@ -182,47 +212,4 @@ public class DiagonalLine implements IBuildMode {
         }
         return new BlockPos(selected.lineBound);
     }
-
+}
-    //Add diagonal line from first to second
-    public static List<BlockPos> getDiagonalLineBlocks(EntityPlayer player, BlockPos firstPos, BlockPos secondPos, float sampleMultiplier) {
-        List<BlockPos> list = new ArrayList<>();
-
-        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;
-
-        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;
-    }
-
-    @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/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/Wall.java

@@ -1,226 +0,0 @@
-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.RayTraceResult;
-import net.minecraft.util.math.Vec3d;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
-
-import java.util.*;
-
-public class Wall 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
-    private Dictionary<UUID, Integer> rightClickClientTable = new Hashtable<>();
-    private Dictionary<UUID, Integer> rightClickServerTable = new Hashtable<>();
-    private Dictionary<UUID, BlockPos> firstPosTable = new Hashtable<>();
-    private Dictionary<UUID, EnumFacing> sideHitTable = new Hashtable<>();
-    private Dictionary<UUID, Vec3d> hitVecTable = new Hashtable<>();
-
-    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) {
-
-            boolean intersects = false;
-            if (!skipRaytrace) {
-                //collision within a 1 block radius to selected is fine
-                RayTraceResult rayTraceResult = player.world.rayTraceBlocks(start, planeBound, 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;
-        }
-    }
-
-    @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 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 wall
-
-            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 = findWall(player, firstPos, skipRaytrace);
-            if (secondPos == null) return list;
-
-            //Add whole wall
-            list.addAll(getWallBlocks(player, firstPos, secondPos));
-        }
-
-        return list;
-    }
-
-    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);
-    }
-
-    public static List<BlockPos> getWallBlocks(EntityPlayer player, BlockPos firstPos, BlockPos secondPos) {
-        List<BlockPos> list = new ArrayList<>();
-
-        //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;
-
-        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);
-    }
-
-    @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/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

@@ -1,22 +1,16 @@
-package nl.requios.effortlessbuilding.buildmode;
+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.RayTraceResult;
 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.*;
+import java.util.ArrayList;
+import java.util.List;
 
-public class Line implements IBuildMode {
+public class Line extends TwoClicksBuildMode {
-    //In singleplayer client and server variables are shared
-    //Split everything that needs separate values and may not be called twice in one click
-    private Dictionary<UUID, Integer> rightClickClientTable = new Hashtable<>();
-    private Dictionary<UUID, Integer> rightClickServerTable = new Hashtable<>();
-    private Dictionary<UUID, BlockPos> firstPosTable = new Hashtable<>();
-    private Dictionary<UUID, EnumFacing> sideHitTable = new Hashtable<>();
-    private Dictionary<UUID, Vec3d> hitVecTable = new Hashtable<>();
 
     static class Criteria {
         Vec3d planeBound;
@@ -55,78 +49,14 @@ public class Line implements IBuildMode {
         //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) {
 
-            boolean intersects = false;
+            return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, lineBound, planeBound, distToPlayerSq);
-            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;
         }
+
     }
 
     @Override
-    public void initialize(EntityPlayer player) {
+    protected BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
-        rightClickClientTable.put(player.getUniqueID(), 0);
+        return findLine(player, firstPos, skipRaytrace);
-        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 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 wall
-
-            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 = findLine(player, firstPos, skipRaytrace);
-            if (secondPos == null) return list;
-
-            list.addAll(getLineBlocks(player, firstPos, secondPos));
-        }
-
-        return list;
     }
 
     public static BlockPos findLine(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
@@ -178,25 +108,14 @@ public class Line implements IBuildMode {
         return new BlockPos(selected.lineBound);
     }
 
-    public static List<BlockPos> getLineBlocks(EntityPlayer player, BlockPos firstPos, BlockPos secondPos) {
+    @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<>();
 
-        //Limit amount of blocks we can place
-        int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
-
-        //Add whole line
-        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;
-
         if (x1 != x2) {
             addXLineBlocks(list, x1, x2, y1, z1);
         } else if (y1 != y2) {
@@ -225,15 +144,4 @@ public class Line implements IBuildMode {
             list.add(new BlockPos(x, y, z));
         }
     }
-
-    @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/Normal.java

@@ -1,9 +1,10 @@
-package nl.requios.effortlessbuilding.buildmode;
+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;

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

@@ -1,9 +1,10 @@
-package nl.requios.effortlessbuilding.buildmode;
+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;

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/BlockSet.java

@@ -1,6 +1,5 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import mod.chiselsandbits.api.IBitLocation;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;

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

@@ -3,6 +3,7 @@ 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;
@@ -20,7 +21,6 @@ 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;
@@ -75,10 +75,19 @@ public class BuildModifiers {
             }
         }
 
-        //add to undo stack
+        //Set first previousBlockState to empty if in NORMAL mode, to make undo/redo work
-        BlockPos firstPos = startCoordinates.get(0);
+        //(Block is placed by the time it gets here, and unplaced after this)
-        BlockPos secondPos = startCoordinates.get(startCoordinates.size() - 1);
+        if (!placeStartPos) previousBlockStates.set(0, Blocks.AIR.getDefaultState());
-        UndoRedo.addUndo(player, new BlockSet(coordinates, previousBlockStates, newBlockStates, hitVec, firstPos, secondPos));
+
+        //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) {
@@ -100,7 +109,7 @@ public class BuildModifiers {
 
             //list of air blockstates
             for (BlockPos coordinate : coordinates) {
-                newBlockStates.add(Block.getBlockById(0).getDefaultState());
+                newBlockStates.add(Blocks.AIR.getDefaultState());
             }
 
         } else {
@@ -125,6 +134,10 @@ public class BuildModifiers {
             }
         }
 
+        //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);
@@ -231,6 +244,16 @@ public class BuildModifiers {
         if (coordinates1 == null && coordinates2 == null) return true;
         if (coordinates1 == null || coordinates2 == null) return false;
 
-        return coordinates1.equals(coordinates2);
+        //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/ModifierSettingsManager.java

@@ -3,8 +3,6 @@ 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.BuildConfig;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.capability.ModifierCapabilityManager;

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

@@ -3,6 +3,7 @@ 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;
@@ -31,17 +32,36 @@ public class UndoRedo {
     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]));
@@ -76,10 +96,12 @@ public class UndoRedo {
                 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 = Block.getBlockById(0).getDefaultState();
+                IBlockState previousBlockState = Blocks.AIR.getDefaultState();
                 if (itemStack.getItem() instanceof ItemBlock) {
-                    previousBlockState = ((ItemBlock) itemStack.getItem()).getBlock().getDefaultState();
+                    previousBlockState = previousBlockStates.get(i);//((ItemBlock) itemStack.getItem()).getBlock().getDefaultState();
                 }
 
                 if (player.world.isBlockLoaded(coordinate, true)) {
@@ -88,7 +110,9 @@ public class UndoRedo {
                         itemStack = findItemStackInInventory(player, previousBlockStates.get(i));
                         //get blockstate from new itemstack
                         if (!itemStack.isEmpty() && itemStack.getItem() instanceof ItemBlock) {
-                            previousBlockState = ((ItemBlock) itemStack.getItem()).getBlock().getDefaultState();
+                            previousBlockState = previousBlockStates.get(i);//((ItemBlock) itemStack.getItem()).getBlock().getDefaultState();
+                        } else {
+                            previousBlockState = Blocks.AIR.getDefaultState();
                         }
                     }
                     if (itemStack.isEmpty()) SurvivalHelper.breakBlock(player.world, player, coordinate, true);
@@ -115,6 +139,7 @@ public class UndoRedo {
 
         BlockSet blockSet = redoStack.pop();
         List<BlockPos> coordinates = blockSet.getCoordinates();
+        List<IBlockState> previousBlockStates = blockSet.getPreviousBlockStates();
         List<IBlockState> newBlockStates = blockSet.getNewBlockStates();
         Vec3d hitVec = blockSet.getHitVec();
 
@@ -127,16 +152,25 @@ public class UndoRedo {
             //place blocks
             for (int i = 0; i < coordinates.size(); i++) {
                 BlockPos coordinate = coordinates.get(i);
-                IBlockState newBlockState = newBlockStates.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 = ((ItemBlock) itemStack.getItem()).getBlock().getDefaultState();
+                            newBlockState = newBlockStates.get(i);//((ItemBlock) itemStack.getItem()).getBlock().getDefaultState();
+                        } else {
+                            newBlockState = Blocks.AIR.getDefaultState();
                         }
                     }
                     if (itemStack.isEmpty()) SurvivalHelper.breakBlock(player.world, player, coordinate, true);
@@ -172,8 +206,11 @@ public class UndoRedo {
 
     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

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

@@ -1,9 +1,11 @@
 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;
@@ -63,9 +65,9 @@ public class CompatHelper {
         }
 
         //Dank Null
-        if(proxyItem == dankNullItem) {
+        if (proxyItem == dankNullItem) {
             int index = 0;
-            if(proxy.hasTagCompound() && proxy.getTagCompound().hasKey("selectedIndex"))
+            if (proxy.hasTagCompound() && proxy.getTagCompound().hasKey("selectedIndex"))
                 index = proxy.getTagCompound().getInteger("selectedIndex");
             return proxy.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null).getStackInSlot(index);
         }
@@ -75,14 +77,14 @@ public class CompatHelper {
 
     public static ItemStack getItemBlockByState(ItemStack stack, IBlockState state) {
         Item blockItem = Item.getItemFromBlock(state.getBlock());
-        if(stack.getItem() instanceof ItemBlock)
+        if (stack.getItem() instanceof ItemBlock)
             return stack;
-        else if(stack.getItem() instanceof ItemRandomizerBag) {
+        else if (stack.getItem() instanceof ItemRandomizerBag) {
             IItemHandler bagInventory = ItemRandomizerBag.getBagInventory(stack);
             return ItemRandomizerBag.findStack(bagInventory, blockItem);
-        } else if(stack.getItem() == dankNullItem) {
+        } else if (stack.getItem() == dankNullItem) {
             int index = itemHandlerSlotForItem(stack, blockItem);
-            if(index >= 0)
+            if (index >= 0)
                 return stack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null).getStackInSlot(index);
         }
         return ItemStack.EMPTY;
@@ -90,8 +92,11 @@ public class CompatHelper {
 
     // 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) {
+    public static void shrinkStack(ItemStack origStack, ItemStack curStack, EntityPlayer player) {
-        if(origStack.getItem() == dankNullItem) {
+        //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
@@ -100,10 +105,10 @@ public class CompatHelper {
 
     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++) {
+        for (int i = 0; i < handler.getSlots(); i++) {
             ItemStack ref = handler.getStackInSlot(i);
-            if(ref.getItem() instanceof ItemBlock)
+            if (ref.getItem() instanceof ItemBlock)
-                if(ref.getItem() == blockItem)
+                if (ref.getItem() == blockItem)
                     return i;
         }
         return -1;

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

@@ -118,16 +118,13 @@ public class RandomizerBagContainer extends Container {
     /**
      * Callback for when the crafting gui is closed.
      */
-//    @Override
+    @Override
-//    public void onContainerClosed(EntityPlayer player)
+    public void onContainerClosed(EntityPlayer player)
-//    {
+    {
-//        if(player.inventory.getItemStack() != null)
+        super.onContainerClosed(player);
-//        {
+        if(!player.world.isRemote)
-//            player.entityDropItem(player.inventory.getItemStack(), 0.5f);
+        {
-//        }
+            detectAndSendChanges();
-//        if(!player.world.isRemote)
+        }
-//        {
+    }
-//            detectAndSendChanges();
-//        }
-//    }
 }

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

@@ -26,6 +26,7 @@ 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
@@ -39,7 +40,7 @@ public class RadialMenu extends GuiScreen {
     private float visibility = 0.0f;
     private Stopwatch lastChange = Stopwatch.createStarted();
     public BuildModeEnum switchTo = null;
-    public ModeOptions.ActionEnum doAction = null;
+    public ActionEnum doAction = null;
     public boolean actionUsed = false;
 
     private float clampVis(final float f) {
@@ -77,11 +78,11 @@ public class RadialMenu extends GuiScreen {
         public double y1, y2;
         public boolean highlighted;
 
-        public final ModeOptions.ActionEnum action;
+        public final ActionEnum action;
         public String name;
         public EnumFacing textSide;
 
-        public MenuButton(final String name, final ModeOptions.ActionEnum action, final double x, final double y,
+        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;
@@ -138,10 +139,10 @@ public class RadialMenu extends GuiScreen {
         final double mouseYCenter = mouseY - middleY;
         double mouseRadians = Math.atan2(mouseYCenter, mouseXCenter);
 
-        final double ringInnerEdge = 20;
+        final double ringInnerEdge = 30;
-        final double ringOuterEdge = 50;
+        final double ringOuterEdge = 65;
-        final double textDistance = 60;
+        final double textDistance = 75;
-        final double buttonDistance = 90;
+        final double buttonDistance = 105;
         final double quarterCircle = Math.PI / 2.0;
 
         if ( mouseRadians < -quarterCircle ) {
@@ -157,16 +158,18 @@ public class RadialMenu extends GuiScreen {
         }
 
         //Add actions
-        buttons.add(new MenuButton(ModeOptions.ActionEnum.UNDO.name, ModeOptions.ActionEnum.UNDO, -buttonDistance - 26, -13, EnumFacing.UP));
+        buttons.add(new MenuButton(ActionEnum.UNDO.name, ActionEnum.UNDO, -buttonDistance - 26, -13, EnumFacing.UP));
-        buttons.add(new MenuButton(ModeOptions.ActionEnum.REDO.name, ModeOptions.ActionEnum.REDO, -buttonDistance, -13, EnumFacing.UP));
+        buttons.add(new MenuButton(ActionEnum.REDO.name, ActionEnum.REDO, -buttonDistance, -13, EnumFacing.UP));
-        buttons.add(new MenuButton(ModeOptions.ActionEnum.OPEN_MODIFIER_SETTINGS.name, ModeOptions.ActionEnum.OPEN_MODIFIER_SETTINGS, -buttonDistance - 26, 13, EnumFacing.DOWN));
+        buttons.add(new MenuButton(ActionEnum.OPEN_MODIFIER_SETTINGS.name, ActionEnum.OPEN_MODIFIER_SETTINGS, -buttonDistance - 26, 13, EnumFacing.DOWN));
-        buttons.add(new MenuButton(ModeOptions.ActionEnum.REPLACE.name, ModeOptions.ActionEnum.REPLACE, -buttonDistance, 13, EnumFacing.DOWN));
+        buttons.add(new MenuButton(ActionEnum.REPLACE.name, ActionEnum.REPLACE, -buttonDistance, 13, EnumFacing.DOWN));
 
         //Add buildmode dependent options
-        ModeOptions.ActionEnum[] options = currentBuildMode.options;
+        OptionEnum[] options = currentBuildMode.options;
         for (int i = 0; i < options.length; i++) {
-            ModeOptions.ActionEnum action = options[i];
+            for (int j = 0; j < options[i].actions.length; j++) {
-            buttons.add(new MenuButton(action.name, action, buttonDistance + i * 26, -13, EnumFacing.DOWN));
+                ActionEnum action = options[i].actions[j];
+                buttons.add(new MenuButton(action.name, action, buttonDistance + j * 26, -13 + i * 39, EnumFacing.DOWN));
+            }
         }
 
         switchTo = null;
@@ -245,11 +248,12 @@ public class RadialMenu extends GuiScreen {
             float a = 0.5f;
 
             //highlight when active option
-            if (btn.action == ModeOptions.getBuildSpeed() ||
+            if (btn.action == getBuildSpeed() ||
-                btn.action == ModeOptions.getFill() ||
+                btn.action == getFill() ||
-                btn.action == ModeOptions.getCubeFill() ||
+                btn.action == getCubeFill() ||
-                btn.action == ModeOptions.getRaisedEdge() ||
+                btn.action == getRaisedEdge() ||
-                btn.action == ModeOptions.getLineThickness()) {
+                btn.action == getLineThickness() ||
+                btn.action == getCircleStart()) {
                 r = 0.0f;
                 g = 0.5f;
                 b = 1f;
@@ -342,32 +346,12 @@ public class RadialMenu extends GuiScreen {
 
         //Draw strings
         //fontRenderer.drawStringWithShadow("Actions", (int) (middleX - buttonDistance - 13) - fontRenderer.getStringWidth("Actions") * 0.5f, (int) middleY - 38, 0xffffffff);
-        String title = "";
+
-        if (currentBuildMode.options.length > 0) {
+        //Draw option strings
-            switch (currentBuildMode.options[0]) {
+        for (int i = 0; i < currentBuildMode.options.length; i++) {
-                case NORMAL_SPEED:
+            OptionEnum option = options[i];
-                case FAST_SPEED:
+            fontRenderer.drawStringWithShadow(I18n.format(option.name), (int) (middleX + buttonDistance - 9), (int) middleY - 37 + i * 39, 0xeeeeeeff);
-                    title = I18n.format("effortlessbuilding.action.build_speed");
-                    break;
-                case FULL:
-                case HOLLOW:
-                case CUBE_FULL:
-                case CUBE_HOLLOW:
-                case CUBE_SKELETON:
-                    title = I18n.format("effortlessbuilding.action.filling");
-                    break;
-                case SHORT_EDGE:
-                case LONG_EDGE:
-                    title = I18n.format("effortlessbuilding.action.raised_edge");
-                    break;
-                case THICKNESS_1:
-                case THICKNESS_3:
-                case THICKNESS_5:
-                    title = I18n.format("effortlessbuilding.action.thickness");
-                    break;
-            }
         }
-        fontRenderer.drawStringWithShadow(title, (int) (middleX + buttonDistance - 9), (int) middleY - 37, 0xeeeeeeff);
 
         String credits = "Effortless Building";
         fontRenderer.drawStringWithShadow(credits, width - fontRenderer.getStringWidth(credits) - 4, height - 10, 0x88888888);
@@ -402,18 +386,26 @@ public class RadialMenu extends GuiScreen {
                 String keybindFormatted = "";
 
                 //Add keybind in brackets
-                if (button.action == ModeOptions.ActionEnum.UNDO) {
+                if (button.action == ActionEnum.UNDO) {
                     keybind = ClientProxy.keyBindings[4].getDisplayName();
                 }
-                if (button.action == ModeOptions.ActionEnum.REDO) {
+                if (button.action == ActionEnum.REDO) {
                     keybind = ClientProxy.keyBindings[5].getDisplayName();
                 }
-                if (button.action == ModeOptions.ActionEnum.REPLACE) {
+                if (button.action == ActionEnum.REPLACE) {
                     keybind = ClientProxy.keyBindings[1].getDisplayName();
                 }
-                if (button.action == ModeOptions.ActionEnum.OPEN_MODIFIER_SETTINGS) {
+                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) {

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

@@ -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;

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

@@ -28,12 +28,20 @@ public class ReachHelper {
 
     public static int getMaxBlocksPlacedAtOnce(EntityPlayer player) {
         if (player.isCreative()) return 1000000;
-        return getMaxReach(player) * 5;
+        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(MathHelper.sqrt(getMaxReach(player)));
+        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) {

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

@@ -71,7 +71,7 @@ public class SurvivalHelper {
             }
 
             if (!player.isCreative() && Block.getBlockFromItem(itemstack.getItem()) == block) {
-                CompatHelper.shrinkStack(origstack, itemstack);
+                CompatHelper.shrinkStack(origstack, itemstack, player);
             }
 
             return true;

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

@@ -20,6 +20,9 @@ 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;
 
@@ -52,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);

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/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/RequestLookAtMessage.java

@@ -22,48 +22,28 @@ import java.util.ArrayList;
  * This is then sent back with a BlockPlacedMessage.
  */
 public class RequestLookAtMessage implements IMessage {
-    private BlockPos coordinate;
+    private boolean placeStartPos;
-    private IBlockState previousBlockState;
-    private IBlockState newBlockState;
 
     public RequestLookAtMessage() {
-        coordinate = BlockPos.ORIGIN;
+        placeStartPos = false;
-        previousBlockState = null;
-        newBlockState = null;
     }
 
-    public RequestLookAtMessage(BlockPos coordinate, IBlockState previousBlockState, IBlockState newBlockState) {
+    public RequestLookAtMessage(boolean placeStartPos) {
-        this.coordinate = coordinate;
+        this.placeStartPos = placeStartPos;
-        this.previousBlockState = previousBlockState;
-        this.newBlockState = newBlockState;
     }
 
-    public BlockPos getCoordinate() {
+    public boolean getPlaceStartPos() {
-        return coordinate;
+        return placeStartPos;
-    }
-
-    public IBlockState getPreviousBlockState() {
-        return previousBlockState;
-    }
-
-    public IBlockState getNewBlockState() {
-        return newBlockState;
     }
 
     @Override
     public void toBytes(ByteBuf buf) {
-        buf.writeInt(this.coordinate.getX());
+        buf.writeBoolean(this.placeStartPos);
-        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());
+        placeStartPos = buf.readBoolean();
-        previousBlockState = Block.getStateById(buf.readInt());
-        newBlockState = Block.getStateById(buf.readInt());
     }
 
     // The params of the IMessageHandler are <REQ, REPLY>
@@ -78,20 +58,14 @@ public class RequestLookAtMessage implements IMessage {
                 //Received clientside
                 //Send back your info
 
-                EffortlessBuilding.proxy.getThreadListenerFromContext(ctx).addScheduledTask(() -> {
+//                EffortlessBuilding.proxy.getThreadListenerFromContext(ctx).addScheduledTask(() -> {
-                    EntityPlayer player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
+//                    EntityPlayer player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
+//
+//                });
 
-                    //Add to undo stack clientside
+                //Prevent double placing in normal mode with placeStartPos false.
-                    UndoRedo.addUndo(player, new BlockSet(
+                //Unless QuickReplace is on, then we do need to place start pos.
-                            new ArrayList<BlockPos>() {{add(message.getCoordinate());}},
+                return new BlockPlacedMessage(ClientProxy.previousLookAt, message.getPlaceStartPos());
-                            new ArrayList<IBlockState>() {{add(message.getPreviousBlockState());}},
-                            new ArrayList<IBlockState>() {{add(message.getNewBlockState());}},
-                            new Vec3d(0,0,0),
-                            message.getCoordinate(), message.getCoordinate()));
-                });
-
-                //Prevent double placing in normal mode with placeStartPos false
-                return new BlockPlacedMessage(ClientProxy.previousLookAt, false);
             }
             return null;
         }

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

@@ -9,6 +9,7 @@ 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;
@@ -80,7 +81,7 @@ public class ClientProxy implements IProxy {
     @Override
     public void init(FMLInitializationEvent event) {
         // register key bindings
-        keyBindings = new KeyBinding[6];
+        keyBindings = new KeyBinding[7];
 
         // instantiate the key bindings
         keyBindings[0] = new KeyBinding("key.effortlessbuilding.hud.desc", KeyConflictContext.UNIVERSAL, Keyboard.KEY_ADD, "key.effortlessbuilding.category");
@@ -96,7 +97,8 @@ public class ClientProxy implements IProxy {
         };
         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("Reload shaders", Keyboard.KEY_TAB, "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) {
@@ -260,8 +262,14 @@ public class ClientProxy implements IProxy {
             //Break block in distance in creative (or survival if enabled in config)
             if (breakCooldown <= 0) {
                 breakCooldown = 4;
-                RayTraceResult lookingAt = getLookingAt(player);
 
+                //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));
 
@@ -278,6 +286,7 @@ public class ClientProxy implements IProxy {
                 }
             } else if (buildMode == BuildModes.BuildModeEnum.NORMAL_PLUS) {
                 breakCooldown--;
+                if (ModeOptions.getBuildSpeed() == ModeOptions.ActionEnum.FAST_SPEED) breakCooldown = 0;
             }
 
             //EffortlessBuilding.packetHandler.sendToServer(new CancelModeMessage());
@@ -301,16 +310,7 @@ public class ClientProxy implements IProxy {
         //Remember to send packet to server if necessary
         //Show Modifier Settings GUI
         if (keyBindings[0].isPressed()) {
-            //Disabled if max reach is 0, might be set in the config that way.
+            openModifierSettings();
-            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 (Minecraft.getMinecraft().currentScreen == null) {
-                    Minecraft.getMinecraft().displayGuiScreen(new ModifierSettingsGui());
-                } else {
-                    player.closeScreen();
-                }
-            }
         }
 
         //QuickReplace toggle
@@ -345,14 +345,50 @@ public class ClientProxy implements IProxy {
             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 >= 7 && keyBindings[6].isPressed()) {
+        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;
@@ -374,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

@@ -72,7 +72,8 @@ public class BlockPreviewRenderer {
 
     private static List<PlacedData> placedDataList = new ArrayList<>();
 
-    private static final int secondaryTextureUnit = 7;
+    private static final int primaryTextureUnit = 0;
+    private static final int secondaryTextureUnit = 2;
 
     public static void render(EntityPlayer player, ModifierSettings modifierSettings, ModeSettings modeSettings) {
 
@@ -194,13 +195,15 @@ public class BlockPreviewRenderer {
                     //if so, renew randomness of randomizer bag
                     ItemRandomizerBag.renewRandomness();
                     //and play sound (max once every tick)
-                    if (startCoordinates.size() > 1 && blockStates.size() > 1 && soundTime < ClientProxy.ticksInGame - 0) {
+                    if (newCoordinates.size() > 1 && blockStates.size() > 1 && soundTime < ClientProxy.ticksInGame - 0) {
                         soundTime = ClientProxy.ticksInGame;
 
-                        SoundType soundType = blockStates.get(0).getBlock().getSoundType(blockStates.get(0), player.world,
+                        if (blockStates.get(0) != null) {
-                                newCoordinates.get(0), player);
+                            SoundType soundType = blockStates.get(0).getBlock().getSoundType(blockStates.get(0), player.world,
-                        player.world.playSound(player, player.getPosition(), breaking ? soundType.getBreakSound() : soundType.getPlaceSound(),
+                                    newCoordinates.get(0), player);
-                                SoundCategory.BLOCKS, 0.3f, 0.8f);
+                            player.world.playSound(player, player.getPosition(), breaking ? soundType.getBreakSound() : soundType.getPlaceSound(),
+                                    SoundCategory.BLOCKS, 0.3f, 0.8f);
+                        }
                     }
                 }
 
@@ -235,8 +238,20 @@ public class BlockPreviewRenderer {
 
                     //Display block count and dimensions in actionbar
                     if (BuildModes.isActive(player)) {
-                        BlockPos dim = secondPos.subtract(firstPos);
+
-                        dim = new BlockPos(Math.abs(dim.getX()) + 1, Math.abs(dim.getY()) + 1, Math.abs(dim.getZ()) + 1);
+                        //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";
@@ -381,20 +396,18 @@ public class BlockPreviewRenderer {
             int imageUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "image");
             int maskUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "mask");
 
-            //image
-            OpenGlHelper.setActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB);
-            GL11.glBindTexture(GL11.GL_TEXTURE_2D, mc.renderEngine.getTexture(TextureMap.LOCATION_BLOCKS_TEXTURE).getGlTextureId());
-            ARBShaderObjects.glUniform1iARB(imageUniform, 0);
-
-            OpenGlHelper.setActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + secondaryTextureUnit);
-
             GlStateManager.enableTexture2D();
             GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D);
 
             //mask
-            GL11.glBindTexture(GL11.GL_TEXTURE_2D,
-                    mc.renderEngine.getTexture(new ResourceLocation(EffortlessBuilding.MODID, "textures/shader_mask.png")).getGlTextureId());
             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);

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

@@ -185,8 +185,8 @@ public class RenderHandler implements IWorldEventListener {
         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(TextureMap.LOCATION_BLOCKS_TEXTURE);
-        Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(EffortlessBuilding.MODID, "textures/shader_mask.png"));
+        Minecraft.getMinecraft().renderEngine.bindTexture(ShaderHandler.shaderMaskTextureLocation);
 
         GlStateManager.enableBlend();
         GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
@@ -196,6 +196,7 @@ public class RenderHandler implements IWorldEventListener {
     protected static void endBlockPreviews() {
         ShaderHandler.releaseShader();
         GlStateManager.disableBlend();
+
         GL11.glPopAttrib();
     }
 
@@ -205,6 +206,8 @@ public class RenderHandler implements IWorldEventListener {
     }
 
     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);

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

@@ -13,6 +13,7 @@
 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;
@@ -39,6 +40,8 @@ public final class ShaderHandler {
     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;

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

@@ -2,9 +2,10 @@ key.effortlessbuilding.category=Effortless Building
 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 (C&B compatible)
+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
@@ -20,6 +21,9 @@ 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
@@ -30,6 +34,7 @@ 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
@@ -41,5 +46,7 @@ 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

@@ -31,9 +31,7 @@ void main() {
         float placeFromFirst = length(worldpos - firstposc) / firstToSecond;
         float placeFromSecond = length(worldpos - secondposc) / firstToSecond;
         place = (placeFromFirst + (1.0 - placeFromSecond)) / 2.0;
-    } else {
+    } //else only one block
-        //only one block
-    }
 
     //find 2d texture coordinate for noise texture based on world position
     vec2 maskcoord = vec2(worldpos.y, worldpos.z);
@@ -80,8 +78,8 @@ void main() {
 //    color.rgb += vec3(0.5 - smoothstep(0, 0.5, distToEdge)) * 0.5;
 
     //add flat shading
-    if (abs(normal.x) > 0.5)
+//    if (abs(normal.x) > 0.5)
-        color.rgb -= 0.0;
+//        color.rgb -= 0.0;
     if (abs(normal.y) > 0.5)
         color.rgb += 0.05;
     if (abs(normal.z) > 0.5)