remove handlerName fields from slot & tank in favor of using the pre-…

…existing `id` field for the same thing
GregTechCEu · Dec 9, 2024 · 6bd2d40 · 6bd2d40
1 parent ca156ba
commit 6bd2d40
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 22 deletions.
diff --git a/src/main/java/com/gregtechceu/gtceu/api/ui/component/SlotComponent.java b/src/main/java/com/gregtechceu/gtceu/api/ui/component/SlotComponent.java
@@ -5,7 +5,6 @@
 import com.gregtechceu.gtceu.api.ui.core.PositionedRectangle;
 import com.gregtechceu.gtceu.api.ui.core.Sizing;
 import com.gregtechceu.gtceu.api.ui.core.UIGuiGraphics;
-import com.gregtechceu.gtceu.api.ui.parsing.UIModel;
 import com.gregtechceu.gtceu.api.ui.parsing.UIParsing;
 import com.gregtechceu.gtceu.api.ui.util.pond.UISlotExtension;
 import com.gregtechceu.gtceu.core.mixins.ui.accessor.SlotAccessor;
@@ -27,7 +26,6 @@
 import org.w3c.dom.Element;
 
 import javax.annotation.Nullable;
-import java.util.Map;
 
 @Accessors(fluent = true, chain = true)
 public class SlotComponent extends BaseUIComponent {
@@ -37,9 +35,6 @@ public class SlotComponent extends BaseUIComponent {
     private int index;
     @Getter
     @Setter
-    protected String handlerName;
-    @Getter
-    @Setter
     protected MutableSlotWrapper slot;
 
     protected boolean didDraw = false;
@@ -75,12 +70,6 @@ public void draw(UIGuiGraphics context, int mouseX, int mouseY, float partialTic
                 scissor[0], scissor[1], scissor[2], scissor[3]));
     }
 
-    @Override
-    public void parseProperties(UIModel model, Element element, Map<String, Element> children) {
-        super.parseProperties(model, element, children);
-        this.handlerName(element.getAttribute("handler-name").strip());
-    }
-
     public static SlotComponent parse(Element element) {
         UIParsing.expectAttributes(element, "index");
         UIParsing.expectAttributes(element, "name");

diff --git a/src/main/java/com/gregtechceu/gtceu/api/ui/component/TankComponent.java b/src/main/java/com/gregtechceu/gtceu/api/ui/component/TankComponent.java
@@ -4,7 +4,6 @@
 import com.gregtechceu.gtceu.api.ui.core.Color;
 import com.gregtechceu.gtceu.api.ui.core.Sizing;
 import com.gregtechceu.gtceu.api.ui.core.UIGuiGraphics;
-import com.gregtechceu.gtceu.api.ui.parsing.UIModel;
 import com.gregtechceu.gtceu.api.ui.parsing.UIParsing;
 import com.gregtechceu.gtceu.api.ui.util.Observable;
 
@@ -24,7 +23,6 @@
 import org.w3c.dom.Element;
 
 import java.util.List;
-import java.util.Map;
 
 @Accessors(fluent = true, chain = true)
 public class TankComponent extends BaseUIComponent {
@@ -33,9 +31,6 @@ public class TankComponent extends BaseUIComponent {
     protected IFluidHandler handler;
     @Getter
     protected int tank;
-    @Getter
-    @Setter
-    protected String handlerName;
     protected Observable<FluidStack> lastFluidInTank = Observable.of(FluidStack.EMPTY);
     protected int lastTankCapacity;
     @Setter
@@ -109,12 +104,6 @@ public void draw(UIGuiGraphics graphics, int mouseX, int mouseY, float partialTi
         }
     }
 
-    @Override
-    public void parseProperties(UIModel model, Element element, Map<String, Element> children) {
-        super.parseProperties(model, element, children);
-        this.handlerName(element.getAttribute("handler-name").strip());
-    }
-
     public static TankComponent parse(Element element) {
         UIParsing.expectAttributes(element, "tank");
         int tank = UIParsing.parseUnsignedInt(element.getAttributeNode("tank"));