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/GT_Proxy.java | 57 +----------------------------
 1 file changed, 1 insertion(+), 56 deletions(-)

(limited to 'src/main/java/gregtech/common/GT_Proxy.java')

diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index 8e0c636c98..f67addacd5 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -88,7 +88,6 @@ import net.minecraft.world.World;
 import net.minecraft.world.WorldSettings.GameType;
 import net.minecraft.world.gen.feature.WorldGenMinable;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.event.ForgeEventFactory;
 import net.minecraftforge.event.entity.EntityJoinWorldEvent;
 import net.minecraftforge.event.entity.living.EnderTeleportEvent;
@@ -119,8 +118,6 @@ import cpw.mods.fml.common.eventhandler.Event.Result;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.common.network.FMLNetworkEvent;
-import cpw.mods.fml.common.network.IGuiHandler;
-import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
@@ -159,7 +156,6 @@ import gregtech.api.util.GT_BlockMap;
 import gregtech.api.util.GT_CLS_Compat;
 import gregtech.api.util.GT_ChunkAssociatedData;
 import gregtech.api.util.GT_ClientPreference;
-import gregtech.api.util.GT_CoverBehaviorBase;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_ModHandler;
@@ -179,7 +175,7 @@ import gregtech.common.misc.GlobalMetricsCoverDatabase;
 import gregtech.common.misc.spaceprojects.SpaceProjectWorldSavedData;
 import gregtech.common.tileentities.machines.multi.drone.GT_MetaTileEntity_DroneCentre;
 
-public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
+public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
 
     private static final EnumSet<OreGenEvent.GenerateMinable.EventType> PREVENTED_ORES = EnumSet.of(
         OreGenEvent.GenerateMinable.EventType.COAL,
@@ -858,7 +854,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
         this.mIgnoreTcon = GregTech_API.sOPStuff.get(ConfigCategories.general, "ignoreTConstruct", true);
         this.mWireHeatingTicks = GregTech_API.sOPStuff.get(ConfigCategories.general, "WireHeatingTicks", 4);
         this.replicatorExponent = GregTech_API.sOPStuff.get("Replicator", "Nerf Exponent", 1.2D);
-        NetworkRegistry.INSTANCE.registerGuiHandler(GT_Values.GT, this);
         for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry
             .getRegisteredFluidContainerData()) {
             if ((tData.filledContainer.getItem() == Items.potionitem) && (tData.filledContainer.getItemDamage() == 0)) {
@@ -2460,56 +2455,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
         mClientPrefernces.put(aPlayerID, aPreference);
     }
 
-    @Override
-    public Object getServerGuiElement(int aID, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ) {
-        if (aID >= 1000) {
-            return null;
-        }
-        final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if ((tTileEntity instanceof IGregTechTileEntity)) {
-            if (GUI_ID_COVER_SIDE_BASE <= aID && aID < GUI_ID_COVER_SIDE_BASE + 6) {
-                return null;
-            }
-            final IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity();
-            if (tMetaTileEntity != null && !tMetaTileEntity.useModularUI()) {
-                return tMetaTileEntity.getServerGUI(aID, aPlayer.inventory, (IGregTechTileEntity) tTileEntity);
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public Object getClientGuiElement(int aID, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ) {
-        if (aID >= 1000) {
-            return null;
-        }
-        final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if ((tTileEntity instanceof IGregTechTileEntity tile)) {
-
-            if (GUI_ID_COVER_SIDE_BASE <= aID && aID < GUI_ID_COVER_SIDE_BASE + 6) {
-                final ForgeDirection side = ForgeDirection
-                    .getOrientation((byte) (aID - GT_Proxy.GUI_ID_COVER_SIDE_BASE));
-                GT_CoverBehaviorBase<?> cover = tile.getCoverBehaviorAtSideNew(side);
-
-                if (cover.hasCoverGUI() && !cover.useModularUI()) {
-                    return cover.getClientGUI(
-                        side,
-                        tile.getCoverIDAtSide(side),
-                        tile.getComplexCoverDataAtSide(side),
-                        tile,
-                        aPlayer,
-                        aWorld);
-                }
-                return null;
-            }
-            final IMetaTileEntity tMetaTileEntity = tile.getMetaTileEntity();
-            if (tMetaTileEntity != null && !tMetaTileEntity.useModularUI()) {
-                return tMetaTileEntity.getClientGUI(aID, aPlayer.inventory, tile);
-            }
-        }
-        return null;
-    }
-
     private static List<String> getOreDictNames(ItemStack stack) {
         return Arrays.stream(OreDictionary.getOreIDs(stack))
             .mapToObj(OreDictionary::getOreName)
-- 
cgit