From 83ebeadd3b867f45914972f4573211b3324ca433 Mon Sep 17 00:00:00 2001
From: miozune <miozune@gmail.com>
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 <miisterunknown@gmail.com>
---
 src/main/java/gregtech/common/covers/CoverInfo.java                  | 4 ----
 src/main/java/gregtech/common/covers/GT_Cover_Arm.java               | 5 -----
 src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java      | 5 -----
 src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java          | 5 -----
 src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java          | 5 -----
 src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java           | 5 -----
 src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java        | 5 -----
 src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java      | 5 -----
 src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java    | 5 -----
 src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java       | 5 -----
 src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java        | 5 -----
 src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java         | 5 -----
 src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java       | 5 -----
 src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java  | 5 -----
 src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java    | 5 -----
 src/main/java/gregtech/common/covers/GT_Cover_Pump.java              | 5 -----
 .../java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java   | 5 -----
 src/main/java/gregtech/common/covers/GT_Cover_Shutter.java           | 5 -----
 .../covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java       | 5 -----
 19 files changed, 94 deletions(-)

(limited to 'src/main/java/gregtech/common/covers')

diff --git a/src/main/java/gregtech/common/covers/CoverInfo.java b/src/main/java/gregtech/common/covers/CoverInfo.java
index f6c8fd963c..48f6dd9748 100644
--- a/src/main/java/gregtech/common/covers/CoverInfo.java
+++ b/src/main/java/gregtech/common/covers/CoverInfo.java
@@ -193,10 +193,6 @@ public final class CoverInfo {
         return getCoverBehavior().hasCoverGUI();
     }
 
-    public boolean useModularUI() {
-        return getCoverBehavior().useModularUI();
-    }
-
     public boolean letsItemsIn(int aSlot) {
         return getCoverBehavior().letsItemsIn(coverSide, coverID, coverData, aSlot, coveredTile.get());
     }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java
index f2440ebc44..51f330e8df 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java
@@ -276,11 +276,6 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
         return true;
     }
 
-    @Override
-    public boolean useModularUI() {
-        return true;
-    }
-
     @Override
     public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
         return new ArmUIFactory(buildContext).createWindow();
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java b/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java
index 320876568f..2c51cdc355 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java
@@ -176,11 +176,6 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls
         return true;
     }
 
-    @Override
-    public boolean useModularUI() {
-        return true;
-    }
-
     @Override
     public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
         return new ControlsWorkUIFactory(buildContext).createWindow();
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
index fcedfbe768..b7eb782bbf 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
@@ -158,11 +158,6 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior {
         return true;
     }
 
-    @Override
-    public boolean useModularUI() {
-        return true;
-    }
-
     @Override
     public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
         return new ConveyorUIFactory(buildContext).createWindow();
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java b/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java
index 4e32a69330..96ef77f207 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java
@@ -139,11 +139,6 @@ public class GT_Cover_DoesWork extends GT_CoverBehavior {
         return true;
     }
 
-    @Override
-    public boolean useModularUI() {
-        return true;
-    }
-
     @Override
     public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
         return new DoesWorkUIFactory(buildContext).createWindow();
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java
index 0010f7745b..5b1f48d04f 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java
@@ -172,11 +172,6 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe
         return true;
     }
 
-    @Override
-    public boolean useModularUI() {
-        return true;
-    }
-
     @Override
     public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
         return new EUMeterUIFactory(buildContext).createWindow();
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java b/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java
index a8d853dc1b..4d7d0eb7ee 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java
@@ -302,11 +302,6 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
         return true;
     }
 
-    @Override
-    public boolean useModularUI() {
-        return true;
-    }
-
     @Override
     public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
         return new FacadeBaseUIFactory(buildContext).createWindow();
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java
index 142cb875c3..e7d8288ccf 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java
@@ -163,11 +163,6 @@ public class GT_Cover_FluidLimiter extends GT_CoverBehaviorBase<GT_Cover_FluidLi
         return true;
     }
 
-    @Override
-    public boolean useModularUI() {
-        return true;
-    }
-
     @Override
     public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
         return new FluidLimiterUIFactory(buildContext).createWindow();
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
index c22410fa9f..3805dfe2de 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
@@ -223,11 +223,6 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
         return true;
     }
 
-    @Override
-    public boolean useModularUI() {
-        return true;
-    }
-
     @Override
     public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
         return new FluidRegulatorUIFactory(buildContext).createWindow();
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
index 5a6999e055..44e264c8e8 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
@@ -218,11 +218,6 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
         return true;
     }
 
-    @Override
-    public boolean useModularUI() {
-        return true;
-    }
-
     @Override
     public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
         return new FluidFilterUIFactory(buildContext).createWindow();
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java b/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java
index d93c4b29d1..2274722c9a 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java
@@ -180,11 +180,6 @@ public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilte
         return true;
     }
 
-    @Override
-    public boolean useModularUI() {
-        return true;
-    }
-
     @Override
     public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
         return new ItemFilterUIFactory(buildContext).createWindow();
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java
index 5ff48ef88a..46be8daddd 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java
@@ -189,11 +189,6 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.
         return true;
     }
 
-    @Override
-    public boolean useModularUI() {
-        return true;
-    }
-
     @Override
     public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
         return new ItemMeterUIFactory(buildContext).createWindow();
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java
index c3a4b4ff89..f7c8bb8cd3 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java
@@ -161,11 +161,6 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMe
         return true;
     }
 
-    @Override
-    public boolean useModularUI() {
-        return true;
-    }
-
     @Override
     public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
         return new LiquidMeterUIFactory(buildContext).createWindow();
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java b/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java
index 0ac85337f3..cf51f9bdea 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java
@@ -170,11 +170,6 @@ public class GT_Cover_NeedMaintainance extends GT_CoverBehavior {
         return true;
     }
 
-    @Override
-    public boolean useModularUI() {
-        return true;
-    }
-
     @Override
     public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
         return new NeedMaintainanceUIFactory(buildContext).createWindow();
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java b/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java
index d358c4e578..600e167f2d 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java
@@ -145,11 +145,6 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior {
         return true;
     }
 
-    @Override
-    public boolean useModularUI() {
-        return true;
-    }
-
     @Override
     public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
         return new PlayerDetectorUIFactory(buildContext).createWindow();
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java
index e1bbf950ce..c4671f586e 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java
@@ -164,11 +164,6 @@ public class GT_Cover_Pump extends GT_CoverBehavior {
         return true;
     }
 
-    @Override
-    public boolean useModularUI() {
-        return true;
-    }
-
     @Override
     public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
         return new PumpUIFactory(buildContext).createWindow();
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java
index df298c2489..54d025898a 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java
@@ -160,11 +160,6 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior {
         return true;
     }
 
-    @Override
-    public boolean useModularUI() {
-        return true;
-    }
-
     @Override
     public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
         return new RedstoneWirelessBaseUIFactory(buildContext).createWindow();
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java b/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java
index 670506141c..40fad1c537 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java
@@ -132,11 +132,6 @@ public class GT_Cover_Shutter extends GT_CoverBehavior {
         return true;
     }
 
-    @Override
-    public boolean useModularUI() {
-        return true;
-    }
-
     @Override
     public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
         return new ShutterUIFactory(buildContext).createWindow();
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java
index d19db38177..6ee9e2480f 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java
+++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java
@@ -225,11 +225,6 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A
         return true;
     }
 
-    @Override
-    public boolean useModularUI() {
-        return true;
-    }
-
     protected abstract class AdvancedWirelessRedstoneBaseUIFactory extends UIFactory {
 
         protected static final int startX = 10;
-- 
cgit