From 2a84c7ca410bfc09c2327416a6a63728b75caf35 Mon Sep 17 00:00:00 2001
From: Christian <christianknaapen@hotmail.com>
Date: Sat, 28 Jan 2023 18:19:57 +0100
Subject: [PATCH] WIP Continued modifier settings gui overhaul

---
 .../effortlessbuilding/AllGuiTextures.java    |  64 +++++++++++++++++
 .../buildmodifier/BaseModifier.java           |   2 +-
 .../foundation/gui/widget/ScrollInput.java    |   2 +
 .../gui/buildmodifier/ArrayEntry.java         |  67 +++++++++++++-----
 .../gui/buildmodifier/BaseModifierEntry.java  |  51 +++++++++----
 .../gui/buildmodifier/MirrorEntry.java        |   6 +-
 .../gui/buildmodifier/ModifiersScreen.java    |  57 +++++++++++----
 .../buildmodifier/ModifiersScreenList.java    |  64 ++++++++++++++---
 .../gui/buildmodifier/RadialMirrorEntry.java  |   6 +-
 .../assets/effortlessbuilding/lang/en_us.json |  10 ++-
 .../textures/gui/display_link.png             | Bin 1164 -> 0 bytes
 .../textures/gui/modifiers.png                | Bin 0 -> 2405 bytes
 12 files changed, 269 insertions(+), 60 deletions(-)
 create mode 100644 src/main/java/nl/requios/effortlessbuilding/AllGuiTextures.java
 delete mode 100644 src/main/resources/assets/effortlessbuilding/textures/gui/display_link.png
 create mode 100644 src/main/resources/assets/effortlessbuilding/textures/gui/modifiers.png

diff --git a/src/main/java/nl/requios/effortlessbuilding/AllGuiTextures.java b/src/main/java/nl/requios/effortlessbuilding/AllGuiTextures.java
new file mode 100644
index 0000000..3843a43
--- /dev/null
+++ b/src/main/java/nl/requios/effortlessbuilding/AllGuiTextures.java
@@ -0,0 +1,64 @@
+package nl.requios.effortlessbuilding;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.GuiComponent;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import nl.requios.effortlessbuilding.create.foundation.gui.UIRenderHelper;
+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),
+    ;
+    public final ResourceLocation location;
+    public int width, height;
+    public int startX, startY;
+    private AllGuiTextures(String location, int width, int height) {
+        this(location, 0, 0, width, height);
+    }
+    
+    private AllGuiTextures(int startX, int startY) {
+        this("icons", startX * 16, startY * 16, 16, 16);
+    }
+    
+    private AllGuiTextures(String location, int startX, int startY, int width, int height) {
+        this(EffortlessBuilding.MODID, location, startX, startY, width, height);
+    }
+    
+    private AllGuiTextures(String namespace, String location, int startX, int startY, int width, int height) {
+        this.location = new ResourceLocation(namespace, "textures/gui/" + location + ".png");
+        this.width = width;
+        this.height = height;
+        this.startX = startX;
+        this.startY = startY;
+    }
+    
+    @OnlyIn(Dist.CLIENT)
+    public void bind() {
+        RenderSystem.setShaderTexture(0, location);
+    }
+    
+    @OnlyIn(Dist.CLIENT)
+    @Override
+    public void render(PoseStack ms, int x, int y) {
+        bind();
+        GuiComponent.blit(ms, x, y, 0, startX, startY, width, height, 256, 256);
+    }
+    
+    @OnlyIn(Dist.CLIENT)
+    public void render(PoseStack ms, int x, int y, GuiComponent component) {
+        bind();
+        component.blit(ms, x, y, startX, startY, width, height);
+    }
+    
+    @OnlyIn(Dist.CLIENT)
+    public void render(PoseStack ms, int x, int y, Color c) {
+        bind();
+        UIRenderHelper.drawColoredTexture(ms, c, x, y, startX, startY, width, height);
+    }
+}
diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/BaseModifier.java b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/BaseModifier.java
index c629147..cc3d345 100644
--- a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/BaseModifier.java
+++ b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/BaseModifier.java
@@ -6,7 +6,7 @@ import net.minecraft.world.entity.player.Player;
 import nl.requios.effortlessbuilding.utilities.BlockSet;
 
 public abstract class BaseModifier {
-    public boolean enabled = false;
+    public boolean enabled = true;
 
     public abstract void findCoordinates(BlockSet blocks, Player player);
 
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 fa27a6f..44423b3 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
@@ -106,6 +106,8 @@ public class ScrollInput extends AbstractSimiWidget {
 
 	@Override
 	public boolean mouseScrolled(double mouseX, double mouseY, double delta) {
+		if (!this.visible || !this.isHovered) return false; //Added
+		
 		if (inverted)
 			delta *= -1;
 
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 1b01e49..7ef3f81 100644
--- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ArrayEntry.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ArrayEntry.java
@@ -9,9 +9,11 @@ import net.minecraft.network.chat.Component;
 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.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;
@@ -31,10 +33,11 @@ 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(BaseModifier array) {
-		super((Array) array);
+	public ArrayEntry(ModifiersScreen screen, BaseModifier array) {
+		super(screen, (Array) array, Component.literal("Array"), AllGuiTextures.ARRAY_ENTRY);
 
 		offsetInputs.clear();
 		offsetLabels.clear();
@@ -43,7 +46,7 @@ public class ArrayEntry extends BaseModifierEntry<Array> {
 			var label = new Label(0, 0, Components.immutableEmpty()).withShadow();
 
 			final int index = i;
-			var scrollInput = new ScrollInput(0, 0, 20, 20)
+			var scrollInput = new ScrollInput(0, 0, 18, 18)
 				.withRange(0, 100)
 				.writingTo(label)
 				.titled(Component.literal("Offset"))
@@ -53,7 +56,6 @@ public class ArrayEntry extends BaseModifierEntry<Array> {
 					onValueChanged();
 				});
 			scrollInput.setState(MathHelper.get(modifier.offset, index));
-			scrollInput.onChanged();
 
 			offsetInputs.add(scrollInput);
 			offsetLabels.add(label);
@@ -62,22 +64,26 @@ public class ArrayEntry extends BaseModifierEntry<Array> {
 		listeners.addAll(offsetInputs);
 		listeners.addAll(offsetLabels);
 
-		countInput = new ScrollInput(0, 0, 20, 20)
+		countLabel = new Label(0, 0, Components.immutableEmpty()).withShadow();
+		countInput = new ScrollInput(0, 0, 18, 18)
 			.withRange(1, 100)
+			.writingTo(countLabel)
 			.titled(Component.literal("Count"))
 			.calling(value -> {
 				modifier.count = value;
 				onValueChanged();
 			});
-
 		countInput.setState(modifier.count);
-		countInput.onChanged();
-
 		listeners.add(countInput);
+		listeners.add(countLabel);
 
-		reachLabel = new Label(100, 100, Components.immutableEmpty()).withShadow();
+		reachLabel = new Label(0, 0, Components.immutableEmpty()).withShadow();
+		listeners.add(reachLabel);
 
-		onValueChanged();
+		for (int i = 0; i < 3; i++) {
+			offsetInputs.get(i).onChanged();
+		}
+		countInput.onChanged();
 	}
 
 	@Override
@@ -86,24 +92,51 @@ public class ArrayEntry extends BaseModifierEntry<Array> {
 		offsetInputs.forEach(ScrollInput::tick);
 		offsetLabels.forEach(Label::tick);
 		countInput.tick();
-
-		int currentReach = Math.max(-1, getArrayReach());
-		int maxReach = ReachHelper.getMaxReach(Minecraft.getInstance().player);
-		ChatFormatting reachColor = isCurrentReachValid(currentReach, maxReach) ? ChatFormatting.GRAY : ChatFormatting.RED;
-		var reachText = "Reach: " + reachColor + currentReach + ChatFormatting.GRAY + "/" + ChatFormatting.GRAY + maxReach;
-		reachLabel.text = Component.literal(reachText);
 	}
 
 	@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 + 75 + 20 * i;
+			offsetLabels.get(i).y = y + 24;
+			offsetLabels.get(i).render(ms, mouseX, mouseY, partialTicks);
+		}
+		
+		//draw offset inputs
+		for (int i = 0; i < 3; i++) {
+			offsetInputs.get(i).x = x + 75 + 20 * i;
+			offsetInputs.get(i).y = y + 24;
+			offsetInputs.get(i).render(ms, mouseX, mouseY, partialTicks);
+		}
+		
+		//draw count label
+		countLabel.x = x + 140;
+		countLabel.y = y + 24;
+		countLabel.render(ms, mouseX, mouseY, partialTicks);
+		
+		//draw count input
+		countInput.x = x + 140;
+		countInput.y = y + 24;
+		countInput.render(ms, mouseX, mouseY, partialTicks);
+		
+		//draw reach label
+		reachLabel.x = x + width - 125;
+		reachLabel.y = y + 40;
+		reachLabel.render(ms, mouseX, mouseY, partialTicks);
 	}
 
 	@Override
 	public void onValueChanged() {
 		super.onValueChanged();
-
+		
+		int currentReach = Math.max(-1, getArrayReach());
+		int maxReach = ReachHelper.getMaxReach(Minecraft.getInstance().player);
+		ChatFormatting reachColor = isCurrentReachValid(currentReach, maxReach) ? ChatFormatting.GRAY : ChatFormatting.RED;
+		var reachText = "Reach: " + reachColor + currentReach + ChatFormatting.GRAY + "/" + ChatFormatting.GRAY + maxReach;
+		reachLabel.text = Component.literal(reachText);
 	}
 
 	private int getArrayReach() {
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 8aa7718..c397792 100644
--- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/BaseModifierEntry.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/BaseModifierEntry.java
@@ -1,48 +1,75 @@
 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.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.IconButton;
+import nl.requios.effortlessbuilding.create.foundation.gui.widget.Label;
 import nl.requios.effortlessbuilding.gui.elements.GuiCollapsibleScrollEntry;
 import nl.requios.effortlessbuilding.gui.elements.GuiScrollPane;
 
 public abstract class BaseModifierEntry<T extends BaseModifier> extends ModifiersScreenList.Entry {
 
     public T modifier;
-    BoxWidget enableButton;
+    protected AllGuiTextures background;
+    protected IconButton enableButton;
+    protected Label nameLabel;
+    protected IconButton removeButton;
 
-    public BaseModifierEntry(T modifier) {
-        super();
+    public BaseModifierEntry(ModifiersScreen screen, T modifier, Component name, AllGuiTextures background) {
+        super(screen);
 
         this.modifier = modifier;
+        this.background = background;
 
-        enableButton = new BoxWidget()
-            .showingElement(AllIcons.I_CONFIRM.asStencil())
+        enableButton = new IconButton(35, 8, AllIcons.I_PLACE)
             .withCallback(() -> {
                 modifier.enabled = !modifier.enabled;
                 onValueChanged();
             });
+        listeners.add(enableButton);
+        
+        nameLabel = new Label(65, 8, name);
+        nameLabel.text = name;
+        
+        removeButton = new IconButton(0, 0, AllIcons.I_TRASH)
+            .withCallback(() -> {
+                screen.removeModifier(this);
+            });
+        listeners.add(removeButton);
     }
 
     @Override
     public void tick() {
         super.tick();
-        enableButton.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) {
-        super.render(ms, index, y, x, width, height, mouseX, mouseY, p_230432_9_, partialTicks);
 
-        enableButton.x = x + width - 80;
-        enableButton.y = y + 10;
-        enableButton.setWidth(35);
-        enableButton.setHeight(height - 20);
+        background.render(ms, x + 22, y, screen);
+        
+        enableButton.x = x + width - 60;
+        enableButton.y = y + 18;
         enableButton.render(ms, mouseX, mouseY, partialTicks);
+        
+        nameLabel.x = x + 65;
+        nameLabel.y = y + 4;
+        nameLabel.render(ms, mouseX, mouseY, partialTicks);
+        
+        removeButton.x = x + width - 60;
+        removeButton.y = y + 38;
+        removeButton.render(ms, mouseX, mouseY, partialTicks);
+        
+        super.render(ms, index, y, x, width, height, mouseX, mouseY, p_230432_9_, partialTicks);
     }
 
     public void onValueChanged() {
-        enableButton.showingElement(modifier.enabled ? AllIcons.I_CONFIRM.asStencil() : AllIcons.I_DISABLE.asStencil());
+        enableButton.setIcon(modifier.enabled ? AllIcons.I_PLACE : AllIcons.I_CLEAR);
     }
 }
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 d481e9d..87e98b5 100644
--- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/MirrorEntry.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/MirrorEntry.java
@@ -10,9 +10,11 @@ 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.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.utilities.ReachHelper;
 
@@ -24,8 +26,8 @@ import java.util.List;
 @OnlyIn(Dist.CLIENT)
 public class MirrorEntry extends BaseModifierEntry<Mirror> {
 
-	public MirrorEntry(BaseModifier modifier) {
-		super((Mirror) modifier);
+	public MirrorEntry(ModifiersScreen screen, BaseModifier modifier) {
+		super(screen, (Mirror) modifier, Component.literal("Mirror"), AllGuiTextures.MIRROR_ENTRY);
 	}
 
 
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 56e80b4..7ed6340 100644
--- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifiersScreen.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifiersScreen.java
@@ -14,6 +14,9 @@ import nl.requios.effortlessbuilding.buildmodifier.BaseModifier;
 import nl.requios.effortlessbuilding.buildmodifier.Mirror;
 import nl.requios.effortlessbuilding.buildmodifier.RadialMirror;
 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.utility.Components;
 import nl.requios.effortlessbuilding.gui.elements.GuiScrollPane;
 import nl.requios.effortlessbuilding.network.PacketHandler;
 
@@ -25,7 +28,10 @@ import java.util.Map;
 @OnlyIn(Dist.CLIENT)
 public class ModifiersScreen extends AbstractSimiScreen {
 	protected ModifiersScreenList list;
-	private Button buttonClose;
+	protected BoxWidget addArrayButton;
+	protected BoxWidget addMirrorButton;
+	protected BoxWidget addRadialMirrorButton;
+	protected BoxWidget closeButton;
 
 	public ModifiersScreen() {
 		super(Component.translatable("effortlessbuilding.screen.modifier_settings"));
@@ -41,23 +47,46 @@ 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, 35, height - 45, 40);
+		list = new ModifiersScreenList(minecraft, listWidth, height - 80, 45, height - 45, 60);
 		list.setLeftPos(this.width / 2 - list.getWidth() / 2);
 
 		addRenderableWidget(list);
 
 		initScrollEntries();
 
-		//Close button
-		int y = height - 26;
-		buttonClose = new Button(width / 2 - 100, y, 200, 20, Component.literal("Close"), (button) -> {
-			Minecraft.getInstance().player.closeContainer();
-		});
-		addRenderableOnly(buttonClose);
+		addArrayButton = new BoxWidget(listR - 90, 10, 20, 20)
+			.withPadding(2, 2)
+			.withCallback(() -> addModifier(new Array()));
+		addArrayButton.showingElement(AllIcons.I_ADD.asStencil().withElementRenderer(BoxWidget.gradientFactory.apply(addArrayButton)));
+		addArrayButton.getToolTip().add(Components.literal("Add Array"));
+		
+		addMirrorButton = new BoxWidget(listR - 60, 10, 20, 20)
+			.withPadding(2, 2)
+			.withCallback(() -> addModifier(new Mirror()));
+		addMirrorButton.showingElement(AllIcons.I_ADD.asStencil().withElementRenderer(BoxWidget.gradientFactory.apply(addMirrorButton)));
+		addMirrorButton.getToolTip().add(Components.literal("Add Mirror"));
+		
+		addRadialMirrorButton = new BoxWidget(listR - 30, 10, 20, 20)
+			.withPadding(2, 2)
+			.withCallback(() -> addModifier(new RadialMirror()));
+		addRadialMirrorButton.showingElement(AllIcons.I_ADD.asStencil().withElementRenderer(BoxWidget.gradientFactory.apply(addRadialMirrorButton)));
+		addRadialMirrorButton.getToolTip().add(Components.literal("Add Radial Mirror"));
+
+		closeButton = new BoxWidget(listL - 30, yCenter - 10, 20, 20)
+			.withPadding(2, 2)
+			.withCallback(this::onClose);
+		closeButton.showingElement(AllIcons.I_CONFIG_BACK.asStencil().withElementRenderer(BoxWidget.gradientFactory.apply(closeButton)));
+		closeButton.getToolTip().add(Components.literal("Close"));
+
+		addRenderableWidget(addArrayButton);
+		addRenderableWidget(addMirrorButton);
+		addRenderableWidget(addRadialMirrorButton);
+		addRenderableWidget(closeButton);
 	}
 
 	private void initScrollEntries() {
 
+		list.children().clear();
 		var modifierSettingsList = EffortlessBuildingClient.BUILD_MODIFIERS.getModifierSettingsList();
 		for (BaseModifier modifier : modifierSettingsList) {
 			var entry = createModifierPanel(modifier);
@@ -67,11 +96,11 @@ public class ModifiersScreen extends AbstractSimiScreen {
 
 	private BaseModifierEntry createModifierPanel(BaseModifier modifier) {
 		if (modifier instanceof Mirror) {
-			return new MirrorEntry(modifier);
+			return new MirrorEntry(this, modifier);
 		} else if (modifier instanceof Array) {
-			return new ArrayEntry(modifier);
+			return new ArrayEntry(this, modifier);
 		} else if (modifier instanceof RadialMirror) {
-			return new RadialMirrorEntry(modifier);
+			return new RadialMirrorEntry(this, modifier);
 		} else {
 			return null;
 		}
@@ -83,7 +112,7 @@ public class ModifiersScreen extends AbstractSimiScreen {
 		EffortlessBuildingClient.BUILD_MODIFIERS.addModifierSettings(modifier);
 	}
 
-	private void removeModifier(BaseModifierEntry entry) {
+	public void removeModifier(BaseModifierEntry entry) {
 		list.children().remove(entry);
 		EffortlessBuildingClient.BUILD_MODIFIERS.removeModifierSettings(entry.modifier);
 	}
@@ -97,7 +126,7 @@ public class ModifiersScreen extends AbstractSimiScreen {
 
 	@Override
 	protected void renderWindow(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
-
+	
 	}
 
 	@Override
@@ -109,7 +138,7 @@ public class ModifiersScreen extends AbstractSimiScreen {
 	@Override
 	public boolean keyPressed(int keyCode, int p_96553_, int p_96554_) {
 		if (keyCode == ClientEvents.keyBindings[1].getKey().getValue()) {
-			minecraft.player.closeContainer();
+			onClose();
 			return true;
 		}
 
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 c37bcf0..31ba404 100644
--- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifiersScreenList.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifiersScreenList.java
@@ -7,21 +7,21 @@ import net.minecraft.client.Minecraft;
 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;
 import nl.requios.effortlessbuilding.create.foundation.utility.Color;
 import nl.requios.effortlessbuilding.create.foundation.utility.Components;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 //Based on Create's ConfigScreenList
 public class ModifiersScreenList extends ObjectSelectionList<ModifiersScreenList.Entry> implements TickableGuiEventListener {
 
-    public ModifiersScreenList(Minecraft pMinecraft, int pWidth, int pHeight, int pY0, int pY1, int pItemHeight) {
-        super(pMinecraft, pWidth, pHeight, pY0, pY1, pItemHeight);
+    public ModifiersScreenList(Minecraft mc, int width, int height, int y0, int y1, int itemHeight) {
+        super(mc, width, height, y0, y1, itemHeight);
         setRenderBackground(false);
         setRenderTopAndBottom(false);
         setRenderSelection(false);
@@ -50,11 +50,32 @@ public class ModifiersScreenList extends ObjectSelectionList<ModifiersScreenList
 
     @Override
     public boolean mouseClicked(double x, double y, int button) {
-        children().stream().forEach(e -> e.mouseClicked(x, y, button));
-
+        if (children().stream().anyMatch(e -> e.mouseClicked(x, y, button)))
+            return true;
         return super.mouseClicked(x, y, button);
     }
-
+    
+    @Override
+    public boolean keyPressed(int pKeyCode, int pScanCode, int pModifiers) {
+        if (children().stream().anyMatch(e -> e.keyPressed(pKeyCode, pScanCode, pModifiers)))
+            return true;
+        return super.keyPressed(pKeyCode, pScanCode, pModifiers);
+    }
+    
+    @Override
+    public boolean charTyped(char pCodePoint, int pModifiers) {
+        if (children().stream().anyMatch(e -> e.charTyped(pCodePoint, pModifiers)))
+            return true;
+        return super.charTyped(pCodePoint, pModifiers);
+    }
+    
+    @Override
+    public boolean mouseScrolled(double pMouseX, double pMouseY, double pDelta) {
+        if (children().stream().anyMatch(e -> e.mouseScrolled(pMouseX, pMouseY, pDelta)))
+            return true;
+        return super.mouseScrolled(pMouseX, pMouseY, pDelta);
+    }
+    
     @Override
     public int getRowWidth() {
         return width - 16;
@@ -71,9 +92,11 @@ public class ModifiersScreenList extends ObjectSelectionList<ModifiersScreenList
     }
 
     public static abstract class Entry extends ObjectSelectionList.Entry<Entry> implements TickableGuiEventListener {
+        protected final ModifiersScreen screen;
         protected List<GuiEventListener> listeners;
 
-        protected Entry() {
+        protected Entry(ModifiersScreen screen) {
+            this.screen = screen;
             listeners = new ArrayList<>();
         }
 
@@ -91,9 +114,30 @@ public class ModifiersScreenList extends ObjectSelectionList<ModifiersScreenList
         public boolean charTyped(char ch, int modifiers) {
             return getGuiListeners().stream().anyMatch(l -> l.charTyped(ch, modifiers));
         }
-
+    
         @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) {}
+        public boolean mouseScrolled(double x, double y, double delta) {
+            return getGuiListeners().stream().anyMatch(l -> l.mouseScrolled(x, y, delta));
+        }
+    
+        @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) {
+    
+//            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);
+    
+            for (var listener : listeners) {
+                if (listener instanceof AbstractSimiWidget simiWidget && simiWidget.isHoveredOrFocused()
+                    && simiWidget.visible) {
+                    List<Component> tooltip = simiWidget.getToolTip();
+                    if (tooltip.isEmpty())
+                        continue;
+                    int ttx = simiWidget.lockedTooltipX == -1 ? mouseX : simiWidget.lockedTooltipX + simiWidget.x;
+                    int tty = simiWidget.lockedTooltipY == -1 ? mouseY : simiWidget.lockedTooltipY + simiWidget.y;
+                    screen.renderComponentTooltip(ms, tooltip, ttx, tty);
+                }
+            }
+        }
 
         @Override
         public void tick() {}
diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/RadialMirrorEntry.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/RadialMirrorEntry.java
index 55ed588..54bb67d 100644
--- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/RadialMirrorEntry.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/RadialMirrorEntry.java
@@ -10,9 +10,11 @@ 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.buildmodifier.BaseModifier;
 import nl.requios.effortlessbuilding.buildmodifier.RadialMirror;
+import nl.requios.effortlessbuilding.create.foundation.gui.AbstractSimiScreen;
 import nl.requios.effortlessbuilding.gui.elements.*;
 import nl.requios.effortlessbuilding.utilities.ReachHelper;
 
@@ -24,8 +26,8 @@ import java.util.List;
 @OnlyIn(Dist.CLIENT)
 public class RadialMirrorEntry extends BaseModifierEntry<RadialMirror> {
 
-	public RadialMirrorEntry(BaseModifier modifier) {
-		super((RadialMirror) modifier);
+	public RadialMirrorEntry(ModifiersScreen screen, BaseModifier modifier) {
+		super(screen, (RadialMirror) modifier, Component.literal("Radial Mirror"), AllGuiTextures.RADIAL_MIRROR_ENTRY);
 	}
 
 //	protected static final ResourceLocation BUILDING_ICONS = new ResourceLocation(EffortlessBuilding.MODID, "textures/gui/building_icons.png");
diff --git a/src/main/resources/assets/effortlessbuilding/lang/en_us.json b/src/main/resources/assets/effortlessbuilding/lang/en_us.json
index 389201c..02281b7 100644
--- a/src/main/resources/assets/effortlessbuilding/lang/en_us.json
+++ b/src/main/resources/assets/effortlessbuilding/lang/en_us.json
@@ -83,5 +83,11 @@
   "effortlessbuilding.action.thickness_3": "3 Blocks Thick",
   "effortlessbuilding.action.thickness_5": "5 Blocks Thick",
   "effortlessbuilding.action.start_center": "Middle",
-  "effortlessbuilding.action.start_corner": "Corner"
-}
\ No newline at end of file
+  "effortlessbuilding.action.start_corner": "Corner",
+
+  "effortlessbuilding.gui.scrollInput.defaultTitle": "Choose an Option:",
+  "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"
+}
diff --git a/src/main/resources/assets/effortlessbuilding/textures/gui/display_link.png b/src/main/resources/assets/effortlessbuilding/textures/gui/display_link.png
deleted file mode 100644
index 35c88f4640b743bd2e441b0f7b3014d0f4aa1d7e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1164
zcmZWoX;4#F6h80eJxIcmus9ToG@Ys~R2D%bv;`6-NEpf@f(fBe&^Cb3vPFpC;B#kj
z5U@q4HrRm?1SUXb)8Y_10y0>ZDnmdbfwF`Fl(ryag`_Xk_D}D8cfNb(eCOQn+?ksn
z8tiXEx1j@oNdTW027r)91gI2}k{X2JBw_K~ATB`j6{F2KoQ!Fy{KyOd({BAnI!cmO
z^d%W#{=Og|v|S{Fg3wRH{Ycj7bTczEO69mxsT>;{`=k4--rnAhj*jZ;>Z+=$uJ3ro
z#l?k%g;J?hB9Ww|q=?00fj|%u5fSQbALEL6dU{6hgJ>7{jD$0Icz8rPLzEMUNH_x5
zjV0O(kt99@AqfW%kgx{>0|Ok#F$_ad6hZXk6z;Z)(_55;1s?{^yiyE6$qnFf!=)3;
z!};`cF2)Ax^n8~R*LnBJ+fm;ic%jP<OsiPZ)TJALbLz}4k=Yjh$xTW^(}~B6chy55
zHE0`CtzwuBJE_h)vFq-K3n*%sWP>R|@-`8phBy0AzWD`no=Vp8@q9>R*$D4sjAf7A
zw{zWW+2w)J+PZtsUyQU24x6Y(JEmW+F!1S7Un4J7X#4vsZhP)8Efr;U?bKNJRh;-T
zMQ))AJsot1=94$WJ?}T`+fzn;K&56aWW_<tfaHhSRUhH>dGMC?LBh4g%#yHImOtut
zz_RMh#RnYY-ZbQ>yJIVzvY`z*DM0D-lK88^+R6;7aQ&*J;PNwOlaDKv11OUK?9>s?
zPraS8T~8B`Uz|z;z1Xfi&Jaa9mv^2fo#Wqtfs!jU;o76Hc0*0}!5n;ly`!Su9has#
zAzG{@gPs?(M^Q;+h9DK8iky+torVvSQ7J>cceSdnbqKw8eB}-y7s(AJRF}K+BF10>
z^2+T9M~l%ooPp90kTs$${^3iN9Raugal-;++gQ_z_0dBpvnjGD`CXK$u++=R6o37Y
zg!Jr!>z)6rC5W|m{3sZU^}GMb>uvFyUa`W>YeoGQn60+)YX*C;>sK!|yBw{+|0}-|
zUDKz91AJpMg?Bd^^~I?Qk;+az@FW{=nRq(eDH0G?OE00>y1jo3(a2EON}^r1n9E=u
zyKeg$tJ$FtCk~=(M4$ZeZx?CL-{QWxR^3LJdjzL1Xq<C0iQD^(F@zmpG3w95i`|yD
z8aI3|ts6QLnc^}L@hb0N($o-zvzaYJUbfdvg|kES<J&@F&@oCv;4-SbY!f@xmiz>A
z2FGg=7RR8tl)@qCECl*@zs-QZJ_o*ij}(Td$Q%@xZs>5${R~h~!?Vg6s@l|;X!Suj
ze`;Y>YYQe@h<YnO<*X*eh|pGpW(XNhra`$+z86LR<m@8tN_lRPLzeY>j}nD6x8vm&
z&F13G3!Y~6Ai<;v=HlR?sGWqWQVK7VV2&fVh?sL|Y@z&Tbl9w1wZLm|?mwNA$|AoU
fz^rb9TKB)@us+GNxsklTKradK3+BmvW6%B#x{}Xp

diff --git a/src/main/resources/assets/effortlessbuilding/textures/gui/modifiers.png b/src/main/resources/assets/effortlessbuilding/textures/gui/modifiers.png
new file mode 100644
index 0000000000000000000000000000000000000000..335d6044ea09228d98cbf58e69127061583e7a42
GIT binary patch
literal 2405
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

literal 0
HcmV?d00001