From 420b06d41423d8757c562c99994236c53f972f8a Mon Sep 17 00:00:00 2001
From: Christian <christianknaapen@hotmail.com>
Date: Sun, 29 Jan 2023 23:57:47 +0100
Subject: [PATCH] Modifier settings GUI for array and mirror, with header.

New parts in modifiers gui texture.
Added reordering modifiers.
Replaced all icon rendering with AllIcons class.
Delayed blockset placing in server.
Modifiers now work when buildmode is DISABLED.
Modifiers now work with breaking when buildmode would break a single block.
Modifiers screen renders tooltip on top of everything.
New labeledScrollInput class, extension of Create's ScrollInput.
BlockPreviews ignores config settings to hide itself when placing more than 1 block.
Fixed mirroring wrong horizontal axis.
---
 .../effortlessbuilding/AllGuiTextures.java    |  11 +-
 .../effortlessbuilding/ClientEvents.java      |   1 -
 .../effortlessbuilding/CommonEvents.java      |   6 +-
 .../EffortlessBuilding.java                   |   2 -
 .../buildmode/BuildModeEnum.java              |  29 ++-
 .../buildmode/ModeOptions.java                |  65 +++--
 .../buildmodifier/Array.java                  |   1 +
 .../buildmodifier/BuildModifiers.java         |  23 --
 .../buildmodifier/Mirror.java                 |  34 +++
 .../buildmodifier/RadialMirror.java           |   2 +
 .../foundation/gui/AbstractSimiScreen.java    |   7 +
 .../foundation/gui/widget/ScrollInput.java    |   3 +-
 .../foundation/utility/outliner/Outliner.java |   2 +-
 .../gui/buildmode/RadialMenu.java             |  15 +-
 .../gui/buildmodifier/ArrayEntry.java         |  79 ++----
 .../gui/buildmodifier/BaseModifierEntry.java  |  86 +++++--
 .../gui/buildmodifier/MirrorEntry.java        | 235 ++++++++++++++++--
 .../gui/buildmodifier/ModifiersScreen.java    |  40 ++-
 .../buildmodifier/ModifiersScreenList.java    |  30 ++-
 .../gui/elements/LabeledScrollInput.java      |  49 ++++
 .../gui/elements/MiniButton.java              |  19 ++
 .../network/ServerPlaceBlocksPacket.java      |  12 +-
 .../render/BlockPreviews.java                 |  10 +-
 .../systems/BuilderChain.java                 |  11 +-
 .../systems/DelayedBlockPlacer.java           | 104 --------
 .../systems/ServerBlockPlacer.java            |  40 ++-
 .../utilities/BlockEntry.java                 |   7 +-
 .../utilities/BlockSet.java                   |  16 +-
 .../utilities/MathHelper.java                 |  19 ++
 .../utilities/ReachHelper.java                |   4 +
 .../assets/effortlessbuilding/lang/en_us.json |   3 +-
 .../textures/gui/modifiers.png                | Bin 2405 -> 8154 bytes
 32 files changed, 651 insertions(+), 314 deletions(-)
 create mode 100644 src/main/java/nl/requios/effortlessbuilding/gui/elements/LabeledScrollInput.java
 create mode 100644 src/main/java/nl/requios/effortlessbuilding/gui/elements/MiniButton.java
 delete mode 100644 src/main/java/nl/requios/effortlessbuilding/systems/DelayedBlockPlacer.java

diff --git a/src/main/java/nl/requios/effortlessbuilding/AllGuiTextures.java b/src/main/java/nl/requios/effortlessbuilding/AllGuiTextures.java
index 3843a43..10f40b4 100644
--- a/src/main/java/nl/requios/effortlessbuilding/AllGuiTextures.java
+++ b/src/main/java/nl/requios/effortlessbuilding/AllGuiTextures.java
@@ -11,9 +11,14 @@ import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement
 import nl.requios.effortlessbuilding.create.foundation.utility.Color;
 
 public enum AllGuiTextures implements ScreenElement {
-    ARRAY_ENTRY("modifiers", 256, 60),
-    MIRROR_ENTRY("modifiers", 0, 60, 256, 60),
-    RADIAL_MIRROR_ENTRY("modifiers", 0, 120, 256, 60),
+    ARRAY_ENTRY("modifiers", 226, 60),
+    MIRROR_ENTRY("modifiers", 0, 60, 226, 60),
+    RADIAL_MIRROR_ENTRY("modifiers", 0, 120, 226, 60),
+    ENABLE_BUTTON_BACKGROUND("modifiers", 234, 0, 9, 9),
+    CHECKMARK("modifiers", 243, 0, 10, 9),
+    ARROW_UP("modifiers", 234, 9, 9, 9),
+    ARROW_DOWN("modifiers", 243, 9, 9, 9),
+    TRASH("modifiers", 234, 18, 9, 9),
     ;
     public final ResourceLocation location;
     public int width, height;
diff --git a/src/main/java/nl/requios/effortlessbuilding/ClientEvents.java b/src/main/java/nl/requios/effortlessbuilding/ClientEvents.java
index e2eaf8c..f72be3b 100644
--- a/src/main/java/nl/requios/effortlessbuilding/ClientEvents.java
+++ b/src/main/java/nl/requios/effortlessbuilding/ClientEvents.java
@@ -91,7 +91,6 @@ public class ClientEvents {
         BuildModeEnum buildMode = EffortlessBuildingClient.BUILD_MODES.getBuildMode();
 
         if (mc.screen != null ||
-            buildMode == BuildModeEnum.DISABLED ||
             RadialMenu.instance.isVisible()) {
             return;
         }
diff --git a/src/main/java/nl/requios/effortlessbuilding/CommonEvents.java b/src/main/java/nl/requios/effortlessbuilding/CommonEvents.java
index 5f2d84e..4318d0e 100644
--- a/src/main/java/nl/requios/effortlessbuilding/CommonEvents.java
+++ b/src/main/java/nl/requios/effortlessbuilding/CommonEvents.java
@@ -13,6 +13,7 @@ import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.event.level.BlockEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.LogicalSide;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 import nl.requios.effortlessbuilding.systems.UndoRedo;
 import nl.requios.effortlessbuilding.compatibility.CompatHelper;
@@ -32,8 +33,9 @@ public class CommonEvents {
 	@SubscribeEvent
 	public static void onTick(TickEvent.LevelTickEvent event) {
 		if (event.phase != TickEvent.Phase.START) return;
+		if (event.side == LogicalSide.CLIENT) return;
 
-		EffortlessBuilding.DELAYED_BLOCK_PLACER.tick();
+		EffortlessBuilding.SERVER_BLOCK_PLACER.tick();
 	}
 
 	//Cancel event if necessary. Nothing more, rest is handled on mouseclick
@@ -128,4 +130,4 @@ public class CommonEvents {
 
 		//TODO disable build mode and modifiers?
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java b/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java
index 0bc7b3c..42c782d 100644
--- a/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java
+++ b/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java
@@ -22,7 +22,6 @@ import nl.requios.effortlessbuilding.compatibility.CompatHelper;
 import nl.requios.effortlessbuilding.gui.DiamondRandomizerBagContainer;
 import nl.requios.effortlessbuilding.gui.GoldenRandomizerBagContainer;
 import nl.requios.effortlessbuilding.gui.RandomizerBagContainer;
-import nl.requios.effortlessbuilding.systems.DelayedBlockPlacer;
 import nl.requios.effortlessbuilding.item.*;
 import nl.requios.effortlessbuilding.network.PacketHandler;
 import nl.requios.effortlessbuilding.proxy.ClientProxy;
@@ -42,7 +41,6 @@ public class EffortlessBuilding {
 	public static IProxy proxy = DistExecutor.unsafeRunForDist(() -> ClientProxy::new, () -> ServerProxy::new);
 
 	public static final ServerBlockPlacer SERVER_BLOCK_PLACER = new ServerBlockPlacer();
-	public static final DelayedBlockPlacer DELAYED_BLOCK_PLACER = new DelayedBlockPlacer();
 
 	//Registration
 	private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModeEnum.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModeEnum.java
index 859f31a..0dabaf5 100644
--- a/src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModeEnum.java
+++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModeEnum.java
@@ -1,20 +1,21 @@
 package nl.requios.effortlessbuilding.buildmode;
 
+import nl.requios.effortlessbuilding.AllIcons;
 import nl.requios.effortlessbuilding.buildmode.buildmodes.*;
 
 public enum BuildModeEnum {
-    DISABLED("normal", new Disabled(), BuildModeCategoryEnum.BASIC),
-    SINGLE("normal_plus", new Single(), BuildModeCategoryEnum.BASIC, ModeOptions.OptionEnum.BUILD_SPEED),
-    LINE("line", new Line(), BuildModeCategoryEnum.BASIC /*, OptionEnum.THICKNESS*/),
-    WALL("wall", new Wall(), BuildModeCategoryEnum.BASIC, ModeOptions.OptionEnum.FILL),
-    FLOOR("floor", new Floor(), BuildModeCategoryEnum.BASIC, ModeOptions.OptionEnum.FILL),
-    CUBE("cube", new Cube(), BuildModeCategoryEnum.BASIC, ModeOptions.OptionEnum.CUBE_FILL),
-    DIAGONAL_LINE("diagonal_line", new DiagonalLine(), BuildModeCategoryEnum.DIAGONAL /*, OptionEnum.THICKNESS*/),
-    DIAGONAL_WALL("diagonal_wall", new DiagonalWall(), BuildModeCategoryEnum.DIAGONAL /*, OptionEnum.FILL*/),
-    SLOPE_FLOOR("slope_floor", new SlopeFloor(), BuildModeCategoryEnum.DIAGONAL, ModeOptions.OptionEnum.RAISED_EDGE),
-    CIRCLE("circle", new Circle(), BuildModeCategoryEnum.CIRCULAR, ModeOptions.OptionEnum.CIRCLE_START, ModeOptions.OptionEnum.FILL),
-    CYLINDER("cylinder", new Cylinder(), BuildModeCategoryEnum.CIRCULAR, ModeOptions.OptionEnum.CIRCLE_START, ModeOptions.OptionEnum.FILL),
-    SPHERE("sphere", new Sphere(), BuildModeCategoryEnum.CIRCULAR, ModeOptions.OptionEnum.CIRCLE_START, ModeOptions.OptionEnum.FILL);
+    DISABLED("normal", new Disabled(), BuildModeCategoryEnum.BASIC, AllIcons.I_DISABLE),
+    SINGLE("normal_plus", new Single(), BuildModeCategoryEnum.BASIC, AllIcons.I_SINGLE, ModeOptions.OptionEnum.BUILD_SPEED),
+    LINE("line", new Line(), BuildModeCategoryEnum.BASIC, AllIcons.I_LINE /*, OptionEnum.THICKNESS*/),
+    WALL("wall", new Wall(), BuildModeCategoryEnum.BASIC, AllIcons.I_WALL, ModeOptions.OptionEnum.FILL),
+    FLOOR("floor", new Floor(), BuildModeCategoryEnum.BASIC, AllIcons.I_FLOOR, ModeOptions.OptionEnum.FILL),
+    CUBE("cube", new Cube(), BuildModeCategoryEnum.BASIC, AllIcons.I_CUBE, ModeOptions.OptionEnum.CUBE_FILL),
+    DIAGONAL_LINE("diagonal_line", new DiagonalLine(), BuildModeCategoryEnum.DIAGONAL, AllIcons.I_DIAGONAL_LINE /*, OptionEnum.THICKNESS*/),
+    DIAGONAL_WALL("diagonal_wall", new DiagonalWall(), BuildModeCategoryEnum.DIAGONAL, AllIcons.I_DIAGONAL_WALL /*, OptionEnum.FILL*/),
+    SLOPE_FLOOR("slope_floor", new SlopeFloor(), BuildModeCategoryEnum.DIAGONAL, AllIcons.I_SLOPED_FLOOR, ModeOptions.OptionEnum.RAISED_EDGE),
+    CIRCLE("circle", new Circle(), BuildModeCategoryEnum.CIRCULAR, AllIcons.I_CIRCLE, ModeOptions.OptionEnum.CIRCLE_START, ModeOptions.OptionEnum.FILL),
+    CYLINDER("cylinder", new Cylinder(), BuildModeCategoryEnum.CIRCULAR, AllIcons.I_CYLINDER, ModeOptions.OptionEnum.CIRCLE_START, ModeOptions.OptionEnum.FILL),
+    SPHERE("sphere", new Sphere(), BuildModeCategoryEnum.CIRCULAR, AllIcons.I_SPHERE, ModeOptions.OptionEnum.CIRCLE_START, ModeOptions.OptionEnum.FILL);
 //		PYRAMID("pyramid", new Pyramid(), BuildModeCategoryEnum.ROOF),
 //		CONE("cone", new Cone(), BuildModeCategoryEnum.ROOF),
 //		DOME("dome", new Dome(), BuildModeCategoryEnum.ROOF);
@@ -22,12 +23,14 @@ public enum BuildModeEnum {
     private final String name;
     public final IBuildMode instance;
     public final BuildModeCategoryEnum category;
+    public final AllIcons icon;
     public final ModeOptions.OptionEnum[] options;
 
-    BuildModeEnum(String name, IBuildMode instance, BuildModeCategoryEnum category, ModeOptions.OptionEnum... options) {
+    BuildModeEnum(String name, IBuildMode instance, BuildModeCategoryEnum category, AllIcons icon, ModeOptions.OptionEnum... options) {
         this.name = name;
         this.instance = instance;
         this.category = category;
+        this.icon = icon;
         this.options = options;
     }
 
diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/ModeOptions.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/ModeOptions.java
index 1142b86..a7ccc6c 100644
--- a/src/main/java/nl/requios/effortlessbuilding/buildmode/ModeOptions.java
+++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/ModeOptions.java
@@ -3,6 +3,7 @@ package nl.requios.effortlessbuilding.buildmode;
 import net.minecraft.world.entity.player.Player;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import nl.requios.effortlessbuilding.AllIcons;
 import nl.requios.effortlessbuilding.ClientEvents;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.EffortlessBuildingClient;
@@ -104,46 +105,60 @@ public class ModeOptions {
 			action != ActionEnum.OPEN_MODIFIER_SETTINGS &&
 			action != ActionEnum.OPEN_PLAYER_SETTINGS) {
 
-			EffortlessBuilding.logTranslate(player, "", action.name, "", true);
+			EffortlessBuilding.logTranslate(player, "", action.getNameKey(), "", true);
 		}
 	}
 
 	public enum ActionEnum {
-		UNDO("effortlessbuilding.action.undo"),
-		REDO("effortlessbuilding.action.redo"),
-		OPEN_MODIFIER_SETTINGS("effortlessbuilding.action.open_modifier_settings"),
-		OPEN_PLAYER_SETTINGS("effortlessbuilding.action.open_player_settings"),
+		UNDO("undo", AllIcons.I_UNDO),
+		REDO("redo", AllIcons.I_REDO),
+		OPEN_MODIFIER_SETTINGS("open_modifier_settings", AllIcons.I_SETTINGS),
+		OPEN_PLAYER_SETTINGS("open_player_settings", AllIcons.I_SETTINGS),
 
-		REPLACE_ONLY_AIR("effortlessbuilding.action.replace_only_air"),
-		REPLACE_BLOCKS_AND_AIR("effortlessbuilding.action.replace_blocks_and_air"),
-		REPLACE_ONLY_BLOCKS("effortlessbuilding.action.replace_only_blocks"),
-		REPLACE_FILTERED_BY_OFFHAND("effortlessbuilding.action.replace_filtered_by_offhand"),
-		TOGGLE_PROTECT_TILE_ENTITIES("effortlessbuilding.action.toggle_protect_tile_entities"),
+		REPLACE_ONLY_AIR("replace_only_air", AllIcons.I_REPLACE),
+		REPLACE_BLOCKS_AND_AIR("replace_blocks_and_air", AllIcons.I_REPLACE),
+		REPLACE_ONLY_BLOCKS("replace_only_blocks", AllIcons.I_REPLACE),
+		REPLACE_FILTERED_BY_OFFHAND("replace_filtered_by_offhand", AllIcons.I_REPLACE),
+		TOGGLE_PROTECT_TILE_ENTITIES("toggle_protect_tile_entities", AllIcons.I_REPLACE),
 
-		NORMAL_SPEED("effortlessbuilding.action.normal_speed"),
-		FAST_SPEED("effortlessbuilding.action.fast_speed"),
+		NORMAL_SPEED("normal_speed", AllIcons.I_NORMAL_SPEED),
+		FAST_SPEED("fast_speed", AllIcons.I_FAST_SPEED),
 
-		FULL("effortlessbuilding.action.full"),
-		HOLLOW("effortlessbuilding.action.hollow"),
+		FULL("full", AllIcons.I_FILLED),
+		HOLLOW("hollow", AllIcons.I_HOLLOW),
 
-		CUBE_FULL("effortlessbuilding.action.full"),
-		CUBE_HOLLOW("effortlessbuilding.action.hollow"),
-		CUBE_SKELETON("effortlessbuilding.action.skeleton"),
+		CUBE_FULL("full", AllIcons.I_CUBE_FILLED),
+		CUBE_HOLLOW("hollow", AllIcons.I_CUBE_HOLLOW),
+		CUBE_SKELETON("skeleton", AllIcons.I_CUBE_SKELETON),
 
-		SHORT_EDGE("effortlessbuilding.action.short_edge"),
-		LONG_EDGE("effortlessbuilding.action.long_edge"),
+		SHORT_EDGE("short_edge", AllIcons.I_SHORT_EDGE),
+		LONG_EDGE("long_edge", AllIcons.I_LONG_EDGE),
 
-		THICKNESS_1("effortlessbuilding.action.thickness_1"),
-		THICKNESS_3("effortlessbuilding.action.thickness_3"),
-		THICKNESS_5("effortlessbuilding.action.thickness_5"),
+		THICKNESS_1("thickness_1", AllIcons.I_THICKNESS_1),
+		THICKNESS_3("thickness_3", AllIcons.I_THICKNESS_3),
+		THICKNESS_5("thickness_5", AllIcons.I_THICKNESS_5),
 
-		CIRCLE_START_CORNER("effortlessbuilding.action.start_corner"),
-		CIRCLE_START_CENTER("effortlessbuilding.action.start_center");
+		CIRCLE_START_CORNER("start_corner", AllIcons.I_CIRCLE_START_CORNER),
+		CIRCLE_START_CENTER("start_center", AllIcons.I_CIRCLE_START_CENTER);
 
 		public String name;
+		public AllIcons icon;
 
-		ActionEnum(String name) {
+		ActionEnum(String name, AllIcons icon) {
 			this.name = name;
+			this.icon = icon;
+		}
+		
+		public String getName() {
+			return name;
+		}
+		
+		public String getNameKey() {
+			return "effortlessbuilding.action." + name;
+		}
+		
+		public String getDescriptionKey() {
+			return "effortlessbuilding.action." + name + ".description";
 		}
 	}
 
diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Array.java b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Array.java
index dda4fb3..8e2377b 100644
--- a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Array.java
+++ b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Array.java
@@ -37,6 +37,7 @@ public class Array extends BaseModifier {
 
 				var newBlockEntry = new BlockEntry(pos);
 				newBlockEntry.copyRotationSettingsFrom(blockEntry);
+				blocks.add(newBlockEntry);
 			}
 		}
 	}
diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/BuildModifiers.java b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/BuildModifiers.java
index 32dc5d1..ee9a3b7 100644
--- a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/BuildModifiers.java
+++ b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/BuildModifiers.java
@@ -1,33 +1,10 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtUtils;
 import net.minecraft.nbt.Tag;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.context.BlockPlaceContext;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.context.UseOnContext;
-import net.minecraft.core.Direction;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.level.Level;
-import nl.requios.effortlessbuilding.CommonConfig;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.compatibility.CompatHelper;
 import nl.requios.effortlessbuilding.create.foundation.utility.NBTHelper;
-import nl.requios.effortlessbuilding.systems.DelayedBlockPlacer;
-import nl.requios.effortlessbuilding.systems.UndoRedo;
 import nl.requios.effortlessbuilding.utilities.BlockSet;
-import nl.requios.effortlessbuilding.utilities.ReachHelper;
-import nl.requios.effortlessbuilding.utilities.SurvivalHelper;
-import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
-import nl.requios.effortlessbuilding.utilities.UndoRedoBlockSet;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Mirror.java b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Mirror.java
index f5db9ef..5561f1a 100644
--- a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Mirror.java
+++ b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Mirror.java
@@ -1,5 +1,6 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
+import net.minecraft.client.Minecraft;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtUtils;
 import net.minecraft.nbt.Tag;
@@ -19,6 +20,13 @@ public class Mirror extends BaseModifier {
 	public boolean drawLines = true;
 	public boolean drawPlanes = true;
 	
+	public Mirror() {
+		super();
+		var player = Minecraft.getInstance().player;
+		if (player != null)
+			position = Vec3.atLowerCornerOf(Minecraft.getInstance().player.blockPosition());
+	}
+	
 	@Override
 	public void findCoordinates(BlockSet blocks, Player player) {
 		if (!(enabled && (mirrorX || mirrorY || mirrorZ))) return;
@@ -43,6 +51,7 @@ public class Mirror extends BaseModifier {
 		var newBlockEntry = new BlockEntry(newBlockPos);
 		newBlockEntry.copyRotationSettingsFrom(blockEntry);
 		newBlockEntry.mirrorX = !newBlockEntry.mirrorX;
+		blocks.add(newBlockEntry);
 
 		if (mirrorY) performMirrorY(blocks, newBlockEntry);
 		if (mirrorZ) performMirrorZ(blocks, newBlockEntry);
@@ -58,6 +67,7 @@ public class Mirror extends BaseModifier {
 		var newBlockEntry = new BlockEntry(newBlockPos);
 		newBlockEntry.copyRotationSettingsFrom(blockEntry);
 		newBlockEntry.mirrorY = !newBlockEntry.mirrorY;
+		blocks.add(newBlockEntry);
 
 		if (mirrorZ) performMirrorZ(blocks, newBlockEntry);
 	}
@@ -72,6 +82,7 @@ public class Mirror extends BaseModifier {
 		var newBlockEntry = new BlockEntry(newBlockPos);
 		newBlockEntry.copyRotationSettingsFrom(blockEntry);
 		newBlockEntry.mirrorZ = !newBlockEntry.mirrorZ;
+		blocks.add(newBlockEntry);
 	}
 
 	public boolean isWithinRange(BlockPos blockPos) {
@@ -83,6 +94,29 @@ public class Mirror extends BaseModifier {
 	public int getReach() {
 		return radius * 2; //Change ModifierSettings#setReachUpgrade too
 	}
+	
+	public void toggleMirrorAxis(int index) {
+		switch (index) {
+			case 0 -> mirrorX = !mirrorX;
+			case 1 -> mirrorY = !mirrorY;
+			case 2 -> mirrorZ = !mirrorZ;
+		}
+	}
+	
+	public boolean getMirrorAxis(int index) {
+		switch (index) {
+			case 0 -> {
+				return mirrorX;
+			}
+			case 1 -> {
+				return mirrorY;
+			}
+			case 2 -> {
+				return mirrorZ;
+			}
+		}
+		return false;
+	}
 
 	@Override
 	public CompoundTag serializeNBT() {
diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/RadialMirror.java b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/RadialMirror.java
index 944a175..9a0f7e3 100644
--- a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/RadialMirror.java
+++ b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/RadialMirror.java
@@ -73,6 +73,8 @@ public class RadialMirror extends BaseModifier {
 			//rotate block
 			double angleToCenter = Mth.atan2(relNewVec.x, relNewVec.z); //between -PI and PI
 			rotateBlockEntry(newBlockEntry, angleToCenter, doAlternate);
+			
+			blocks.add(newBlockEntry);
 		}
 	}
 
diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/AbstractSimiScreen.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/AbstractSimiScreen.java
index cc71dfb..26d1b8f 100644
--- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/AbstractSimiScreen.java
+++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/AbstractSimiScreen.java
@@ -12,6 +12,7 @@ import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import nl.requios.effortlessbuilding.gui.buildmodifier.ModifiersScreenList;
 
 import java.util.Collection;
 import java.util.List;
@@ -146,7 +147,13 @@ public abstract class AbstractSimiScreen extends Screen {
 				int tty = simiWidget.lockedTooltipY == -1 ? mouseY : simiWidget.lockedTooltipY + simiWidget.y;
 				renderComponentTooltip(ms, tooltip, ttx, tty);
 			}
+			
+			//Added
+			if (widget instanceof ModifiersScreenList list) {
+				list.renderWindowForeground(ms, mouseX, mouseY, partialTicks);
+			}
 		}
+		
 	}
 
 	protected void endFrame() {}
diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/ScrollInput.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/ScrollInput.java
index 44423b3..bb7e674 100644
--- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/ScrollInput.java
+++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/ScrollInput.java
@@ -132,7 +132,8 @@ public class ScrollInput extends AbstractSimiWidget {
 			onChanged();
 		}
 
-		return priorState != state;
+//		return priorState != state;
+		return true; //Changed
 	}
 
 	protected void clampState() {
diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/outliner/Outliner.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/outliner/Outliner.java
index c1df937..5588623 100644
--- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/outliner/Outliner.java
+++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/outliner/Outliner.java
@@ -154,7 +154,7 @@ public class Outliner {
 
 	public static class OutlineEntry {
 
-		static final int fadeTicks = 8;
+		static final int fadeTicks = 4;
 		private Outline outline;
 		private int ticksTillRemoval;
 
diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java
index b793e18..3b10d16 100644
--- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java
@@ -19,6 +19,7 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.util.RandomSource;
+import nl.requios.effortlessbuilding.AllIcons;
 import nl.requios.effortlessbuilding.ClientEvents;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.EffortlessBuildingClient;
@@ -296,9 +297,8 @@ public class RadialMenu extends Screen {
 
 			final double x = (menuRegion.x1 + menuRegion.x2) * 0.5 * (ringOuterEdge * 0.55 + 0.45 * ringInnerEdge);
 			final double y = (menuRegion.y1 + menuRegion.y2) * 0.5 * (ringOuterEdge * 0.55 + 0.45 * ringInnerEdge);
-
-			RenderSystem.setShaderTexture(0, new ResourceLocation(EffortlessBuilding.MODID, "textures/icons/" + menuRegion.mode.name().toLowerCase() + ".png"));
-			blit(ms, (int) (middleX + x - 8), (int) (middleY + y - 8), 16, 16, 0, 0, 18, 18, 18, 18);
+			
+			menuRegion.mode.icon.render(ms, (int) (middleX + x - 8), (int) (middleY + y - 8));
 		}
 
 		//Draw action icons
@@ -307,8 +307,7 @@ public class RadialMenu extends Screen {
 			final double x = (button.x1 + button.x2) / 2 + 0.01;
 			final double y = (button.y1 + button.y2) / 2 + 0.01;
 
-			RenderSystem.setShaderTexture(0, new ResourceLocation(EffortlessBuilding.MODID, "textures/icons/" + button.action.name().toLowerCase() + ".png"));
-			blit(ms, (int) (middleX + x - 8), (int) (middleY + y - 8), 16, 16, 0, 0, 18, 18, 18, 18);
+			button.action.icon.render(ms, (int) (middleX + x - 8), (int) (middleY + y - 8));
 		}
 
 		ms.popPose();
@@ -512,10 +511,10 @@ public class RadialMenu extends Screen {
 
 		public MenuButton(final ActionEnum action, final double x, final double y,
 						  final Direction textSide) {
-			this.name = I18n.get(action.name);
+			this.name = I18n.get(action.getNameKey());
 
-			if (I18n.exists(action.name + ".description")) {
-				this.description = I18n.get(action.name + ".description");
+			if (I18n.exists(action.getDescriptionKey())) {
+				this.description = I18n.get(action.getDescriptionKey());
 			}
 
 			this.action = action;
diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ArrayEntry.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ArrayEntry.java
index c113e02..4bd2377 100644
--- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ArrayEntry.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ArrayEntry.java
@@ -1,74 +1,47 @@
 package nl.requios.effortlessbuilding.gui.buildmodifier;
 
 import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.components.Widget;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.Component;
 import net.minecraft.ChatFormatting;
+import net.minecraft.client.Minecraft;
+import net.minecraft.network.chat.Component;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import nl.requios.effortlessbuilding.AllGuiTextures;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmodifier.Array;
 import nl.requios.effortlessbuilding.buildmodifier.BaseModifier;
-import nl.requios.effortlessbuilding.create.foundation.gui.AbstractSimiScreen;
-import nl.requios.effortlessbuilding.create.foundation.gui.widget.Label;
 import nl.requios.effortlessbuilding.create.foundation.gui.widget.ScrollInput;
-import nl.requios.effortlessbuilding.create.foundation.utility.Components;
-import nl.requios.effortlessbuilding.create.foundation.utility.FontHelper;
-import nl.requios.effortlessbuilding.gui.elements.GuiCheckBoxFixed;
-import nl.requios.effortlessbuilding.gui.elements.GuiNumberField;
-import nl.requios.effortlessbuilding.gui.elements.GuiScrollPane;
+import nl.requios.effortlessbuilding.gui.elements.LabeledScrollInput;
 import nl.requios.effortlessbuilding.utilities.MathHelper;
 import nl.requios.effortlessbuilding.utilities.ReachHelper;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Vector;
 
 @OnlyIn(Dist.CLIENT)
 public class ArrayEntry extends BaseModifierEntry<Array> {
 
 	protected Vector<ScrollInput> offsetInputs = new Vector<>(3);
-	protected Vector<Label> offsetLabels = new Vector<>(3);
 	protected ScrollInput countInput;
-	protected Label countLabel;
-	protected Label reachLabel;
 
 	public ArrayEntry(ModifiersScreen screen, BaseModifier array) {
 		super(screen, (Array) array, Component.literal("Array"), AllGuiTextures.ARRAY_ENTRY);
 
 		offsetInputs.clear();
-		offsetLabels.clear();
 
 		for (int i = 0; i < 3; i++) {
-			var label = new Label(0, 0, Components.immutableEmpty()).withShadow();
-
 			final int index = i;
-			var scrollInput = new ScrollInput(0, 0, 18, 18)
-				.withRange(0, 100)
-				.writingTo(label)
-				.titled(Component.literal("Offset"))
+			var scrollInput = new LabeledScrollInput(0, 0, 18, 18)
+				.titled(Component.literal(i == 0 ? "X Offset" : i == 1 ? "Y Offset" : "Z Offset"))
 				.calling(value -> {
 					modifier.offset = MathHelper.with(modifier.offset, index, value);
-//						label.x = x + 65 + 20 * index - font.width(label.text) / 2;
 					onValueChanged();
 				});
 			scrollInput.setState(MathHelper.get(modifier.offset, index));
-
 			offsetInputs.add(scrollInput);
-			offsetLabels.add(label);
 		}
-
 		listeners.addAll(offsetInputs);
-		listeners.addAll(offsetLabels);
 
-		countLabel = new Label(0, 0, Components.immutableEmpty()).withShadow();
-		countInput = new ScrollInput(0, 0, 18, 18)
+		countInput = new LabeledScrollInput(0, 0, 18, 18)
 			.withRange(1, 100)
-			.writingTo(countLabel)
 			.titled(Component.literal("Count"))
 			.calling(value -> {
 				modifier.count = value;
@@ -76,56 +49,34 @@ public class ArrayEntry extends BaseModifierEntry<Array> {
 			});
 		countInput.setState(modifier.count);
 		listeners.add(countInput);
-		listeners.add(countLabel);
-
-		reachLabel = new Label(0, 0, Components.immutableEmpty()).withShadow();
-		listeners.add(reachLabel);
-
+		
 		for (int i = 0; i < 3; i++) {
 			offsetInputs.get(i).onChanged();
 		}
 		countInput.onChanged();
-	}
-
-	@Override
-	public void tick() {
-		super.tick();
-		offsetInputs.forEach(ScrollInput::tick);
-		offsetLabels.forEach(Label::tick);
-		countInput.tick();
+		
+		onValueChanged();
 	}
 
 	@Override
 	public void render(PoseStack ms, int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean p_230432_9_, float partialTicks) {
 		super.render(ms, index, y, x, width, height, mouseX, mouseY, p_230432_9_, partialTicks);
 
-		//draw offset labels
-		for (int i = 0; i < 3; i++) {
-			offsetLabels.get(i).x = x + 65 + 20 * i - getFont().width(offsetLabels.get(i).text) / 2;
-			offsetLabels.get(i).y = y + 23;
-			offsetLabels.get(i).render(ms, mouseX, mouseY, partialTicks);
-		}
-		
 		//draw offset inputs
 		for (int i = 0; i < 3; i++) {
-			offsetInputs.get(i).x = x + 65 + 20 * i;
-			offsetInputs.get(i).y = y + 23;
+			offsetInputs.get(i).x = left + 47 + 20 * i;
+			offsetInputs.get(i).y = top + 18;
 			offsetInputs.get(i).render(ms, mouseX, mouseY, partialTicks);
 		}
 		
-		//draw count label
-		countLabel.x = x + 65;
-		countLabel.y = y + 45;
-		countLabel.render(ms, mouseX, mouseY, partialTicks);
-		
 		//draw count input
-		countInput.x = x + 65;
-		countInput.y = y + 45;
+		countInput.x = left + 47;
+		countInput.y = top + 38;
 		countInput.render(ms, mouseX, mouseY, partialTicks);
 		
 		//draw reach label
-		reachLabel.x = x + width - 125;
-		reachLabel.y = y + 23;
+		reachLabel.x = right - 8 - getFont().width(reachLabel.text);
+		reachLabel.y = top + 23;
 		reachLabel.render(ms, mouseX, mouseY, partialTicks);
 	}
 
diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/BaseModifierEntry.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/BaseModifierEntry.java
index c397792..fd956e0 100644
--- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/BaseModifierEntry.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/BaseModifierEntry.java
@@ -3,22 +3,36 @@ package nl.requios.effortlessbuilding.gui.buildmodifier;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.network.chat.Component;
 import nl.requios.effortlessbuilding.AllGuiTextures;
+import nl.requios.effortlessbuilding.AllIcons;
 import nl.requios.effortlessbuilding.buildmodifier.BaseModifier;
 import nl.requios.effortlessbuilding.create.foundation.gui.AbstractSimiScreen;
-import nl.requios.effortlessbuilding.create.foundation.gui.AllIcons;
 import nl.requios.effortlessbuilding.create.foundation.gui.widget.BoxWidget;
+import nl.requios.effortlessbuilding.create.foundation.gui.widget.ElementWidget;
 import nl.requios.effortlessbuilding.create.foundation.gui.widget.IconButton;
 import nl.requios.effortlessbuilding.create.foundation.gui.widget.Label;
+import nl.requios.effortlessbuilding.create.foundation.utility.Components;
 import nl.requios.effortlessbuilding.gui.elements.GuiCollapsibleScrollEntry;
 import nl.requios.effortlessbuilding.gui.elements.GuiScrollPane;
+import nl.requios.effortlessbuilding.gui.elements.MiniButton;
 
 public abstract class BaseModifierEntry<T extends BaseModifier> extends ModifiersScreenList.Entry {
 
     public T modifier;
     protected AllGuiTextures background;
-    protected IconButton enableButton;
+    protected MiniButton enableButton;
     protected Label nameLabel;
-    protected IconButton removeButton;
+    protected MiniButton moveUpButton;
+    protected MiniButton moveDownButton;
+    protected MiniButton removeButton;
+    protected Label reachLabel;
+    
+    protected static final int BACKGROUND_WIDTH = 226;
+    protected static final int BACKGROUND_HEIGHT = 60;
+    protected int left = 0;
+    protected int right = 0;
+    protected int top = 0;
+    protected int bottom = 0;
+    
 
     public BaseModifierEntry(ModifiersScreen screen, T modifier, Component name, AllGuiTextures background) {
         super(screen);
@@ -26,7 +40,8 @@ public abstract class BaseModifierEntry<T extends BaseModifier> extends Modifier
         this.modifier = modifier;
         this.background = background;
 
-        enableButton = new IconButton(35, 8, AllIcons.I_PLACE)
+        enableButton = new MiniButton(0, 0, 100, 9)
+            .showing(AllGuiTextures.ENABLE_BUTTON_BACKGROUND)
             .withCallback(() -> {
                 modifier.enabled = !modifier.enabled;
                 onValueChanged();
@@ -36,40 +51,83 @@ public abstract class BaseModifierEntry<T extends BaseModifier> extends Modifier
         nameLabel = new Label(65, 8, name);
         nameLabel.text = name;
         
-        removeButton = new IconButton(0, 0, AllIcons.I_TRASH)
+        moveUpButton = new MiniButton(0, 0, 9, 9)
+            .showing(AllGuiTextures.ARROW_UP)
+            .withCallback(() -> {
+                screen.moveModifierUp(this);
+                onValueChanged();
+            });
+        moveUpButton.setToolTip(Components.literal("Move up"));
+        listeners.add(moveUpButton);
+        
+        moveDownButton = new MiniButton(0, 0, 9, 9)
+            .showing(AllGuiTextures.ARROW_DOWN)
+            .withCallback(() -> {
+                screen.moveModifierDown(this);
+                onValueChanged();
+            });
+        moveDownButton.setToolTip(Components.literal("Move down"));
+        listeners.add(moveDownButton);
+        
+        removeButton = new MiniButton(0, 0, 9, 9)
+            .showing(AllGuiTextures.TRASH)
             .withCallback(() -> {
                 screen.removeModifier(this);
             });
+        removeButton.setToolTip(Components.literal("Remove"));
         listeners.add(removeButton);
+        
+        reachLabel = new Label(0, 0, Components.immutableEmpty()).withShadow();
+        listeners.add(reachLabel);
     }
 
     @Override
     public void tick() {
         super.tick();
-//        enableButton.tick();
     }
 
     @Override
     public void render(PoseStack ms, int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean p_230432_9_, float partialTicks) {
 
-        background.render(ms, x + 22, y, screen);
+        left = x + width / 2 - BACKGROUND_WIDTH / 2;
+        right = x + width / 2 + BACKGROUND_WIDTH / 2;
+        top = y;
+        bottom = y + BACKGROUND_HEIGHT;
         
-        enableButton.x = x + width - 60;
-        enableButton.y = y + 18;
+        background.render(ms, left, top, screen);
+        
+        enableButton.x = left + 4;
+        enableButton.y = top + 3;
         enableButton.render(ms, mouseX, mouseY, partialTicks);
+        if (modifier.enabled)
+            AllGuiTextures.CHECKMARK.render(ms, left + 5, top + 1, screen);
         
-        nameLabel.x = x + 65;
-        nameLabel.y = y + 4;
+        nameLabel.x = left + 18;
+        nameLabel.y = top + 4;
         nameLabel.render(ms, mouseX, mouseY, partialTicks);
         
-        removeButton.x = x + width - 60;
-        removeButton.y = y + 38;
+        moveUpButton.x = right - 31;
+        moveUpButton.y = top + 3;
+        moveUpButton.render(ms, mouseX, mouseY, partialTicks);
+        
+        moveDownButton.x = right - 22;
+        moveDownButton.y = top + 3;
+        moveDownButton.render(ms, mouseX, mouseY, partialTicks);
+        
+        removeButton.x = right - 13;
+        removeButton.y = top + 3;
         removeButton.render(ms, mouseX, mouseY, partialTicks);
         
         super.render(ms, index, y, x, width, height, mouseX, mouseY, p_230432_9_, partialTicks);
     }
 
     public void onValueChanged() {
-        enableButton.setIcon(modifier.enabled ? AllIcons.I_PLACE : AllIcons.I_CLEAR);
+        if (modifier.enabled)
+            enableButton.setToolTip(Components.literal("Disable this modifier"));
+        else
+            enableButton.setToolTip(Components.literal("Enable this modifier"));
+        
+        moveUpButton.visible = screen.canMoveUp(this);
+        moveDownButton.visible = screen.canMoveDown(this);
     }
 }
diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/MirrorEntry.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/MirrorEntry.java
index 87e98b5..7237be4 100644
--- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/MirrorEntry.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/MirrorEntry.java
@@ -1,37 +1,236 @@
 package nl.requios.effortlessbuilding.gui.buildmodifier;
 
 import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.gui.components.Widget;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.phys.Vec3;
-import net.minecraft.ChatFormatting;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import nl.requios.effortlessbuilding.AllGuiTextures;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.AllIcons;
 import nl.requios.effortlessbuilding.buildmodifier.BaseModifier;
 import nl.requios.effortlessbuilding.buildmodifier.Mirror;
-import nl.requios.effortlessbuilding.create.foundation.gui.AbstractSimiScreen;
-import nl.requios.effortlessbuilding.gui.elements.*;
+import nl.requios.effortlessbuilding.create.foundation.gui.widget.IconButton;
+import nl.requios.effortlessbuilding.create.foundation.gui.widget.ScrollInput;
+import nl.requios.effortlessbuilding.create.foundation.utility.Components;
+import nl.requios.effortlessbuilding.gui.elements.LabeledScrollInput;
+import nl.requios.effortlessbuilding.utilities.MathHelper;
 import nl.requios.effortlessbuilding.utilities.ReachHelper;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.text.DecimalFormat;
+import java.util.Vector;
 
-@SuppressWarnings("Duplicates")
 @OnlyIn(Dist.CLIENT)
 public class MirrorEntry extends BaseModifierEntry<Mirror> {
-
-	public MirrorEntry(ModifiersScreen screen, BaseModifier modifier) {
-		super(screen, (Mirror) modifier, Component.literal("Mirror"), AllGuiTextures.MIRROR_ENTRY);
+	
+	protected Vector<ScrollInput> positionInputs;
+	protected IconButton playerPositionButton;
+	protected IconButton toggleOffsetButton;
+	protected Vector<IconButton> axisButtons;
+	protected ScrollInput radiusInput;
+	protected IconButton showLinesButton;
+	protected IconButton showAreasButton;
+	protected DecimalFormat df = new DecimalFormat("#.#");
+	
+	public MirrorEntry(ModifiersScreen screen, BaseModifier mirror) {
+		super(screen, (Mirror) mirror, Component.literal("Mirror"), AllGuiTextures.MIRROR_ENTRY);
+		
+		positionInputs = new Vector<>();
+		axisButtons = new Vector<>();
+		
+		//Position
+		//ScrollInput works with double the value, so we can have 0.5 increments
+		for (int i = 0; i < 3; i++) {
+			final int index = i;
+			var scrollInput = new LabeledScrollInput(0, 0, 27, 18)
+				.showControlScrollsSlowerTooltip()
+				.titled(Component.literal(i == 0 ? "X Position" : i == 1 ? "Y Position" : "Z Position"))
+				.format(integer -> Component.literal(df.format(integer / 2.0)))
+				.withStepFunction(stepContext -> stepContext.shift ? 20 : stepContext.control ? 1 : 2)
+				.calling(value -> {
+					modifier.position = MathHelper.with(modifier.position, index, value / 2.0);
+					onValueChanged();
+				});
+			scrollInput.setState((int) (MathHelper.get(modifier.position, index) * 2.0));
+			positionInputs.add(scrollInput);
+		}
+		listeners.addAll(positionInputs);
+		
+		//Player position button
+		playerPositionButton = new IconButton(0, 0, AllIcons.I_PLAYER)
+			.withCallback(() -> {
+				modifier.position = Vec3.atLowerCornerOf(Minecraft.getInstance().player.blockPosition());
+				onValueChanged();
+			});
+		playerPositionButton.setToolTip(Components.literal("Set to player position"));
+		listeners.add(playerPositionButton);
+		
+		//Toggle offset button
+		toggleOffsetButton = new IconButton(0, 0, AllIcons.I_BLOCK_CENTER)
+			.withCallback(() -> {
+				if (modifier.position.x == Math.floor(modifier.position.x)) {
+					modifier.position = new Vec3(
+						Math.floor(modifier.position.x) + 0.5,
+						Math.floor(modifier.position.y) + 0.5,
+						Math.floor(modifier.position.z) + 0.5
+					);
+				}
+				else {
+					modifier.position = new Vec3(
+						Math.floor(modifier.position.x),
+						Math.floor(modifier.position.y),
+						Math.floor(modifier.position.z)
+					);
+				}
+				onValueChanged();
+			});
+		listeners.add(toggleOffsetButton);
+		
+		//Axis buttons
+		for (int i = 0; i < 3; i++) {
+			final int index = i;
+			IconButton button = new IconButton(0, 0, AllIcons.I_SHOW_LINES)
+				.withCallback(() -> {
+					modifier.toggleMirrorAxis(index);
+					onValueChanged();
+				});
+			button.setToolTip(Components.literal(i == 0 ? "X Axis" : i == 1 ? "Y Axis" : "Z Axis"));
+			axisButtons.add(button);
+		}
+		listeners.addAll(axisButtons);
+		
+		//Radius
+		radiusInput = new LabeledScrollInput(0, 0, 27, 18)
+			.withRange(0, ReachHelper.getMaxMirrorRadius(Minecraft.getInstance().player))
+			.titled(Component.literal("Radius. Use Reach Upgrade items to increase maximum."))
+			.calling(value -> {
+				modifier.radius = value;
+				onValueChanged();
+			});
+		radiusInput.setState(modifier.radius);
+		listeners.add(radiusInput);
+		
+		//Show lines button
+		showLinesButton = new IconButton(0, 0, AllIcons.I_SHOW_LINES)
+			.withCallback(() -> {
+				modifier.drawLines = !modifier.drawLines;
+				onValueChanged();
+			});
+		listeners.add(showLinesButton);
+		
+		//Show areas button
+		showAreasButton = new IconButton(0, 0, AllIcons.I_SHOW_AREAS)
+			.withCallback(() -> {
+				modifier.drawPlanes = !modifier.drawPlanes;
+				onValueChanged();
+			});
+		listeners.add(showAreasButton);
+		
+		for (ScrollInput positionInput : positionInputs) {
+			positionInput.onChanged();
+		}
+		radiusInput.onChanged();
 	}
-
-
-//	protected static final ResourceLocation BUILDING_ICONS = new ResourceLocation(EffortlessBuilding.MODID, "textures/gui/building_icons.png");
+	
+	@Override
+	public void render(PoseStack ms, int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean p_230432_9_, float partialTicks) {
+		super.render(ms, index, y, x, width, height, mouseX, mouseY, p_230432_9_, partialTicks);
+		
+		//draw position inputs
+		for (int i = 0; i < 3; i++) {
+			ScrollInput input = positionInputs.get(i);
+			input.x = left + 47 + 29 * i;
+			input.y = top + 18;
+			input.render(ms, mouseX, mouseY, partialTicks);
+		}
+		
+		//draw player position button
+		playerPositionButton.x = left + 134;
+		playerPositionButton.y = top + 18;
+		playerPositionButton.render(ms, mouseX, mouseY, partialTicks);
+		
+		//draw toggle offset button
+		toggleOffsetButton.x = left + 154;
+		toggleOffsetButton.y = top + 18;
+		toggleOffsetButton.render(ms, mouseX, mouseY, partialTicks);
+		
+		//draw axis buttons
+		for (int i = 0; i < 3; i++) {
+			IconButton button = axisButtons.get(i);
+			button.x = left + 47 + 18 * i;
+			button.y = top + 38;
+			button.render(ms, mouseX, mouseY, partialTicks);
+		}
+		
+		//draw radius input
+		radiusInput.x = left + 145;
+		radiusInput.y = top + 38;
+		radiusInput.render(ms, mouseX, mouseY, partialTicks);
+		
+		//draw show lines button
+		showLinesButton.x = right - 43;
+		showLinesButton.y = top + 38;
+		showLinesButton.render(ms, mouseX, mouseY, partialTicks);
+		
+		//draw show areas button
+		showAreasButton.x = right - 23;
+		showAreasButton.y = top + 38;
+		showAreasButton.render(ms, mouseX, mouseY, partialTicks);
+	}
+	
+	@Override
+	public void onValueChanged() {
+		super.onValueChanged();
+		
+		//Position
+		for (int i = 0; i < 3; i++) {
+			ScrollInput input = positionInputs.get(i);
+			input.setState((int) (MathHelper.get(modifier.position, i) * 2.0));
+		}
+		
+		//Toggle offset button
+		if (modifier.position.x == Math.floor(modifier.position.x)) {
+			toggleOffsetButton.setIcon(AllIcons.I_BLOCK_CENTER);
+			toggleOffsetButton.setToolTip(Components.literal("Set mirror position to center of block, for uneven numbered builds."));
+		}
+		else {
+			toggleOffsetButton.setIcon(AllIcons.I_BLOCK_CORNER);
+			toggleOffsetButton.setToolTip(Components.literal("Set mirror position to corner of block, for even numbered builds."));
+		}
+		
+		//Axis buttons
+		for (int i = 0; i < 3; i++) {
+			IconButton button = axisButtons.get(i);
+			if (modifier.getMirrorAxis(i)) {
+				button.setIcon(AllIcons.I_SHOW_LINES);
+			}
+			else {
+				button.setIcon(AllIcons.I_HIDE_LINES);
+			}
+		}
+		
+		//Show lines button
+		if (modifier.drawLines) {
+			showLinesButton.setIcon(AllIcons.I_SHOW_LINES);
+			showLinesButton.setToolTip(Components.literal("Hide mirror lines"));
+		}
+		else {
+			showLinesButton.setIcon(AllIcons.I_HIDE_LINES);
+			showLinesButton.setToolTip(Components.literal("Show mirror lines"));
+		}
+		
+		//Show areas button
+		if (modifier.drawPlanes) {
+			showAreasButton.setIcon(AllIcons.I_SHOW_AREAS);
+			showAreasButton.setToolTip(Components.literal("Hide mirror areas"));
+		}
+		else {
+			showAreasButton.setIcon(AllIcons.I_HIDE_AREAS);
+			showAreasButton.setToolTip(Components.literal("Show mirror areas"));
+		}
+	}
+	
+	//	protected static final ResourceLocation BUILDING_ICONS = new ResourceLocation(EffortlessBuilding.MODID, "textures/gui/building_icons.png");
 //
 //	protected List<Button> mirrorButtonList = new ArrayList<>();
 //	protected List<GuiIconButton> mirrorIconButtonList = new ArrayList<>();
diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifiersScreen.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifiersScreen.java
index 7ed6340..04bc4fb 100644
--- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifiersScreen.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifiersScreen.java
@@ -21,6 +21,7 @@ import nl.requios.effortlessbuilding.gui.elements.GuiScrollPane;
 import nl.requios.effortlessbuilding.network.PacketHandler;
 
 import javax.annotation.Nonnull;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -47,7 +48,7 @@ public class ModifiersScreen extends AbstractSimiScreen {
 		int listL = this.width / 2 - listWidth / 2;
 		int listR = this.width / 2 + listWidth / 2;
 
-		list = new ModifiersScreenList(minecraft, listWidth, height - 80, 45, height - 45, 60);
+		list = new ModifiersScreenList(minecraft, listWidth, height - 80, 45, height - 45, 65);
 		list.setLeftPos(this.width / 2 - list.getWidth() / 2);
 
 		addRenderableWidget(list);
@@ -111,30 +112,56 @@ public class ModifiersScreen extends AbstractSimiScreen {
 		list.children().add(entry);
 		EffortlessBuildingClient.BUILD_MODIFIERS.addModifierSettings(modifier);
 	}
-
+	
 	public void removeModifier(BaseModifierEntry entry) {
 		list.children().remove(entry);
 		EffortlessBuildingClient.BUILD_MODIFIERS.removeModifierSettings(entry.modifier);
 	}
-
+	
+	public boolean canMoveUp(BaseModifierEntry modifierEntry) {
+		int index = list.children().indexOf(modifierEntry);
+		return index > 0;
+	}
+	
+	public boolean canMoveDown(BaseModifierEntry modifierEntry) {
+		int index = list.children().indexOf(modifierEntry);
+		return index < list.children().size() - 1;
+	}
+	
+	public void moveModifierUp(BaseModifierEntry modifierEntry) {
+		int index = list.children().indexOf(modifierEntry);
+		if (index == 0) return;
+		
+		Collections.swap(list.children(), index, index - 1);
+		EffortlessBuildingClient.BUILD_MODIFIERS.moveUp(modifierEntry.modifier);
+	}
+	
+	public void moveModifierDown(BaseModifierEntry modifierEntry) {
+		int index = list.children().indexOf(modifierEntry);
+		if (index == list.children().size() - 1) return;
+		
+		Collections.swap(list.children(), index, index + 1);
+		EffortlessBuildingClient.BUILD_MODIFIERS.moveDown(modifierEntry.modifier);
+	}
+	
 	@Override
 	public void resize(@Nonnull Minecraft client, int width, int height) {
 		double scroll = list.getScrollAmount();
 		init(client, width, height);
 		list.setScrollAmount(scroll);
 	}
-
+	
 	@Override
 	protected void renderWindow(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
 	
 	}
-
+	
 	@Override
 	public void onClose() {
 		super.onClose();
 		EffortlessBuildingClient.BUILD_MODIFIERS.save(minecraft.player);
 	}
-
+	
 	@Override
 	public boolean keyPressed(int keyCode, int p_96553_, int p_96554_) {
 		if (keyCode == ClientEvents.keyBindings[1].getKey().getValue()) {
@@ -144,5 +171,4 @@ public class ModifiersScreen extends AbstractSimiScreen {
 
 		return super.keyPressed(keyCode, p_96553_, p_96554_);
 	}
-
 }
diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifiersScreenList.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifiersScreenList.java
index 143fea1..dffb2cc 100644
--- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifiersScreenList.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifiersScreenList.java
@@ -8,7 +8,6 @@ import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.components.ObjectSelectionList;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.network.chat.Component;
-import nl.requios.effortlessbuilding.create.foundation.gui.AbstractSimiScreen;
 import nl.requios.effortlessbuilding.create.foundation.gui.TickableGuiEventListener;
 import nl.requios.effortlessbuilding.create.foundation.gui.UIRenderHelper;
 import nl.requios.effortlessbuilding.create.foundation.gui.widget.AbstractSimiWidget;
@@ -17,6 +16,7 @@ import nl.requios.effortlessbuilding.create.foundation.utility.Components;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 //Based on Create's ConfigScreenList
 public class ModifiersScreenList extends ObjectSelectionList<ModifiersScreenList.Entry> implements TickableGuiEventListener {
@@ -48,6 +48,30 @@ public class ModifiersScreenList extends ObjectSelectionList<ModifiersScreenList
         super.renderList(p_239228_, p_239229_, p_239230_, p_239231_);
         RenderSystem.disableScissor();
     }
+    
+    public void renderWindowForeground(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+        renderListForeground(ms, mouseX, mouseY, partialTicks);
+    }
+    
+    protected void renderListForeground(PoseStack pPoseStack, int pMouseX, int pMouseY, float pPartialTick) {
+        int i = this.getRowLeft();
+        int j = this.getRowWidth();
+        int k = this.itemHeight - 4;
+        int l = this.getItemCount();
+        
+        for(int i1 = 0; i1 < l; ++i1) {
+            int j1 = this.getRowTop(i1);
+            int k1 = j1 + itemHeight;
+            if (k1 >= this.y0 && j1 <= this.y1) {
+                renderItemForeground(pPoseStack, pMouseX, pMouseY, pPartialTick, i1, i, j1, j, k);
+            }
+        }
+    }
+    
+    protected void renderItemForeground(PoseStack pPoseStack, int pMouseX, int pMouseY, float pPartialTick, int pIndex, int pLeft, int pTop, int pWidth, int pHeight) {
+        Entry e = this.getEntry(pIndex);
+        e.renderForeground(pPoseStack, pIndex, pTop, pLeft, pWidth, pHeight, pMouseX, pMouseY, Objects.equals(this.getHovered(), e), pPartialTick);
+    }
 
     @Override
     public boolean mouseClicked(double x, double y, int button) {
@@ -127,6 +151,10 @@ public class ModifiersScreenList extends ObjectSelectionList<ModifiersScreenList
 //            UIRenderHelper.streak(ms, 0, x - 10, y + height / 2, height - 6, width, 0xdd_000000);
 //            UIRenderHelper.streak(ms, 180, x + (int) (width * 1.35f) + 10, y + height / 2, height - 6, width / 8 * 7, 0xdd_000000);
     
+        }
+        
+        public void renderForeground(PoseStack ms, int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean p_230432_9_, float partialTicks) {
+    
             for (var listener : listeners) {
                 if (listener instanceof AbstractSimiWidget simiWidget && simiWidget.isHoveredOrFocused()
                     && simiWidget.visible) {
diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/elements/LabeledScrollInput.java b/src/main/java/nl/requios/effortlessbuilding/gui/elements/LabeledScrollInput.java
new file mode 100644
index 0000000..3fbaf2d
--- /dev/null
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/LabeledScrollInput.java
@@ -0,0 +1,49 @@
+package nl.requios.effortlessbuilding.gui.elements;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.Minecraft;
+import net.minecraft.network.chat.Component;
+import nl.requios.effortlessbuilding.create.foundation.gui.widget.Label;
+import nl.requios.effortlessbuilding.create.foundation.gui.widget.ScrollInput;
+import nl.requios.effortlessbuilding.create.foundation.utility.Components;
+import nl.requios.effortlessbuilding.create.foundation.utility.Lang;
+import org.jetbrains.annotations.NotNull;
+
+public class LabeledScrollInput extends ScrollInput {
+    protected Label label;
+    protected final Component controlScrollsSlowerText = Lang.translateDirect("gui.scrollInput.controlScrollsSlower");
+    protected boolean controlScrollsSlower;
+    
+    public LabeledScrollInput(int xIn, int yIn, int widthIn, int heightIn) {
+        super(xIn, yIn, widthIn, heightIn);
+        min = Integer.MIN_VALUE;
+        max = Integer.MAX_VALUE;
+        
+        label = new Label(0, 0, Components.immutableEmpty()).withShadow();
+        writingTo(label);
+    }
+    
+    public LabeledScrollInput showControlScrollsSlowerTooltip() {
+        controlScrollsSlower = true;
+        return this;
+    }
+    
+    @Override
+    public void renderButton(@NotNull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+        super.renderButton(ms, mouseX, mouseY, partialTicks);
+        
+        label.x = x + width / 2 - Minecraft.getInstance().font.width(label.text) / 2;
+        label.y = y + height / 2 - Minecraft.getInstance().font.lineHeight / 2;
+        label.renderButton(ms, mouseX, mouseY, partialTicks);
+    }
+    
+    @Override
+    protected void updateTooltip() {
+        super.updateTooltip();
+        if (title == null || !controlScrollsSlower)
+            return;
+        toolTip.add(controlScrollsSlowerText.plainCopy()
+            .withStyle(ChatFormatting.ITALIC, ChatFormatting.DARK_GRAY));
+    }
+}
diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/elements/MiniButton.java b/src/main/java/nl/requios/effortlessbuilding/gui/elements/MiniButton.java
new file mode 100644
index 0000000..2076f14
--- /dev/null
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/MiniButton.java
@@ -0,0 +1,19 @@
+package nl.requios.effortlessbuilding.gui.elements;
+
+import net.minecraft.network.chat.Component;
+import nl.requios.effortlessbuilding.create.foundation.gui.widget.ElementWidget;
+
+public class MiniButton extends ElementWidget {
+    public MiniButton(int x, int y) {
+        super(x, y);
+    }
+    
+    public MiniButton(int x, int y, int width, int height) {
+        super(x, y, width, height);
+    }
+    
+    public void setToolTip(Component text) {
+        toolTip.clear();
+        toolTip.add(text);
+    }
+}
diff --git a/src/main/java/nl/requios/effortlessbuilding/network/ServerPlaceBlocksPacket.java b/src/main/java/nl/requios/effortlessbuilding/network/ServerPlaceBlocksPacket.java
index cc92680..8b15afd 100644
--- a/src/main/java/nl/requios/effortlessbuilding/network/ServerPlaceBlocksPacket.java
+++ b/src/main/java/nl/requios/effortlessbuilding/network/ServerPlaceBlocksPacket.java
@@ -4,10 +4,8 @@ import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.entity.player.Player;
 import net.minecraftforge.network.NetworkEvent;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.utilities.BlockEntry;
 import nl.requios.effortlessbuilding.utilities.BlockSet;
 
-import java.util.List;
 import java.util.function.Supplier;
 
 /**
@@ -16,20 +14,24 @@ import java.util.function.Supplier;
 public class ServerPlaceBlocksPacket {
 
 	private BlockSet blocks;
+	private long placeTime;
 
 	public ServerPlaceBlocksPacket() {}
 
-	public ServerPlaceBlocksPacket(BlockSet blocks) {
+	public ServerPlaceBlocksPacket(BlockSet blocks, long placeTime) {
 		this.blocks = blocks;
+		this.placeTime = placeTime;
 	}
 
 	public static void encode(ServerPlaceBlocksPacket message, FriendlyByteBuf buf) {
 		BlockSet.encode(buf, message.blocks);
+		buf.writeLong(message.placeTime);
 	}
 
 	public static ServerPlaceBlocksPacket decode(FriendlyByteBuf buf) {
 		ServerPlaceBlocksPacket message = new ServerPlaceBlocksPacket();
 		message.blocks = BlockSet.decode(buf);
+		message.placeTime = buf.readLong();
 		return message;
 	}
 
@@ -37,8 +39,8 @@ public class ServerPlaceBlocksPacket {
 		public static void handle(ServerPlaceBlocksPacket message, Supplier<NetworkEvent.Context> ctx) {
 			ctx.get().enqueueWork(() -> {
 				Player player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
-
-				EffortlessBuilding.SERVER_BLOCK_PLACER.placeBlocks(player, message.blocks);
+				
+				EffortlessBuilding.SERVER_BLOCK_PLACER.placeBlocksDelayed(player, message.blocks, message.placeTime);
 			});
 			ctx.get().setPacketHandled(true);
 		}
diff --git a/src/main/java/nl/requios/effortlessbuilding/render/BlockPreviews.java b/src/main/java/nl/requios/effortlessbuilding/render/BlockPreviews.java
index 4dda587..ef46124 100644
--- a/src/main/java/nl/requios/effortlessbuilding/render/BlockPreviews.java
+++ b/src/main/java/nl/requios/effortlessbuilding/render/BlockPreviews.java
@@ -56,12 +56,14 @@ public class BlockPreviews {
 	}
 
 	public void drawLookAtPreview(Player player) {
-		if (EffortlessBuildingClient.BUILD_MODES.getBuildMode() == BuildModeEnum.DISABLED) return;
-		if (EffortlessBuildingClient.BUILDER_CHAIN.getBuildingState() == BuilderChain.BuildingState.IDLE &&
-			ClientConfig.visuals.onlyShowBlockPreviewsWhenBuilding.get()) return;
-
 		var blocks = EffortlessBuildingClient.BUILDER_CHAIN.getBlocks();
 		if (blocks.size() == 0) return;
+		
+		if (EffortlessBuildingClient.BUILD_MODES.getBuildMode() == BuildModeEnum.DISABLED &&
+			blocks.size() == 1) return;
+		if (EffortlessBuildingClient.BUILDER_CHAIN.getBuildingState() == BuilderChain.BuildingState.IDLE &&
+			ClientConfig.visuals.onlyShowBlockPreviewsWhenBuilding.get() &&
+			blocks.size() == 1) return;
 
 		var coordinates = blocks.getCoordinates();
 		var state = EffortlessBuildingClient.BUILDER_CHAIN.getPretendBuildingState();
diff --git a/src/main/java/nl/requios/effortlessbuilding/systems/BuilderChain.java b/src/main/java/nl/requios/effortlessbuilding/systems/BuilderChain.java
index 74fe242..077aa38 100644
--- a/src/main/java/nl/requios/effortlessbuilding/systems/BuilderChain.java
+++ b/src/main/java/nl/requios/effortlessbuilding/systems/BuilderChain.java
@@ -43,6 +43,7 @@ public class BuilderChain {
     private BlockPos startPosForBreaking;
     private BlockHitResult lookingAtNear;
     //Can be near or far depending on abilities
+    //Only updated when we are in IDLE state
     private BlockHitResult lookingAt;
 
     public enum BuildingState {
@@ -85,10 +86,9 @@ public class BuilderChain {
                 BlockUtilities.playSoundIfFurtherThanNormal(player, blocks.getLastBlockEntry(), false);
                 player.swing(InteractionHand.MAIN_HAND);
 
-                //TODO place blocks delayed on server, calculate what tick they should be placed on
-                int delay = CommonConfig.visuals.appearAnimationLength.get() * 3 - 3; //DelayedBlockPlacer is 3 times faster than client tick?
-
-                PacketHandler.INSTANCE.sendToServer(new ServerPlaceBlocksPacket(blocks));
+                blocks.skipFirst = buildMode == BuildModeEnum.DISABLED;
+                long placeTime = player.level.getGameTime() + CommonConfig.visuals.appearAnimationLength.get() - 3;
+                PacketHandler.INSTANCE.sendToServer(new ServerPlaceBlocksPacket(blocks, placeTime));
             }
         }
     }
@@ -107,6 +107,7 @@ public class BuilderChain {
 
             //Use new start position for breaking, because we assumed the player was gonna place
             blocks.setStartPos(new BlockEntry(startPosForBreaking));
+            EffortlessBuildingClient.BUILD_MODIFIERS.findCoordinates(blocks, player);
             BuilderFilter.filterOnCoordinates(blocks, player);
             findExistingBlockStates(player.level);
             BuilderFilter.filterOnExistingBlockStates(blocks, player);
@@ -122,6 +123,7 @@ public class BuilderChain {
                 EffortlessBuildingClient.BLOCK_PREVIEWS.onBlocksBroken(blocks);
                 BlockUtilities.playSoundIfFurtherThanNormal(player, blocks.getLastBlockEntry(), true);
                 player.swing(InteractionHand.MAIN_HAND);
+                blocks.skipFirst = buildMode == BuildModeEnum.DISABLED;
                 PacketHandler.INSTANCE.sendToServer(new ServerBreakBlocksPacket(blocks));
             }
         }
@@ -133,7 +135,6 @@ public class BuilderChain {
         startPosForPlacing = null;
         startPosForBreaking = null;
         lookingAtNear = null;
-        lookingAt = null;
 
         var mc = Minecraft.getInstance();
         var player = mc.player;
diff --git a/src/main/java/nl/requios/effortlessbuilding/systems/DelayedBlockPlacer.java b/src/main/java/nl/requios/effortlessbuilding/systems/DelayedBlockPlacer.java
deleted file mode 100644
index c40f9b8..0000000
--- a/src/main/java/nl/requios/effortlessbuilding/systems/DelayedBlockPlacer.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package nl.requios.effortlessbuilding.systems;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.state.BlockState;
-import nl.requios.effortlessbuilding.utilities.UndoRedoBlockSet;
-import nl.requios.effortlessbuilding.utilities.InventoryHelper;
-import nl.requios.effortlessbuilding.utilities.SurvivalHelper;
-
-import java.util.*;
-
-public class DelayedBlockPlacer {
-
-    private final Set<Entry> entries = Collections.synchronizedSet(new HashSet<>());
-    private final Set<Entry> entriesView = Collections.unmodifiableSet(entries);
-
-    public void placeBlocksDelayed(Entry entry) {
-        if (entry.world.isClientSide) return;
-
-        entries.add(entry);
-    }
-
-    public void tick() {
-        for (Entry entry : entries) {
-            entry.ticksTillPlacement--;
-            if (entry.ticksTillPlacement <= 0) {
-                entry.place();
-                entries.remove(entry);
-            }
-        }
-    }
-
-    public Set<Entry> getEntries() {
-        return entriesView;
-    }
-
-    public static class Entry {
-        private Level world;
-        private Player player;
-        private List<BlockPos> coordinates;
-        private List<BlockState> blockStates;
-        private List<ItemStack> itemStacks;
-        private boolean placeStartPos;
-        private int ticksTillPlacement;
-
-        public Entry(Level world, Player player, List<BlockPos> coordinates, List<BlockState> blockStates,
-                     List<ItemStack> itemStacks, boolean placeStartPos, int ticksTillPlacement) {
-            this.world = world;
-            this.player = player;
-            this.coordinates = coordinates;
-            this.blockStates = blockStates;
-            this.itemStacks = itemStacks;
-            this.placeStartPos = placeStartPos;
-            this.ticksTillPlacement = ticksTillPlacement;
-        }
-
-        public void place() {
-            //remember previous blockstates for undo
-            List<BlockState> previousBlockStates = new ArrayList<>(coordinates.size());
-            for (BlockPos coordinate : coordinates) {
-                previousBlockStates.add(world.getBlockState(coordinate));
-            }
-
-			for (int i = placeStartPos ? 0 : 1; i < coordinates.size(); i++) {
-				BlockPos blockPos = coordinates.get(i);
-				BlockState blockState = blockStates.get(i);
-				ItemStack itemStack = itemStacks.get(i);
-
-				if (world.isLoaded(blockPos)) {
-					//check itemstack empty
-					if (itemStack.isEmpty()) {
-						//try to find new stack, otherwise continue
-						itemStack = InventoryHelper.findItemStackInInventory(player, blockState.getBlock());
-						if (itemStack.isEmpty()) continue;
-					}
-					SurvivalHelper.placeBlock(world, player, blockPos, blockState, itemStack, false, false, false);
-				}
-			}
-
-            //find actual new blockstates for undo
-            List<BlockState> newBlockStates = new ArrayList<>(coordinates.size());
-            for (BlockPos coordinate : coordinates) {
-                newBlockStates.add(world.getBlockState(coordinate));
-            }
-
-            //Set first previousBlockState to empty if in NORMAL mode, to make undo/redo work
-            //(Block is placed by the time it gets here, and unplaced after this)
-            if (!placeStartPos) previousBlockStates.set(0, Blocks.AIR.defaultBlockState());
-
-            //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.defaultBlockState()) != newBlockStates.size()) {
-                //add to undo stack
-                BlockPos firstPos = coordinates.get(0);
-                BlockPos secondPos = coordinates.get(coordinates.size() - 1);
-                UndoRedo.addUndo(player, new UndoRedoBlockSet(coordinates, previousBlockStates, newBlockStates, firstPos, secondPos));
-            }
-        }
-
-    }
-}
diff --git a/src/main/java/nl/requios/effortlessbuilding/systems/ServerBlockPlacer.java b/src/main/java/nl/requios/effortlessbuilding/systems/ServerBlockPlacer.java
index 85d3796..3258d86 100644
--- a/src/main/java/nl/requios/effortlessbuilding/systems/ServerBlockPlacer.java
+++ b/src/main/java/nl/requios/effortlessbuilding/systems/ServerBlockPlacer.java
@@ -18,25 +18,42 @@ import net.minecraft.world.level.block.state.pattern.BlockInWorld;
 import net.minecraftforge.common.util.BlockSnapshot;
 import net.minecraftforge.event.ForgeEventFactory;
 import net.minecraftforge.items.ItemHandlerHelper;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.create.foundation.utility.BlockHelper;
 import nl.requios.effortlessbuilding.utilities.BlockEntry;
 import nl.requios.effortlessbuilding.utilities.BlockSet;
 
-import java.util.List;
+import java.util.*;
 
 // Receives block placement requests from the client and places them
 public class ServerBlockPlacer {
+    private final Set<DelayedEntry> delayedEntries = Collections.synchronizedSet(new HashSet<>());
+    private final Set<DelayedEntry> delayedEntriesView = Collections.unmodifiableSet(delayedEntries);
     private boolean isPlacingOrBreakingBlocks = false;
 
+    public void placeBlocksDelayed(Player player, BlockSet blocks, long placeTime) {
+    
+        delayedEntries.add(new DelayedEntry(player, blocks, placeTime));
+    }
+    
+    public void tick() {
+        for (DelayedEntry entry : delayedEntries) {
+            long gameTime = entry.player.level.getGameTime();
+            if (gameTime >= entry.placeTime) {
+                placeBlocks(entry.player, entry.blocks);
+                delayedEntries.remove(entry);
+            }
+        }
+    }
+    
     public void placeBlocks(Player player, BlockSet blocks) {
 //        EffortlessBuilding.log(player, "Placing " + blocks.size() + " blocks");
-
+        
         for (BlockEntry block : blocks) {
+            if (blocks.skipFirst && block.blockPos == blocks.firstPos) continue;
             placeBlock(player, block);
         }
     }
-
+    
     public void placeBlock(Player player, BlockEntry block) {
         Level world = player.level;
         if (!world.isLoaded(block.blockPos)) return;
@@ -45,15 +62,16 @@ public class ServerBlockPlacer {
         boolean placedBlock = onPlaceItemIntoWorld(player, block) == InteractionResult.SUCCESS;
         isPlacingOrBreakingBlocks = false;
     }
-
+    
     public void breakBlocks(Player player, BlockSet blocks) {
 //        EffortlessBuilding.log(player, "Breaking " + blocks.size() + " blocks");
 
         for (BlockEntry block : blocks) {
+            if (blocks.skipFirst && block.blockPos == blocks.firstPos) continue;
             breakBlock(player, block);
         }
     }
-
+    
     public void breakBlock(Player player, BlockEntry block) {
         ServerLevel world = (ServerLevel) player.level;
         if (!world.isLoaded(block.blockPos) || world.isEmptyBlock(block.blockPos)) return;
@@ -66,10 +84,16 @@ public class ServerBlockPlacer {
         });
         isPlacingOrBreakingBlocks = false;
     }
-
+    
+    public Set<DelayedEntry> getDelayedEntries() {
+        return delayedEntriesView;
+    }
+    
     public boolean isPlacingOrBreakingBlocks() {
         return isPlacingOrBreakingBlocks;
     }
+    
+    public record DelayedEntry(Player player, BlockSet blocks, long placeTime) {}
 
     //ForgeHooks::onPlaceItemIntoWorld
     private InteractionResult onPlaceItemIntoWorld(Player player, BlockEntry block) {
@@ -91,7 +115,9 @@ public class ServerBlockPlacer {
             level.captureBlockSnapshots = true;
 
         ItemStack copy = itemstack.copy();
+        ////
         BlockHelper.placeSchematicBlock(level, player, block.newBlockState, block.blockPos, block.itemStack, null);
+        ////
         InteractionResult ret = InteractionResult.SUCCESS;
         if (itemstack.isEmpty())
             ForgeEventFactory.onPlayerDestroyItem(player, copy, InteractionHand.MAIN_HAND);
diff --git a/src/main/java/nl/requios/effortlessbuilding/utilities/BlockEntry.java b/src/main/java/nl/requios/effortlessbuilding/utilities/BlockEntry.java
index 62094ff..fbd3c18 100644
--- a/src/main/java/nl/requios/effortlessbuilding/utilities/BlockEntry.java
+++ b/src/main/java/nl/requios/effortlessbuilding/utilities/BlockEntry.java
@@ -39,7 +39,8 @@ public class BlockEntry {
         this.itemStack = itemStack;
 
         Block block = Block.byItem(itemStack.getItem());
-        var direction = rotation.rotate(originalDirection);
+        var direction = originalDirection;
+        if (rotation != null) direction = rotation.rotate(direction);
         direction = applyMirror(direction);
         //TODO mirror and rotate relativeHitVec?
         var blockPlaceContext = new MyPlaceContext(world, blockPos, direction, itemStack, clickedFace, relativeHitVec);
@@ -47,9 +48,9 @@ public class BlockEntry {
     }
 
     private Direction applyMirror(Direction direction) {
-        if (mirrorX && direction.getAxis() == Direction.Axis.Z) direction = direction.getOpposite();
+        if (mirrorX && direction.getAxis() == Direction.Axis.X) direction = direction.getOpposite();
         if (mirrorY && direction.getAxis() == Direction.Axis.Y) direction = direction.getOpposite();
-        if (mirrorZ && direction.getAxis() == Direction.Axis.X) direction = direction.getOpposite();
+        if (mirrorZ && direction.getAxis() == Direction.Axis.Z) direction = direction.getOpposite();
         return direction;
     }
 
diff --git a/src/main/java/nl/requios/effortlessbuilding/utilities/BlockSet.java b/src/main/java/nl/requios/effortlessbuilding/utilities/BlockSet.java
index 9a379a6..b334f49 100644
--- a/src/main/java/nl/requios/effortlessbuilding/utilities/BlockSet.java
+++ b/src/main/java/nl/requios/effortlessbuilding/utilities/BlockSet.java
@@ -19,6 +19,7 @@ public class BlockSet extends HashMap<BlockPos, BlockEntry> implements Iterable<
 
     public BlockPos firstPos;
     public BlockPos lastPos;
+    public boolean skipFirst;
 
     public BlockSet() {
         super();
@@ -28,13 +29,17 @@ public class BlockSet extends HashMap<BlockPos, BlockEntry> implements Iterable<
         super(blockSet);
         this.firstPos = blockSet.firstPos;
         this.lastPos = blockSet.lastPos;
+        this.skipFirst = blockSet.skipFirst;
     }
 
-    public BlockSet(List<BlockEntry> blockEntries) {
+    public BlockSet(List<BlockEntry> blockEntries, BlockPos firstPos, BlockPos lastPos, boolean skipFirst) {
         super();
         for (BlockEntry blockEntry : blockEntries) {
             add(blockEntry);
         }
+        this.firstPos = firstPos;
+        this.lastPos = lastPos;
+        this.skipFirst = skipFirst;
     }
 
     public void setStartPos(BlockEntry startPos) {
@@ -74,10 +79,17 @@ public class BlockSet extends HashMap<BlockPos, BlockEntry> implements Iterable<
 
     public static void encode(FriendlyByteBuf buf, BlockSet block) {
         buf.writeCollection(block.values(), BlockEntry::encode);
+        buf.writeBlockPos(block.firstPos);
+        buf.writeBlockPos(block.lastPos);
+        buf.writeBoolean(block.skipFirst);
     }
 
     public static BlockSet decode(FriendlyByteBuf buf) {
-        return new BlockSet(buf.readList(BlockEntry::decode));
+        return new BlockSet(
+            buf.readList(BlockEntry::decode),
+            buf.readBlockPos(),
+            buf.readBlockPos(),
+            buf.readBoolean());
     }
 
     @OnlyIn(Dist.CLIENT)
diff --git a/src/main/java/nl/requios/effortlessbuilding/utilities/MathHelper.java b/src/main/java/nl/requios/effortlessbuilding/utilities/MathHelper.java
index 2fc5caf..8ed6188 100644
--- a/src/main/java/nl/requios/effortlessbuilding/utilities/MathHelper.java
+++ b/src/main/java/nl/requios/effortlessbuilding/utilities/MathHelper.java
@@ -1,6 +1,7 @@
 package nl.requios.effortlessbuilding.utilities;
 
 import net.minecraft.core.Vec3i;
+import net.minecraft.world.phys.Vec3;
 
 public class MathHelper {
 
@@ -12,6 +13,15 @@ public class MathHelper {
             default -> throw new IllegalArgumentException("Index must be between 0 and 2");
         };
     }
+    
+    public static Vec3 with(Vec3 vec, int index, double value) {
+        return switch (index) {
+            case 0 -> new Vec3(value, vec.y, vec.z);
+            case 1 -> new Vec3(vec.x, value, vec.z);
+            case 2 -> new Vec3(vec.x, vec.y, value);
+            default -> throw new IllegalArgumentException("Index must be between 0 and 2");
+        };
+    }
 
     public static int get(Vec3i vec, int index) {
         return switch (index) {
@@ -21,4 +31,13 @@ public class MathHelper {
             default -> throw new IllegalArgumentException("Index must be between 0 and 2");
         };
     }
+    
+    public static double get(Vec3 vec, int index) {
+        return switch (index) {
+            case 0 -> vec.x;
+            case 1 -> vec.y;
+            case 2 -> vec.z;
+            default -> throw new IllegalArgumentException("Index must be between 0 and 2");
+        };
+    }
 }
diff --git a/src/main/java/nl/requios/effortlessbuilding/utilities/ReachHelper.java b/src/main/java/nl/requios/effortlessbuilding/utilities/ReachHelper.java
index 693df42..3d032d3 100644
--- a/src/main/java/nl/requios/effortlessbuilding/utilities/ReachHelper.java
+++ b/src/main/java/nl/requios/effortlessbuilding/utilities/ReachHelper.java
@@ -58,6 +58,10 @@ public class ReachHelper {
 			default -> CommonConfig.reach.maxReachLevel0.get();
 		};
 	}
+	
+	public static int getMaxMirrorRadius(Player player) {
+		return getMaxReach(player) / 2;
+	}
 
 	public static int getPlacementReach(Player player) {
 		return getMaxReach(player) / 4;
diff --git a/src/main/resources/assets/effortlessbuilding/lang/en_us.json b/src/main/resources/assets/effortlessbuilding/lang/en_us.json
index 02281b7..a971a10 100644
--- a/src/main/resources/assets/effortlessbuilding/lang/en_us.json
+++ b/src/main/resources/assets/effortlessbuilding/lang/en_us.json
@@ -89,5 +89,6 @@
   "effortlessbuilding.gui.scrollInput.scrollToModify": "Scroll to Modify",
   "effortlessbuilding.gui.scrollInput.scrollToAdjustAmount": "Scroll to Adjust Amount",
   "effortlessbuilding.gui.scrollInput.scrollToSelect": "Scroll to Select",
-  "effortlessbuilding.gui.scrollInput.shiftScrollsFaster": "Shift to Scroll Faster"
+  "effortlessbuilding.gui.scrollInput.shiftScrollsFaster": "Shift to Scroll Faster",
+  "effortlessbuilding.gui.scrollInput.controlScrollsSlower": "Control to Scroll Slower"
 }
diff --git a/src/main/resources/assets/effortlessbuilding/textures/gui/modifiers.png b/src/main/resources/assets/effortlessbuilding/textures/gui/modifiers.png
index 335d6044ea09228d98cbf58e69127061583e7a42..e5899f630308655569521bf39e9018f93cb97431 100644
GIT binary patch
literal 8154
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
N>Ng6noA?tx{{^-h&OiVF

literal 2405
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