From 83ebeadd3b867f45914972f4573211b3324ca433 Mon Sep 17 00:00:00 2001 From: miozune Date: Fri, 16 Aug 2024 22:26:16 +0900 Subject: Cleanup (#2904) * Remove redundant inputSeparation=true call * Remove deprecated MetaTileEntity#isDisplaySecondaryDescription * Always use ModularUI * Remove useModularUI * Remove unused GUI features * Remove IGlobalWirelessEnergy * Remove CommonValues.V & CommonValues.VN * More deprecation cleanup --------- Co-authored-by: boubou19 --- .../tileentities/machines/basic/GT_MetaTileEntity_BetterJukebox.java | 5 ----- .../machines/basic/GT_MetaTileEntity_IndustrialApiary.java | 5 ----- .../machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java | 5 ----- .../common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java | 5 ----- .../common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java | 5 ----- .../tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java | 5 ----- 6 files changed, 30 deletions(-) (limited to 'src/main/java/gregtech/common/tileentities/machines/basic') diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_BetterJukebox.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_BetterJukebox.java index da14d7c7cb..f9a9fba8f4 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_BetterJukebox.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_BetterJukebox.java @@ -483,11 +483,6 @@ public class GT_MetaTileEntity_BetterJukebox extends GT_MetaTileEntity_BasicMach p2pVolume = MathHelper.clamp_float(p2pVolume, 0.0f, maxVolume); } - @Override - public boolean useModularUI() { - return true; - } - @Override protected BasicUIProperties getUIProperties() { return super.getUIProperties().toBuilder() diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java index 50f544334c..9249673c7c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java @@ -1199,11 +1199,6 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM UPGRADE_TOOLTIP = "GT5U.machines.industrialapiary.upgradeslot.tooltip", AUTOQUEEN_TOOLTIP = "GT5U.machines.industrialapiary.autoqueen.tooltip"; - @Override - public boolean useModularUI() { - return true; - } - @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java index fc6afbd06f..aa8616e03d 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java @@ -408,11 +408,6 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt return null; } - @Override - public boolean useModularUI() { - return true; - } - protected static final NumberFormatMUI numberFormat = new NumberFormatMUI(); @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java index 2acaea8050..b1ce994fb3 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java @@ -395,11 +395,6 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine return pipe; } - @Override - public boolean useModularUI() { - return true; - } - private static final FallbackableUITexture progressBarTexture = GT_UITextures .fallbackableProgressbar("miner", GT_UITextures.PROGRESSBAR_CANNER); diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java index 8cac0c3df7..eff998d405 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java @@ -146,11 +146,6 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_BasicMachine { return new GT_MetaTileEntity_Pump(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } - @Override - public boolean useModularUI() { - return true; - } - private static final FallbackableUITexture progressBarTexture = GT_UITextures .fallbackableProgressbar("pump", GT_UITextures.PROGRESSBAR_CANNER); diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java index 0666c55ac4..1c95ee563d 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java @@ -516,11 +516,6 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank return null; } - @Override - public boolean useModularUI() { - return true; - } - protected static final NumberFormatMUI numberFormat = new NumberFormatMUI(); @Override -- cgit