Refactoring after lib update

Dertiende · Mar 31, 2024 · 15f941d · 15f941d
1 parent 3b84a71
commit 15f941d
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 234 deletions.
diff --git a/src/main/java/mcjty/xnet/apiimpl/energy/EnergyConnectorSettings.java b/src/main/java/mcjty/xnet/apiimpl/energy/EnergyConnectorSettings.java
@@ -94,7 +94,7 @@ public void createGui(IEditorGui gui) {
         colorsGui(gui);
         redstoneGui(gui);
         gui.nl();
-        ((ConnectorEditorPanel) gui).translatableChoices(TAG_MODE, energyMode, InsExtMode.values());// TODO: 09.03.2024 remove ConnectorEditorPanel cast after rftoolbase update
+        gui.translatableChoices(TAG_MODE, energyMode, InsExtMode.values());
         gui.nl()
                 .label(PRIORITY_LABEL.i18n()).integer(TAG_PRIORITY, PRIORITY_TOOLTIP.i18n(), priority, 30).nl()
 

diff --git a/src/main/java/mcjty/xnet/apiimpl/enums/InsExtMode.java b/src/main/java/mcjty/xnet/apiimpl/enums/InsExtMode.java
@@ -1,8 +1,8 @@
 package mcjty.xnet.apiimpl.enums;
 
 import mcjty.lib.varia.ComponentFactory;
+import mcjty.lib.gui.ITranslatableEnum;
 import mcjty.xnet.utils.I18nUtils;
-import mcjty.xnet.utils.ITranslatableEnum;
 
 public enum InsExtMode implements ITranslatableEnum<InsExtMode> {
     INS("xnet.enum.insextmode.ins"),

diff --git a/src/main/java/mcjty/xnet/apiimpl/items/enums/ExtractMode.java b/src/main/java/mcjty/xnet/apiimpl/items/enums/ExtractMode.java
@@ -1,8 +1,8 @@
 package mcjty.xnet.apiimpl.items.enums;
 
 import mcjty.lib.varia.ComponentFactory;
+import mcjty.lib.gui.ITranslatableEnum;
 import mcjty.xnet.utils.I18nUtils;
-import mcjty.xnet.utils.ITranslatableEnum;
 
 public enum ExtractMode implements ITranslatableEnum<ExtractMode> {
     FIRST("xnet.enum.items.extractmode.first"),

diff --git a/src/main/java/mcjty/xnet/apiimpl/items/enums/StackMode.java b/src/main/java/mcjty/xnet/apiimpl/items/enums/StackMode.java
@@ -1,8 +1,8 @@
 package mcjty.xnet.apiimpl.items.enums;
 
 import mcjty.lib.varia.ComponentFactory;
+import mcjty.lib.gui.ITranslatableEnum;
 import mcjty.xnet.utils.I18nUtils;
-import mcjty.xnet.utils.ITranslatableEnum;
 
 public enum StackMode implements ITranslatableEnum<StackMode> {
     SINGLE("xnet.enum.items.stackmode.single"),

diff --git a/src/main/java/mcjty/xnet/apiimpl/logic/LogicConnectorSettings.java b/src/main/java/mcjty/xnet/apiimpl/logic/LogicConnectorSettings.java
@@ -131,15 +131,13 @@ public void createGui(IEditorGui gui) {
         sideGui(gui);
         colorsGui(gui);
         redstoneGui(gui);
-        gui.nl();
-        ((ConnectorEditorPanel)gui).translatableChoices(TAG_MODE, logicMode, LogicMode.values());// TODO: 09.03.2024 remove ConnectorEditorPanel cast after rftoolbase update
-        gui.nl();
+        gui.nl().translatableChoices(TAG_MODE, logicMode, LogicMode.values()).nl();
         if (logicMode == LogicMode.SENSOR) {
             for (RSSensor sensor : sensors) {
                 sensor.createGui(gui);
             }
         } else {
-            output.createGui((ConnectorEditorPanel) gui); // TODO: 06.03.2024 remove ConnectorEditorPanel cast after rftoolbase update
+            output.createGui(gui);
         }
     }
 

diff --git a/src/main/java/mcjty/xnet/apiimpl/logic/RSOutput.java b/src/main/java/mcjty/xnet/apiimpl/logic/RSOutput.java
@@ -1,8 +1,8 @@
 package mcjty.xnet.apiimpl.logic;
 
 import mcjty.rftoolsbase.api.xnet.channels.Color;
+import mcjty.rftoolsbase.api.xnet.gui.IEditorGui;
 import mcjty.xnet.apiimpl.logic.enums.LogicFilter;
-import mcjty.xnet.modules.controller.client.ConnectorEditorPanel;
 import mcjty.xnet.utils.CastTools;
 import net.minecraft.nbt.CompoundTag;
 
@@ -135,7 +135,7 @@ public void setRedstoneOut(int redstoneOut) {
         this.redstoneOut = redstoneOut;
     }
 
-    public void createGui(ConnectorEditorPanel gui) {// TODO: 09.03.2024 remove ConnectorEditorPanel cast after rftoolbase update 
+    public void createGui(IEditorGui gui) {
         if (gui.isAdvanced()) {
             gui.translatableChoices(TAG_RS_FILTER, logicFilter, LogicFilter.values());
             switch (logicFilter) {

diff --git a/src/main/java/mcjty/xnet/apiimpl/logic/RSSensor.java b/src/main/java/mcjty/xnet/apiimpl/logic/RSSensor.java
@@ -112,7 +112,7 @@ public boolean isEnabled(String tag) {
     }
 
     public void createGui(IEditorGui gui) {
-        ((AbstractEditorPanel)gui).translatableChoices(TAG_MODE + index, sensorMode, SensorMode.values());
+        gui.translatableChoices(TAG_MODE + index, sensorMode, SensorMode.values());
         gui
                 .choices(TAG_OP + index, LOGIC_SENSOR_OPERATOR_TOOLTIP.i18n(), operator, Operator.values())
                 .integer(TAG_AMOUNT + index, LOGIC_SENSOR_AMOUNT_TOOLTIP.i18n(), amount, 46)

diff --git a/src/main/java/mcjty/xnet/apiimpl/logic/enums/LogicFilter.java b/src/main/java/mcjty/xnet/apiimpl/logic/enums/LogicFilter.java
@@ -1,7 +1,7 @@
 package mcjty.xnet.apiimpl.logic.enums;
 
+import mcjty.lib.gui.ITranslatableEnum;
 import mcjty.xnet.utils.I18nUtils;
-import mcjty.xnet.utils.ITranslatableEnum;
 import org.apache.commons.lang3.StringUtils;
 
 public enum LogicFilter implements ITranslatableEnum<LogicFilter> {

diff --git a/src/main/java/mcjty/xnet/apiimpl/logic/enums/LogicMode.java b/src/main/java/mcjty/xnet/apiimpl/logic/enums/LogicMode.java
@@ -2,8 +2,8 @@
 
 
 import mcjty.lib.varia.ComponentFactory;
+import mcjty.lib.gui.ITranslatableEnum;
 import mcjty.xnet.utils.I18nUtils;
-import mcjty.xnet.utils.ITranslatableEnum;
 
 
 public enum LogicMode implements ITranslatableEnum<LogicMode> {

diff --git a/src/main/java/mcjty/xnet/apiimpl/logic/enums/SensorMode.java b/src/main/java/mcjty/xnet/apiimpl/logic/enums/SensorMode.java
@@ -1,8 +1,8 @@
 package mcjty.xnet.apiimpl.logic.enums;
 
 import mcjty.lib.varia.ComponentFactory;
+import mcjty.lib.gui.ITranslatableEnum;
 import mcjty.xnet.utils.I18nUtils;
-import mcjty.xnet.utils.ITranslatableEnum;
 
 public enum SensorMode implements ITranslatableEnum<SensorMode> {
     OFF("xnet.enum.logic.sensormode.off"),

diff --git a/src/main/java/mcjty/xnet/modules/facade/blocks/FacadeBlockItem.java b/src/main/java/mcjty/xnet/modules/facade/blocks/FacadeBlockItem.java
@@ -86,7 +86,7 @@ private static void userSetMimicBlock(@Nonnull ItemStack item, BlockState mimicB
         setMimicBlock(item, mimicBlock);
         if (world.isClientSide) {
             player.displayClientMessage(ComponentFactory.literal(
-                    String.format(FACADE_CURRENT_MIMIC_FORMATTED.i18n(), mimicBlock.getBlock().getDescriptionId())),
+                    FACADE_CURRENT_MIMIC_FORMATTED.i18n(mimicBlock.getBlock().getDescriptionId())),
                     false
             );
         }

diff --git a/src/main/java/mcjty/xnet/utils/ChoiceEvent.java b/src/main/java/mcjty/xnet/utils/ChoiceEvent.java
diff --git a/src/main/java/mcjty/xnet/utils/EnumChoiceLabel.java b/src/main/java/mcjty/xnet/utils/EnumChoiceLabel.java
diff --git a/src/main/java/mcjty/xnet/utils/ITranslatableEnum.java b/src/main/java/mcjty/xnet/utils/ITranslatableEnum.java