update modularui to fix gt (#3019)

6 files changed, 16 insertions, 16 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/BaseTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseTileEntity.java
index 7b18565165..f2b5278e49 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseTileEntity.java
@@ -62,9 +62,9 @@ import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords;
 import gregtech.api.interfaces.tileentity.IIC2Enet;
 import gregtech.api.net.GTPacketBlockEvent;
 import gregtech.api.net.GTPacketSetConfigurationCircuit;
+import gregtech.api.util.GTTooltipDataCache;
 import gregtech.api.util.GTUtil;
 import gregtech.api.util.GTUtility;
-import gregtech.api.util.GT_TooltipDataCache;
 import gregtech.common.gui.modularui.uifactory.SelectItemUIFactory;
 import ic2.api.energy.event.EnergyTileLoadEvent;
 import ic2.api.energy.event.EnergyTileUnloadEvent;
@@ -631,7 +631,7 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
         return null;
     }
 
-    protected GT_TooltipDataCache mTooltipCache = new GT_TooltipDataCache();
+    protected GTTooltipDataCache mTooltipCache = new GTTooltipDataCache();
 
     // Tooltip localization keys
     public static final String BATTERY_SLOT_TOOLTIP = "GT5U.machines.battery_slot.tooltip",
diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
index 1008a64507..a0fafe1bcd 100644
--- a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
@@ -55,9 +55,9 @@ import gregtech.api.objects.GTItemStack;
 import gregtech.api.util.GTLanguageManager;
 import gregtech.api.util.GTLog;
 import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTTooltipDataCache;
 import gregtech.api.util.GTUtil;
 import gregtech.api.util.GTUtility;
-import gregtech.api.util.GT_TooltipDataCache;
 import gregtech.common.GTClient;
 import gregtech.common.covers.CoverInfo;
 import mcp.mobius.waila.api.IWailaConfigHandler;
@@ -91,7 +91,7 @@ public abstract class MetaTileEntity implements IMetaTileEntity, ICleanroomRecei
     public final ItemStackHandler inventoryHandler;
 
     protected GUIColorOverride colorOverride;
-    protected GT_TooltipDataCache mTooltipCache = new GT_TooltipDataCache();
+    protected GTTooltipDataCache mTooltipCache = new GTTooltipDataCache();
 
     @Override
     public ItemStackHandler getInventoryHandler() {
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachine.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachine.java
index 25dfb9b58b..ee83857953 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachine.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachine.java
@@ -81,9 +81,9 @@ import gregtech.api.util.GTClientPreference;
 import gregtech.api.util.GTLog;
 import gregtech.api.util.GTOreDictUnificator;
 import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTTooltipDataCache;
 import gregtech.api.util.GTUtility;
 import gregtech.api.util.GTWaila;
-import gregtech.api.util.GT_TooltipDataCache;
 import gregtech.api.util.OverclockCalculator;
 import gregtech.common.gui.modularui.UIHelper;
 import mcp.mobius.waila.api.IWailaConfigHandler;
@@ -1527,16 +1527,16 @@ public abstract class MTEBasicMachine extends MTEBasicTank implements RecipeMapW
     }
 
     protected List<String> getErrorDescriptions() {
-        final GT_TooltipDataCache.TooltipData tooltip = getErrorTooltip();
+        final GTTooltipDataCache.TooltipData tooltip = getErrorTooltip();
         return tooltip != null ? tooltip.text : Collections.emptyList();
     }
 
     protected List<String> getErrorDescriptionsShift() {
-        final GT_TooltipDataCache.TooltipData tooltip = getErrorTooltip();
+        final GTTooltipDataCache.TooltipData tooltip = getErrorTooltip();
         return tooltip != null ? tooltip.shiftText : Collections.emptyList();
     }
 
-    protected GT_TooltipDataCache.TooltipData getErrorTooltip() {
+    protected GTTooltipDataCache.TooltipData getErrorTooltip() {
         if (isSteampowered()) {
             if ((getBaseMetaTileEntity().getErrorDisplayID() & 64) != 0) {
                 return mTooltipCache.getData(STALLED_VENT_TOOLTIP);
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEBuffer.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBuffer.java
index c8b4e6bfca..59618b423d 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/MTEBuffer.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBuffer.java
@@ -41,8 +41,8 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.render.TextureFactory;
+import gregtech.api.util.GTTooltipDataCache;
 import gregtech.api.util.GTUtility;
-import gregtech.api.util.GT_TooltipDataCache;
 
 public abstract class MTEBuffer extends MTETieredMachineBlock implements IAddUIWidgets {
 
@@ -477,7 +477,7 @@ public abstract class MTEBuffer extends MTETieredMachineBlock implements IAddUIW
                 this::getEmitEnergyButtonTooltip));
     }
 
-    private GT_TooltipDataCache.TooltipData getEmitEnergyButtonTooltip() {
+    private GTTooltipDataCache.TooltipData getEmitEnergyButtonTooltip() {
         return mTooltipCache.getData(
             EMIT_ENERGY_TOOLTIP,
             EnumChatFormatting.GREEN + GTUtility.formatNumbers(V[mTier])
@@ -498,7 +498,7 @@ public abstract class MTEBuffer extends MTETieredMachineBlock implements IAddUIW
                 this::getEmitRedstoneIfFullButtonTooltip).setUpdateTooltipEveryTick(true));
     }
 
-    private GT_TooltipDataCache.TooltipData getEmitRedstoneIfFullButtonTooltip() {
+    private GTTooltipDataCache.TooltipData getEmitRedstoneIfFullButtonTooltip() {
         return mTooltipCache.getUncachedTooltipData(
             EMIT_REDSTONE_IF_FULL_TOOLTIP,
             StatCollector.translateToLocal(hasEmptySlots() ? "gui.yes" : "gui.no"),
@@ -539,7 +539,7 @@ public abstract class MTEBuffer extends MTETieredMachineBlock implements IAddUIW
     }
 
     protected Widget createToggleButton(Supplier<Boolean> getter, Consumer<Boolean> setter, UITexture picture,
-        Supplier<GT_TooltipDataCache.TooltipData> tooltipDataSupplier) {
+        Supplier<GTTooltipDataCache.TooltipData> tooltipDataSupplier) {
         return new CycleButtonWidget().setToggle(getter, setter)
             .setStaticTexture(picture)
             .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEFilterBase.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEFilterBase.java
index 32e224e50f..b9f4901f4a 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/MTEFilterBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEFilterBase.java
@@ -7,7 +7,7 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 
 import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
-import gregtech.api.util.GT_TooltipDataCache;
+import gregtech.api.util.GTTooltipDataCache;
 
 public abstract class MTEFilterBase extends MTEBuffer {
 
@@ -88,7 +88,7 @@ public abstract class MTEFilterBase extends MTEBuffer {
                 this::getEmitRedstoneGraduallyButtonTooltip).setUpdateTooltipEveryTick(true));
     }
 
-    private GT_TooltipDataCache.TooltipData getEmitRedstoneGraduallyButtonTooltip() {
+    private GTTooltipDataCache.TooltipData getEmitRedstoneGraduallyButtonTooltip() {
         return mTooltipCache
             .getUncachedTooltipData(EMIT_REDSTONE_GRADUALLY_TOOLTIP, getEmptySlots(), getRedstoneOutput());
     }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchInputBus.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchInputBus.java
index f4f04c38a3..a44924297a 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchInputBus.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchInputBus.java
@@ -34,8 +34,8 @@ import gregtech.api.recipe.RecipeMap;
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GTClientPreference;
 import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTTooltipDataCache;
 import gregtech.api.util.GTUtility;
-import gregtech.api.util.GT_TooltipDataCache;
 import gregtech.api.util.extensions.ArrayExt;
 
 public class MTEHatchInputBus extends MTEHatch implements IConfigurationCircuitSupport, IAddUIWidgets {
@@ -303,7 +303,7 @@ public class MTEHatchInputBus extends MTEHatch implements IConfigurationCircuitS
     }
 
     private Widget createToggleButton(Supplier<Boolean> getter, Consumer<Boolean> setter, UITexture picture,
-        Supplier<GT_TooltipDataCache.TooltipData> tooltipDataSupplier) {
+        Supplier<GTTooltipDataCache.TooltipData> tooltipDataSupplier) {
         return new CycleButtonWidget().setToggle(getter, setter)
             .setStaticTexture(picture)
             .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE)