The Great Renaming (#3014)

* move kekztech to a single root dir

* move detrav to a single root dir

* move gtnh-lanthanides to a single root dir

* move tectech and delete some gross reflection in gt++

* remove more reflection inside gt5u

* delete more reflection in gt++

* fix imports

* move bartworks and bwcrossmod

* fix proxies

* move galactigreg and ggfab

* move gtneioreplugin

* try to fix gt++ bee loader

* apply the rename rules to BW

* apply rename rules to bwcrossmod

* apply rename rules to detrav scanner mod

* apply rename rules to galacticgreg

* apply rename rules to ggfab

* apply rename rules to goodgenerator

* apply rename rules to gtnh-lanthanides

* apply rename rules to gt++

* apply rename rules to kekztech

* apply rename rules to kubatech

* apply rename rules to tectech

* apply rename rules to gt

apply the rename rules to gt

* fix tt import

* fix mui hopefully

* fix coremod except intergalactic

* rename assline recipe class

* fix a class name i stumbled on

* rename StructureUtility to GTStructureUtility to prevent conflict with structurelib

* temporary rename of GTTooltipDataCache to old name

* fix gt client/server proxy names

9 files changed, 76 insertions, 76 deletions

diff --git a/src/main/java/gregtech/common/gui/modularui/uifactory/SelectItemUIFactory.java b/src/main/java/gregtech/common/gui/modularui/uifactory/SelectItemUIFactory.java
index 452ca36c0c..0163c6fb7b 100644
--- a/src/main/java/gregtech/common/gui/modularui/uifactory/SelectItemUIFactory.java
+++ b/src/main/java/gregtech/common/gui/modularui/uifactory/SelectItemUIFactory.java
@@ -23,10 +23,10 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
 import gregtech.api.enums.Dyes;
-import gregtech.api.gui.GT_GUIColorOverride;
-import gregtech.api.gui.modularui.GT_UITextures;
-import gregtech.api.util.GT_Util;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.gui.GUIColorOverride;
+import gregtech.api.gui.modularui.GTUITextures;
+import gregtech.api.util.GTUtil;
+import gregtech.api.util.GTUtility;
 
 /**
  * Creates UI for selecting item from given list. This is client-only UI to allow using client-preferred settings.
@@ -44,10 +44,10 @@ public class SelectItemUIFactory {
     private int selected;
     private boolean anotherWindow = false;
     private AtomicBoolean dialogOpened;
-    private int guiTint = GT_Util.getRGBInt(Dyes.MACHINE_METAL.getRGBA());
+    private int guiTint = GTUtil.getRGBInt(Dyes.MACHINE_METAL.getRGBA());
     private Supplier<ItemStack> currentGetter;
 
-    private final GT_GUIColorOverride colorOverride = GT_GUIColorOverride.get("SelectItemUIFactory");
+    private final GUIColorOverride colorOverride = GUIColorOverride.get("SelectItemUIFactory");
 
     private int getTextColorOrDefault(String textType, int defaultColor) {
         return colorOverride.getTextColorOrDefault(textType, defaultColor);
@@ -139,10 +139,10 @@ public class SelectItemUIFactory {
                 super.onScreenUpdate();
                 if (currentGetter != null) {
                     ItemStack current = currentGetter.get();
-                    selected = GT_Utility.findMatchingStackInList(stacks, current);
+                    selected = GTUtility.findMatchingStackInList(stacks, current);
                 }
             }
-        }.setDrawable(GT_UITextures.SLOT_DARK_GRAY)
+        }.setDrawable(GTUITextures.SLOT_DARK_GRAY)
             .setPos(currentSlotX, currentSlotY)
             .setSize(18, 18))
             .widget(
@@ -178,7 +178,7 @@ public class SelectItemUIFactory {
                 .setUpdateTooltipEveryTick(true)
                 .setBackground(
                     () -> new IDrawable[] {
-                        index == selected ? GT_UITextures.SLOT_DARK_GRAY : ModularUITextures.ITEM_SLOT, })
+                        index == selected ? GTUITextures.SLOT_DARK_GRAY : ModularUITextures.ITEM_SLOT, })
                 .setPos(7 + 18 * (index % cols), 43 + 18 * (index / cols))
                 .setSize(18, 18));
         }
@@ -209,7 +209,7 @@ public class SelectItemUIFactory {
 
     public void setSelected(int selected) {
         if (selected == this.selected) return;
-        int newSelected = GT_Utility.clamp(selected, UNSELECTED, stacks.size() - 1);
+        int newSelected = GTUtility.clamp(selected, UNSELECTED, stacks.size() - 1);
         if (noDeselect && newSelected == UNSELECTED) return;
 
         this.selected = newSelected;
diff --git a/src/main/java/gregtech/common/gui/modularui/widget/CoverCycleButtonWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverCycleButtonWidget.java
index 4d1c6649ae..e244fcf5e5 100644
--- a/src/main/java/gregtech/common/gui/modularui/widget/CoverCycleButtonWidget.java
+++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverCycleButtonWidget.java
@@ -8,7 +8,7 @@ import com.gtnewhorizons.modularui.common.widget.CycleButtonWidget;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 
 /**
  * Fires click action on mouse release, not on press. Draws different backgrounds depending on whether the mouse is
@@ -16,12 +16,12 @@ import gregtech.api.gui.modularui.GT_UITextures;
  */
 public class CoverCycleButtonWidget extends CycleButtonWidget {
 
-    private static final UITexture BUTTON_NORMAL_NOT_PRESSED = GT_UITextures.BUTTON_COVER_NORMAL
+    private static final UITexture BUTTON_NORMAL_NOT_PRESSED = GTUITextures.BUTTON_COVER_NORMAL
         .getSubArea(0, 0, 1, 0.5f);
-    private static final UITexture BUTTON_NORMAL_PRESSED = GT_UITextures.BUTTON_COVER_NORMAL.getSubArea(0, 0.5f, 1, 1);
-    private static final UITexture BUTTON_HOVERED_NOT_PRESSED = GT_UITextures.BUTTON_COVER_NORMAL_HOVERED
+    private static final UITexture BUTTON_NORMAL_PRESSED = GTUITextures.BUTTON_COVER_NORMAL.getSubArea(0, 0.5f, 1, 1);
+    private static final UITexture BUTTON_HOVERED_NOT_PRESSED = GTUITextures.BUTTON_COVER_NORMAL_HOVERED
         .getSubArea(0, 0, 1, 0.5f);
-    private static final UITexture BUTTON_HOVERED_PRESSED = GT_UITextures.BUTTON_COVER_NORMAL_HOVERED
+    private static final UITexture BUTTON_HOVERED_PRESSED = GTUITextures.BUTTON_COVER_NORMAL_HOVERED
         .getSubArea(0, 0.5f, 1, 1);
 
     private boolean clickPressed;
diff --git a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataControllerWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataControllerWidget.java
index 4543980ce1..c89c541273 100644
--- a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataControllerWidget.java
+++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataControllerWidget.java
@@ -12,12 +12,12 @@ import com.gtnewhorizons.modularui.api.widget.Widget;
 import com.gtnewhorizons.modularui.common.internal.network.NetworkUtils;
 
 import gregtech.api.gui.modularui.IDataFollowerWidget;
-import gregtech.api.util.GT_CoverBehaviorBase;
+import gregtech.api.util.CoverBehaviorBase;
 import gregtech.api.util.ISerializableObject;
 
 public class CoverDataControllerWidget<T extends ISerializableObject> extends DataControllerWidget<T> {
 
-    protected final GT_CoverBehaviorBase<T> coverBehavior;
+    protected final CoverBehaviorBase<T> coverBehavior;
 
     /**
      * @param dataGetter    () -> cover data this widget handles
@@ -25,7 +25,7 @@ public class CoverDataControllerWidget<T extends ISerializableObject> extends Da
      * @param coverBehavior cover this widget handles data update
      */
     public CoverDataControllerWidget(Supplier<T> dataGetter, Function<T, Boolean> dataSetter,
-        GT_CoverBehaviorBase<T> coverBehavior) {
+        CoverBehaviorBase<T> coverBehavior) {
         super(dataGetter, dataSetter);
         this.coverBehavior = coverBehavior;
     }
@@ -68,7 +68,7 @@ public class CoverDataControllerWidget<T extends ISerializableObject> extends Da
          * @param dataUpdater       (index of button, current cover data) -> new cover data
          */
         public CoverDataIndexedControllerWidget_ToggleButtons(Supplier<T> coverDataGetter,
-            Function<T, Boolean> coverDataSetter, GT_CoverBehaviorBase<T> coverBehavior,
+            Function<T, Boolean> coverDataSetter, CoverBehaviorBase<T> coverBehavior,
             BiFunction<Integer, T, Boolean> dataToStateGetter, BiFunction<Integer, T, T> dataUpdater) {
             super(coverDataGetter, coverDataSetter, coverBehavior);
             this.dataToStateGetter = dataToStateGetter;
@@ -80,8 +80,8 @@ public class CoverDataControllerWidget<T extends ISerializableObject> extends Da
          * @param widget         widget to add
          * @param applyForWidget methods to call for widget to add
          */
-        public <W extends CoverDataFollower_ToggleButtonWidget<T>> CoverDataIndexedControllerWidget_ToggleButtons<T> addToggleButton(
-            int index, W widget, Consumer<CoverDataFollower_ToggleButtonWidget<T>> applyForWidget) {
+        public <W extends CoverDataFollowerToggleButtonWidget<T>> CoverDataIndexedControllerWidget_ToggleButtons<T> addToggleButton(
+            int index, W widget, Consumer<CoverDataFollowerToggleButtonWidget<T>> applyForWidget) {
             addFollower(
                 widget,
                 data -> dataToStateGetter.apply(index, data),
@@ -108,7 +108,7 @@ public class CoverDataControllerWidget<T extends ISerializableObject> extends Da
          * @param dataUpdater       (index of button, current cover data) -> new cover data
          */
         public CoverDataIndexedControllerWidget_CycleButtons(Supplier<T> coverDataGetter,
-            Function<T, Boolean> coverDataSetter, GT_CoverBehaviorBase<T> coverBehavior,
+            Function<T, Boolean> coverDataSetter, CoverBehaviorBase<T> coverBehavior,
             BiFunction<Integer, T, Integer> dataToStateGetter, BiFunction<Integer, T, T> dataUpdater) {
             super(coverDataGetter, coverDataSetter, coverBehavior);
             this.dataToStateGetter = dataToStateGetter;
@@ -120,8 +120,8 @@ public class CoverDataControllerWidget<T extends ISerializableObject> extends Da
          * @param widget         widget to add
          * @param applyForWidget methods to call for the widget to add
          */
-        public <W extends CoverDataFollower_CycleButtonWidget<T>> CoverDataIndexedControllerWidget_CycleButtons<T> addCycleButton(
-            int index, W widget, Consumer<CoverDataFollower_CycleButtonWidget<T>> applyForWidget) {
+        public <W extends CoverDataFollowerCycleButtonWidget<T>> CoverDataIndexedControllerWidget_CycleButtons<T> addCycleButton(
+            int index, W widget, Consumer<CoverDataFollowerCycleButtonWidget<T>> applyForWidget) {
             addFollower(
                 widget,
                 data -> dataToStateGetter.apply(index, data),
diff --git a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_CycleButtonWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollowerCycleButtonWidget.java
index ec7d31ca7e..4408dbd54e 100644
--- a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_CycleButtonWidget.java
+++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollowerCycleButtonWidget.java
@@ -9,25 +9,25 @@ import gregtech.api.util.ISerializableObject;
 /**
  * Determines button state with cover data.
  */
-public class CoverDataFollower_CycleButtonWidget<T extends ISerializableObject> extends CoverCycleButtonWidget
+public class CoverDataFollowerCycleButtonWidget<T extends ISerializableObject> extends CoverCycleButtonWidget
     implements IDataFollowerWidget<T, Integer> {
 
     private Function<T, Integer> dataToStateGetter;
 
-    public CoverDataFollower_CycleButtonWidget() {
+    public CoverDataFollowerCycleButtonWidget() {
         super();
         setGetter(() -> 0); // fake getter; used only for init
         setSynced(false, false);
     }
 
     @Override
-    public CoverDataFollower_CycleButtonWidget<T> setDataToStateGetter(Function<T, Integer> dataToStateGetter) {
+    public CoverDataFollowerCycleButtonWidget<T> setDataToStateGetter(Function<T, Integer> dataToStateGetter) {
         this.dataToStateGetter = dataToStateGetter;
         return this;
     }
 
     @Override
-    public CoverDataFollower_CycleButtonWidget<T> setStateSetter(Consumer<Integer> setter) {
+    public CoverDataFollowerCycleButtonWidget<T> setStateSetter(Consumer<Integer> setter) {
         super.setSetter(setter);
         return this;
     }
diff --git a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_NumericWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollowerNumericWidget.java
index f641ed090b..316109ed64 100644
--- a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_NumericWidget.java
+++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollowerNumericWidget.java
@@ -7,22 +7,22 @@ import com.gtnewhorizons.modularui.api.math.Alignment;
 import com.gtnewhorizons.modularui.api.math.Color;
 import com.gtnewhorizons.modularui.common.widget.textfield.NumericWidget;
 
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.gui.modularui.IDataFollowerWidget;
 import gregtech.api.util.ISerializableObject;
 
-public class CoverDataFollower_NumericWidget<T extends ISerializableObject> extends NumericWidget
+public class CoverDataFollowerNumericWidget<T extends ISerializableObject> extends NumericWidget
     implements IDataFollowerWidget<T, Double> {
 
     private Function<T, Double> dataToStateGetter;
 
-    public CoverDataFollower_NumericWidget() {
+    public CoverDataFollowerNumericWidget() {
         super();
         setGetter(() -> 0); // fake getter; used only for init
         setSynced(false, false);
         setTextColor(Color.WHITE.dark(1));
         setTextAlignment(Alignment.CenterLeft);
-        setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2));
+        setBackground(GTUITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2));
     }
 
     @Override
@@ -41,13 +41,13 @@ public class CoverDataFollower_NumericWidget<T extends ISerializableObject> exte
     }
 
     @Override
-    public CoverDataFollower_NumericWidget<T> setDataToStateGetter(Function<T, Double> dataToStateGetter) {
+    public CoverDataFollowerNumericWidget<T> setDataToStateGetter(Function<T, Double> dataToStateGetter) {
         this.dataToStateGetter = dataToStateGetter;
         return this;
     }
 
     @Override
-    public CoverDataFollower_NumericWidget<T> setStateSetter(Consumer<Double> setter) {
+    public CoverDataFollowerNumericWidget<T> setStateSetter(Consumer<Double> setter) {
         super.setSetter(setter::accept);
         return this;
     }
diff --git a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_SlotWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollowerSlotWidget.java
index 0b827bfbc6..a3995deda0 100644
--- a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_SlotWidget.java
+++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollowerSlotWidget.java
@@ -14,32 +14,32 @@ import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 import gregtech.api.gui.modularui.IDataFollowerWidget;
 import gregtech.api.util.ISerializableObject;
 
-public class CoverDataFollower_SlotWidget<T extends ISerializableObject> extends SlotWidget
+public class CoverDataFollowerSlotWidget<T extends ISerializableObject> extends SlotWidget
     implements IDataFollowerWidget<T, ItemStack> {
 
     private Function<T, ItemStack> dataToStateGetter;
     private Consumer<ItemStack> dataSetter;
 
-    public CoverDataFollower_SlotWidget(BaseSlot slot) {
+    public CoverDataFollowerSlotWidget(BaseSlot slot) {
         super(slot);
     }
 
-    public CoverDataFollower_SlotWidget(IItemHandlerModifiable handler, int index, boolean phantom) {
+    public CoverDataFollowerSlotWidget(IItemHandlerModifiable handler, int index, boolean phantom) {
         this(new BaseSlot(handler, index, phantom));
     }
 
-    public CoverDataFollower_SlotWidget(IItemHandlerModifiable handler, int index) {
+    public CoverDataFollowerSlotWidget(IItemHandlerModifiable handler, int index) {
         this(handler, index, false);
     }
 
     @Override
-    public CoverDataFollower_SlotWidget<T> setDataToStateGetter(Function<T, ItemStack> dataToStateGetter) {
+    public CoverDataFollowerSlotWidget<T> setDataToStateGetter(Function<T, ItemStack> dataToStateGetter) {
         this.dataToStateGetter = dataToStateGetter;
         return this;
     }
 
     @Override
-    public CoverDataFollower_SlotWidget<T> setStateSetter(Consumer<ItemStack> setter) {
+    public CoverDataFollowerSlotWidget<T> setStateSetter(Consumer<ItemStack> setter) {
         this.dataSetter = setter;
         return this;
     }
diff --git a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_TextFieldWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollowerTextFieldWidget.java
index 1907aaf22f..95ceafaadd 100644
--- a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_TextFieldWidget.java
+++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollowerTextFieldWidget.java
@@ -10,22 +10,22 @@ import com.gtnewhorizons.modularui.api.math.Alignment;
 import com.gtnewhorizons.modularui.api.math.Color;
 import com.gtnewhorizons.modularui.common.widget.textfield.TextFieldWidget;
 
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.gui.modularui.IDataFollowerWidget;
 import gregtech.api.util.ISerializableObject;
 
-public class CoverDataFollower_TextFieldWidget<T extends ISerializableObject> extends TextFieldWidget
+public class CoverDataFollowerTextFieldWidget<T extends ISerializableObject> extends TextFieldWidget
     implements IDataFollowerWidget<T, String> {
 
     private Function<T, String> dataToStateGetter;
 
-    public CoverDataFollower_TextFieldWidget() {
+    public CoverDataFollowerTextFieldWidget() {
         super();
         setGetter(() -> ""); // fake getter; used only for init
         setSynced(false, false);
         setTextColor(Color.WHITE.dark(1));
         setTextAlignment(Alignment.CenterLeft);
-        setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2));
+        setBackground(GTUITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2));
     }
 
     @Override
@@ -44,13 +44,13 @@ public class CoverDataFollower_TextFieldWidget<T extends ISerializableObject> ex
     }
 
     @Override
-    public CoverDataFollower_TextFieldWidget<T> setDataToStateGetter(Function<T, String> dataToStateGetter) {
+    public CoverDataFollowerTextFieldWidget<T> setDataToStateGetter(Function<T, String> dataToStateGetter) {
         this.dataToStateGetter = dataToStateGetter;
         return this;
     }
 
     @Override
-    public CoverDataFollower_TextFieldWidget<T> setStateSetter(Consumer<String> setter) {
+    public CoverDataFollowerTextFieldWidget<T> setStateSetter(Consumer<String> setter) {
         super.setSetter(setter);
         return this;
     }
@@ -61,10 +61,10 @@ public class CoverDataFollower_TextFieldWidget<T extends ISerializableObject> ex
     }
 
     /**
-     * @deprecated Use {@link CoverDataFollower_NumericWidget}
+     * @deprecated Use {@link CoverDataFollowerNumericWidget}
      */
     @Deprecated
-    public CoverDataFollower_TextFieldWidget<T> setOnScrollNumbers(int baseStep, int ctrlStep, int shiftStep) {
+    public CoverDataFollowerTextFieldWidget<T> setOnScrollNumbers(int baseStep, int ctrlStep, int shiftStep) {
         setOnScrollNumbers((val, direction) -> {
             int step = (GuiScreen.isShiftKeyDown() ? shiftStep : GuiScreen.isCtrlKeyDown() ? ctrlStep : baseStep)
                 * direction;
@@ -79,18 +79,18 @@ public class CoverDataFollower_TextFieldWidget<T extends ISerializableObject> ex
     }
 
     /**
-     * @deprecated Use {@link CoverDataFollower_NumericWidget}
+     * @deprecated Use {@link CoverDataFollowerNumericWidget}
      */
     @Deprecated
-    public CoverDataFollower_TextFieldWidget<T> setOnScrollNumbers() {
+    public CoverDataFollowerTextFieldWidget<T> setOnScrollNumbers() {
         return setOnScrollNumbers(1, 50, 1000);
     }
 
     /**
-     * @deprecated Use {@link CoverDataFollower_NumericWidget}
+     * @deprecated Use {@link CoverDataFollowerNumericWidget}
      */
     @Deprecated
-    public CoverDataFollower_TextFieldWidget<T> setOnScrollText(int baseStep, int ctrlStep, int shiftStep) {
+    public CoverDataFollowerTextFieldWidget<T> setOnScrollText(int baseStep, int ctrlStep, int shiftStep) {
         setOnScroll((text, direction) -> {
             int val = (int) MathExpressionParser.parse(text);
             int step = (GuiScreen.isShiftKeyDown() ? shiftStep : GuiScreen.isCtrlKeyDown() ? ctrlStep : baseStep)
@@ -107,18 +107,18 @@ public class CoverDataFollower_TextFieldWidget<T extends ISerializableObject> ex
     }
 
     /**
-     * @deprecated Use {@link CoverDataFollower_NumericWidget}
+     * @deprecated Use {@link CoverDataFollowerNumericWidget}
      */
     @Deprecated
-    public CoverDataFollower_TextFieldWidget<T> setOnScrollText() {
+    public CoverDataFollowerTextFieldWidget<T> setOnScrollText() {
         return setOnScrollText(1, 5, 50);
     }
 
     /**
-     * @deprecated Use {@link CoverDataFollower_NumericWidget}
+     * @deprecated Use {@link CoverDataFollowerNumericWidget}
      */
     @Deprecated
-    public CoverDataFollower_TextFieldWidget<T> setOnScrollNumbersLong(long baseStep, long ctrlStep, long shiftStep) {
+    public CoverDataFollowerTextFieldWidget<T> setOnScrollNumbersLong(long baseStep, long ctrlStep, long shiftStep) {
         setOnScrollNumbersLong((val, direction) -> {
             long step = (GuiScreen.isShiftKeyDown() ? shiftStep : GuiScreen.isCtrlKeyDown() ? ctrlStep : baseStep)
                 * direction;
diff --git a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_ToggleButtonWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollowerToggleButtonWidget.java
index 6f798a93d5..0fcac5009c 100644
--- a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_ToggleButtonWidget.java
+++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollowerToggleButtonWidget.java
@@ -5,16 +5,16 @@ import java.util.function.Function;
 
 import com.gtnewhorizons.modularui.api.drawable.IDrawable;
 
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.gui.modularui.IDataFollowerWidget;
 import gregtech.api.util.ISerializableObject;
 
-public class CoverDataFollower_ToggleButtonWidget<T extends ISerializableObject> extends CoverCycleButtonWidget
+public class CoverDataFollowerToggleButtonWidget<T extends ISerializableObject> extends CoverCycleButtonWidget
     implements IDataFollowerWidget<T, Boolean> {
 
     private Function<T, Boolean> dataToStateGetter;
 
-    public CoverDataFollower_ToggleButtonWidget() {
+    public CoverDataFollowerToggleButtonWidget() {
         super();
         setGetter(() -> 0); // fake getter; used only for init
         setSynced(false, false);
@@ -22,13 +22,13 @@ public class CoverDataFollower_ToggleButtonWidget<T extends ISerializableObject>
     }
 
     @Override
-    public CoverDataFollower_ToggleButtonWidget<T> setDataToStateGetter(Function<T, Boolean> dataToStateGetter) {
+    public CoverDataFollowerToggleButtonWidget<T> setDataToStateGetter(Function<T, Boolean> dataToStateGetter) {
         this.dataToStateGetter = dataToStateGetter;
         return this;
     }
 
     @Override
-    public CoverDataFollower_ToggleButtonWidget<T> setStateSetter(Consumer<Boolean> setter) {
+    public CoverDataFollowerToggleButtonWidget<T> setStateSetter(Consumer<Boolean> setter) {
         super.setSetter(val -> setter.accept(val == 1));
         return this;
     }
@@ -38,27 +38,27 @@ public class CoverDataFollower_ToggleButtonWidget<T extends ISerializableObject>
         setState(dataToStateGetter.apply(data) ? 1 : 0, false, false);
     }
 
-    public CoverDataFollower_ToggleButtonWidget<T> setToggleTexture(IDrawable active, IDrawable inactive) {
+    public CoverDataFollowerToggleButtonWidget<T> setToggleTexture(IDrawable active, IDrawable inactive) {
         setTextureGetter(state -> state == 1 ? active : inactive);
         return this;
     }
 
-    public static <T extends ISerializableObject> CoverDataFollower_ToggleButtonWidget<T> ofCheckAndCross() {
-        return new CoverDataFollower_ToggleButtonWidget<T>()
-            .setToggleTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK, GT_UITextures.OVERLAY_BUTTON_CROSS);
+    public static <T extends ISerializableObject> CoverDataFollowerToggleButtonWidget<T> ofCheckAndCross() {
+        return new CoverDataFollowerToggleButtonWidget<T>()
+            .setToggleTexture(GTUITextures.OVERLAY_BUTTON_CHECKMARK, GTUITextures.OVERLAY_BUTTON_CROSS);
     }
 
-    public static <T extends ISerializableObject> CoverDataFollower_ToggleButtonWidget<T> ofCheck() {
-        return new CoverDataFollower_ToggleButtonWidget<T>()
-            .setToggleTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK, GT_UITextures.TRANSPARENT);
+    public static <T extends ISerializableObject> CoverDataFollowerToggleButtonWidget<T> ofCheck() {
+        return new CoverDataFollowerToggleButtonWidget<T>()
+            .setToggleTexture(GTUITextures.OVERLAY_BUTTON_CHECKMARK, GTUITextures.TRANSPARENT);
     }
 
-    public static <T extends ISerializableObject> CoverDataFollower_ToggleButtonWidget<T> ofRedstone() {
-        return new CoverDataFollower_ToggleButtonWidget<T>()
-            .setToggleTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON, GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF);
+    public static <T extends ISerializableObject> CoverDataFollowerToggleButtonWidget<T> ofRedstone() {
+        return new CoverDataFollowerToggleButtonWidget<T>()
+            .setToggleTexture(GTUITextures.OVERLAY_BUTTON_REDSTONE_ON, GTUITextures.OVERLAY_BUTTON_REDSTONE_OFF);
     }
 
-    public static <T extends ISerializableObject> CoverDataFollower_ToggleButtonWidget<T> ofDisableable() {
+    public static <T extends ISerializableObject> CoverDataFollowerToggleButtonWidget<T> ofDisableable() {
         return new CoverDataFollower_DisableableToggleButtonWidget<>();
     }
 
@@ -66,7 +66,7 @@ public class CoverDataFollower_ToggleButtonWidget<T extends ISerializableObject>
      * Disables clicking if button is already pressed.
      */
     public static class CoverDataFollower_DisableableToggleButtonWidget<T extends ISerializableObject>
-        extends CoverDataFollower_ToggleButtonWidget<T> {
+        extends CoverDataFollowerToggleButtonWidget<T> {
 
         public CoverDataFollower_DisableableToggleButtonWidget() {
             super();
@@ -79,7 +79,7 @@ public class CoverDataFollower_ToggleButtonWidget<T extends ISerializableObject>
 
         @Override
         public IDrawable[] getBackground() {
-            if (!canClick()) return new IDrawable[] { GT_UITextures.BUTTON_COVER_NORMAL_DISABLED };
+            if (!canClick()) return new IDrawable[] { GTUITextures.BUTTON_COVER_NORMAL_DISABLED };
             return super.getBackground();
         }
     }
diff --git a/src/main/java/gregtech/common/gui/modularui/widget/ItemWatcherSlotWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/ItemWatcherSlotWidget.java
index 5200c1a416..9e458af6a5 100644
--- a/src/main/java/gregtech/common/gui/modularui/widget/ItemWatcherSlotWidget.java
+++ b/src/main/java/gregtech/common/gui/modularui/widget/ItemWatcherSlotWidget.java
@@ -9,7 +9,7 @@ import com.gtnewhorizons.modularui.api.forge.ItemStackHandler;
 import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 
 /**
  * Watches specific ItemStack and pulls changes from it. Player cannot interact with slot, other than viewing NEI recipe
@@ -33,7 +33,7 @@ public class ItemWatcherSlotWidget extends SlotWidget {
     @Override
     public void detectAndSendChanges(boolean init) {
         ItemStack target = getter.get();
-        if (init || !GT_Utility.areStacksEqual(lastItem, target)) {
+        if (init || !GTUtility.areStacksEqual(lastItem, target)) {
             ItemStack toPut;
             if (target != null) {
                 toPut = target.copy();