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 --- src/main/java/gregtech/common/GT_Proxy.java | 57 +----------------- .../gregtech/common/blocks/GT_Block_Casings4.java | 14 ----- .../gregtech/common/blocks/GT_Block_Casings8.java | 11 ---- .../java/gregtech/common/covers/CoverInfo.java | 4 -- .../java/gregtech/common/covers/GT_Cover_Arm.java | 5 -- .../common/covers/GT_Cover_ControlsWork.java | 5 -- .../gregtech/common/covers/GT_Cover_Conveyor.java | 5 -- .../gregtech/common/covers/GT_Cover_DoesWork.java | 5 -- .../gregtech/common/covers/GT_Cover_EUMeter.java | 5 -- .../common/covers/GT_Cover_FacadeBase.java | 5 -- .../common/covers/GT_Cover_FluidLimiter.java | 5 -- .../common/covers/GT_Cover_FluidRegulator.java | 5 -- .../common/covers/GT_Cover_Fluidfilter.java | 5 -- .../common/covers/GT_Cover_ItemFilter.java | 5 -- .../gregtech/common/covers/GT_Cover_ItemMeter.java | 5 -- .../common/covers/GT_Cover_LiquidMeter.java | 5 -- .../common/covers/GT_Cover_NeedMaintainance.java | 5 -- .../common/covers/GT_Cover_PlayerDetector.java | 5 -- .../java/gregtech/common/covers/GT_Cover_Pump.java | 5 -- .../covers/GT_Cover_RedstoneWirelessBase.java | 5 -- .../gregtech/common/covers/GT_Cover_Shutter.java | 5 -- .../GT_Cover_AdvancedWirelessRedstoneBase.java | 5 -- .../common/items/behaviors/Behaviour_None.java | 6 -- .../common/net/MessageSetFlaskCapacity.java | 68 ---------------------- .../boilers/GT_MetaTileEntity_Boiler.java | 5 -- .../GT_MetaTileEntity_AdvDebugStructureWriter.java | 5 -- .../GT_MetaTileEntity_Hatch_OutputBus_ME.java | 5 -- .../GT_MetaTileEntity_Hatch_Output_ME.java | 5 -- .../basic/GT_MetaTileEntity_BetterJukebox.java | 5 -- .../basic/GT_MetaTileEntity_IndustrialApiary.java | 5 -- ..._MetaTileEntity_MicrowaveEnergyTransmitter.java | 5 -- .../machines/basic/GT_MetaTileEntity_Miner.java | 5 -- .../machines/basic/GT_MetaTileEntity_Pump.java | 5 -- .../basic/GT_MetaTileEntity_Teleporter.java | 5 -- .../multi/GT_MetaTileEntity_DrillerBase.java | 33 ----------- .../multi/GT_MetaTileEntity_PCBFactory.java | 5 -- .../GT_MetaTileEntity_PrimitiveBlastFurnace.java | 5 -- .../purification/GT_MetaTileEntity_pHSensor.java | 5 -- .../GT_MetaTileEntity_DigitalChestBase.java | 5 -- .../storage/GT_MetaTileEntity_DigitalTankBase.java | 5 -- 40 files changed, 1 insertion(+), 357 deletions(-) delete mode 100644 src/main/java/gregtech/common/net/MessageSetFlaskCapacity.java (limited to 'src/main/java/gregtech/common') 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 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 getOreDictNames(ItemStack stack) { return Arrays.stream(OreDictionary.getOreIDs(stack)) .mapToObj(OreDictionary::getOreName) diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java index 49c9c6c992..d5472e9217 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java @@ -112,20 +112,6 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract { }; } - @Deprecated - public IIcon getTurbineCasing(int meta, int iconIndex, boolean active) { - return switch (meta) { - case 10 -> active ? Textures.BlockIcons.TURBINE_ACTIVE1[iconIndex].getIcon() - : Textures.BlockIcons.TURBINE1[iconIndex].getIcon(); - case 11 -> active ? Textures.BlockIcons.TURBINE_ACTIVE2[iconIndex].getIcon() - : Textures.BlockIcons.TURBINE2[iconIndex].getIcon(); - case 12 -> active ? Textures.BlockIcons.TURBINE_ACTIVE3[iconIndex].getIcon() - : Textures.BlockIcons.TURBINE3[iconIndex].getIcon(); - default -> active ? Textures.BlockIcons.TURBINE_ACTIVE[iconIndex].getIcon() - : Textures.BlockIcons.TURBINE[iconIndex].getIcon(); - }; - } - @Deprecated public IIcon getTurbineCasing(int meta, int iconIndex, boolean active, boolean hasTurbine) { return switch (meta) { diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java index fdef0def82..0baeea1411 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java @@ -100,17 +100,6 @@ public class GT_Block_Casings8 extends GT_Block_Casings_Abstract { }; } - @Deprecated - public IIcon getTurbineCasing(int meta, int iconIndex, boolean active) { - // noinspection SwitchStatementWithTooFewBranches // "if" is harder to edit - return switch (meta) { - case 9 -> active ? Textures.BlockIcons.TURBINE_ADVGASACTIVE[iconIndex].getIcon() - : Textures.BlockIcons.TURBINEADVGAS[iconIndex].getIcon(); - default -> active ? Textures.BlockIcons.TURBINE_ACTIVE[iconIndex].getIcon() - : Textures.BlockIcons.TURBINE[iconIndex].getIcon(); - }; - } - public IIcon getTurbineCasing(int meta, int iconIndex, boolean active, boolean hasTurbine) { // noinspection SwitchStatementWithTooFewBranches // "if" is harder to edit return switch (meta) { 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 { @@ -88,9 +87,4 @@ public class Behaviour_None implements IItemBehaviour { EntityLivingBase aEntity, float aSpeed) { return null; } - - @Deprecated - public String trans(String aKey, String aEnglish) { - return GT_Utility.trans(aKey, aEnglish); - } } diff --git a/src/main/java/gregtech/common/net/MessageSetFlaskCapacity.java b/src/main/java/gregtech/common/net/MessageSetFlaskCapacity.java deleted file mode 100644 index 15e5481224..0000000000 --- a/src/main/java/gregtech/common/net/MessageSetFlaskCapacity.java +++ /dev/null @@ -1,68 +0,0 @@ -package gregtech.common.net; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.DimensionManager; - -import com.google.common.io.ByteArrayDataInput; - -import gregtech.api.net.GT_PacketTypes; -import gregtech.api.net.GT_Packet_New; -import gregtech.common.items.GT_VolumetricFlask; -import io.netty.buffer.ByteBuf; - -@Deprecated -public final class MessageSetFlaskCapacity extends GT_Packet_New { - - private int capacity, dimID, playerID; - - public MessageSetFlaskCapacity() { - super(true); - } - - public MessageSetFlaskCapacity(int capacity, int dimID, int playerID) { - super(false); - this.capacity = capacity; - this.dimID = dimID; - this.playerID = playerID; - } - - public MessageSetFlaskCapacity(int capacity, EntityPlayer p) { - super(false); - this.capacity = capacity; - this.dimID = p.worldObj.provider.dimensionId; - this.playerID = p.getEntityId(); - } - - @Override - public byte getPacketID() { - return GT_PacketTypes.SET_FLASK_CAPACITY.id; - } - - @Override - public void encode(ByteBuf aOut) { - aOut.writeInt(capacity); - aOut.writeInt(dimID); - aOut.writeInt(playerID); - } - - @Override - public GT_Packet_New decode(ByteArrayDataInput aData) { - return new MessageSetFlaskCapacity(aData.readInt(), aData.readInt(), aData.readInt()); - } - - @Override - public void process(IBlockAccess aWorld) { - World w = DimensionManager.getWorld(dimID); - if (w != null && w.getEntityByID(playerID) instanceof EntityPlayer) { - ItemStack stack = ((EntityPlayer) w.getEntityByID(playerID)).getHeldItem(); - if ((stack != null) && (stack.stackSize > 0)) { - Item item = stack.getItem(); - if ((item instanceof GT_VolumetricFlask)) ((GT_VolumetricFlask) item).setCapacity(stack, capacity); - } - } - } -} diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java index a40a65f0b4..6964b13165 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java @@ -432,11 +432,6 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa GT_UITextures.OVERLAY_SLOT_DUST_STEAM.get(getSteamVariant()) }; } - @Override - public boolean useModularUI() { - return true; - } - @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( diff --git a/src/main/java/gregtech/common/tileentities/debug/GT_MetaTileEntity_AdvDebugStructureWriter.java b/src/main/java/gregtech/common/tileentities/debug/GT_MetaTileEntity_AdvDebugStructureWriter.java index 057c651aab..e61ae456f0 100644 --- a/src/main/java/gregtech/common/tileentities/debug/GT_MetaTileEntity_AdvDebugStructureWriter.java +++ b/src/main/java/gregtech/common/tileentities/debug/GT_MetaTileEntity_AdvDebugStructureWriter.java @@ -234,11 +234,6 @@ public class GT_MetaTileEntity_AdvDebugStructureWriter extends GT_MetaTileEntity return result; } - @Override - public boolean useModularUI() { - return true; - } - @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java index b32a7be172..f4d78ec9b3 100644 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java +++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java @@ -368,11 +368,6 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc return ss.toArray(new String[itemCache.size() + 2]); } - @Override - public boolean useModularUI() { - return true; - } - @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { getBaseMetaTileEntity().add1by1Slot(builder); diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java index 8a4bd3a5e8..b173987aa2 100644 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java +++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java @@ -436,11 +436,6 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O return input; } - @Override - public boolean useModularUI() { - return true; - } - @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { getBaseMetaTileEntity().add1by1Slot(builder); 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 diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java index db58a1152e..322797cbba 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java @@ -300,17 +300,6 @@ public abstract class GT_MetaTileEntity_DrillerBase return isPickingPipes = false; } - /** - * Added for compability reasons - * - * @return true if the state is 0 false otherwise. - * @deprecated compatibility reason - */ - @Deprecated - protected boolean tryLowerPipe() { - return tryLowerPipeState(false) == 0; - } - /** * @return 0 for succeeded, 1 for invalid block, 2 for not having mining pipes, 3 for event canceled. */ @@ -665,23 +654,6 @@ public abstract class GT_MetaTileEntity_DrillerBase return true; } - @Deprecated - protected boolean checkCasingBlock(int xOff, int yOff, int zOff) { - return checkBlockAndMetaOffset(xOff, yOff, zOff, casingBlock, casingMeta); - } - - // meta of frame is getTileEntityBaseType; frame should be checked using its drops (possible a high weight - // operation) - @Deprecated - protected boolean checkFrameBlock(int xOff, int yOff, int zOff) { - return checkBlockAndMetaOffset(xOff, yOff, zOff, GregTech_API.sBlockMachines, frameMeta); - } - - @Deprecated - protected boolean checkBlockAndMetaOffset(int xOff, int yOff, int zOff, Block block, int meta) { - return checkBlockAndMeta(xDrill + xOff, yDrill + yOff, zDrill + zOff, block, meta); - } - private boolean checkBlockAndMeta(int x, int y, int z, Block block, int meta) { return (meta == W || getBaseMetaTileEntity().getMetaID(x, y, z) == meta) && getBaseMetaTileEntity().getBlock(x, y, z) == block; @@ -718,11 +690,6 @@ public abstract class GT_MetaTileEntity_DrillerBase protected abstract ItemList getCasingBlockItem(); - @Deprecated - protected String getCasingName() { - return null; - } - protected abstract Materials getFrameMaterial(); protected abstract int getCasingTextureIndex(); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java index ada01bc002..140c6c37df 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java @@ -1003,11 +1003,6 @@ public class GT_MetaTileEntity_PCBFactory extends return SoundResource.IC2_MACHINES_MAGNETIZER_LOOP; } - @Override - public boolean useModularUI() { - return true; - } - @Override public byte getUpdateData() { byte data = 0; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java index e69d2c2921..d28aae81ce 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java @@ -460,11 +460,6 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn hintsOnly); } - @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/multi/purification/GT_MetaTileEntity_pHSensor.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_pHSensor.java index 49ed4072b1..e8e393cb3c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_pHSensor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_pHSensor.java @@ -93,11 +93,6 @@ public class GT_MetaTileEntity_pHSensor extends GT_MetaTileEntity_Hatch { return true; } - @Override - public boolean useModularUI() { - return true; - } - @Override public String[] getDescription() { return new String[] { "Can be installed in the pH Neutralization Purification Unit.", diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java index d1bdd9763a..1576f61ff8 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java +++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java @@ -519,11 +519,6 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti tag.setTag("itemType", is.writeToNBT(new NBTTagCompound())); } - @Override - public boolean useModularUI() { - return true; - } - protected static final NumberFormatMUI numberFormat = new NumberFormatMUI(); protected int clientItemCount; diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java index e94458c116..cd609af343 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java +++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java @@ -539,11 +539,6 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit else if (tag.hasKey("mFluid")) tag.removeTag("mFluid"); } - @Override - public boolean useModularUI() { - return true; - } - protected static final NumberFormatMUI numberFormat = new NumberFormatMUI(); @Override -- cgit