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 --- .../common/hatch/TileHatchBeamlineConnector.java | 2 +- .../common/hatch/TileHatchInputBeamline.java | 4 +- .../common/hatch/TileHatchOutputBeamline.java | 4 +- .../tiered/GT_MetaTileEntity_RadioHatch.java | 5 - .../tectech/loader/thing/MachineLoader.java | 2 +- .../tectech/thing/casing/GT_Item_CasingsBA0.java | 2 +- .../thing/cover/GT_Cover_TM_EnderFluidLink.java | 5 - .../tectech/thing/item/TeslaCoilCapacitor.java | 2 +- .../hatch/GT_MetaTileEntity_Hatch_Capacitor.java | 7 +- .../hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java | 2 +- .../GT_MetaTileEntity_Hatch_DynamoTunnel.java | 7 +- .../hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java | 2 +- .../GT_MetaTileEntity_Hatch_EnergyTunnel.java | 7 +- .../hatch/GT_MetaTileEntity_Hatch_Holder.java | 5 - .../hatch/GT_MetaTileEntity_Hatch_Param.java | 5 - .../hatch/GT_MetaTileEntity_Hatch_Rack.java | 5 - .../hatch/GT_MetaTileEntity_Hatch_Uncertainty.java | 5 - ...TileEntity_Hatch_WirelessComputation_Input.java | 5 - .../GT_MetaTileEntity_Hatch_WirelessMulti.java | 15 +- .../multi/GT_MetaTileEntity_EM_EyeOfHarmony.java | 13 +- .../multi/GT_MetaTileEntity_EM_computer.java | 2 +- .../multi/GT_MetaTileEntity_EM_dataBank.java | 2 +- .../multi/GT_MetaTileEntity_EM_research.java | 4 +- .../multi/GT_MetaTileEntity_EM_switch.java | 2 +- .../multi/GT_MetaTileEntity_TM_teslaCoil.java | 2 +- .../base/GT_MetaTileEntity_MultiblockBase_EM.java | 4 +- .../single/GT_MetaTileEntity_BuckConverter.java | 14 +- .../single/GT_MetaTileEntity_DebugPollutor.java | 5 - .../GT_MetaTileEntity_DebugPowerGenerator.java | 7 +- .../GT_MetaTileEntity_DebugStructureWriter.java | 5 - .../single/GT_MetaTileEntity_TeslaCoil.java | 2 +- .../single/GT_MetaTileEntity_WetTransformer.java | 2 +- .../github/technus/tectech/util/CommonValues.java | 5 - .../github/technus/tectech/util/TT_Utility.java | 6 +- .../tileEntity/GTMetaTileEntity/NeutronSensor.java | 5 - .../tileEntity/SupercriticalFluidTurbine.java | 2 + src/main/java/gregtech/GT_Mod.java | 14 - src/main/java/gregtech/api/GregTech_API.java | 42 -- src/main/java/gregtech/api/enums/GT_Values.java | 10 - src/main/java/gregtech/api/enums/OrePrefixes.java | 44 +- .../gregtech/api/graphs/paths/PowerNodePath.java | 36 - src/main/java/gregtech/api/gui/GT_Container.java | 740 --------------------- .../api/gui/GT_ContainerMetaTile_Machine.java | 244 ------- .../java/gregtech/api/gui/GT_Container_1by1.java | 30 - .../java/gregtech/api/gui/GT_Container_2by2.java | 33 - .../java/gregtech/api/gui/GT_Container_3by3.java | 38 -- .../java/gregtech/api/gui/GT_Container_4by4.java | 45 -- .../gregtech/api/gui/GT_Container_BasicTank.java | 138 ---- .../api/gui/GT_Container_MultiMachine.java | 39 -- .../java/gregtech/api/gui/GT_GUIColorOverride.java | 1 + .../java/gregtech/api/gui/GT_GUIContainer.java | 99 --- .../api/gui/GT_GUIContainerMetaTile_Machine.java | 271 -------- .../gregtech/api/gui/GT_GUIContainer_1by1.java | 42 -- .../gregtech/api/gui/GT_GUIContainer_2by2.java | 42 -- .../gregtech/api/gui/GT_GUIContainer_3by3.java | 42 -- .../gregtech/api/gui/GT_GUIContainer_4by4.java | 42 -- .../api/gui/GT_GUIContainer_BasicTank.java | 47 -- .../api/gui/GT_GUIContainer_MultiMachine.java | 173 ----- src/main/java/gregtech/api/gui/GT_GUICover.java | 55 -- .../gregtech/api/gui/GT_GUIDialogSelectItem.java | 229 ------- src/main/java/gregtech/api/gui/GT_GUIScreen.java | 327 --------- src/main/java/gregtech/api/gui/GT_Slot_Armor.java | 30 - .../java/gregtech/api/gui/GT_Slot_DataOrb.java | 19 - src/main/java/gregtech/api/gui/GT_Slot_Holo.java | 77 --- src/main/java/gregtech/api/gui/GT_Slot_Output.java | 17 - src/main/java/gregtech/api/gui/GT_Slot_Render.java | 24 - .../api/gui/widgets/GT_GuiCoverTabLine.java | 179 ----- .../api/gui/widgets/GT_GuiFakeItemButton.java | 162 ----- .../java/gregtech/api/gui/widgets/GT_GuiIcon.java | 157 ----- .../gregtech/api/gui/widgets/GT_GuiIconButton.java | 114 ---- .../api/gui/widgets/GT_GuiIconCheckButton.java | 43 -- .../api/gui/widgets/GT_GuiIntegerTextBox.java | 73 -- .../api/gui/widgets/GT_GuiSlotTooltip.java | 24 - .../api/gui/widgets/GT_GuiSmartTooltip.java | 27 - .../java/gregtech/api/gui/widgets/GT_GuiTab.java | 174 ----- .../gregtech/api/gui/widgets/GT_GuiTabLine.java | 274 -------- .../gregtech/api/gui/widgets/GT_GuiTooltip.java | 121 ---- .../api/gui/widgets/GT_GuiTooltipManager.java | 80 --- .../api/interfaces/IDragAndDropSupport.java | 58 -- .../java/gregtech/api/interfaces/IFluidAccess.java | 26 - .../api/interfaces/IGlobalWirelessEnergy.java | 98 --- .../java/gregtech/api/interfaces/IGuiIcon.java | 19 - .../java/gregtech/api/interfaces/IGuiScreen.java | 45 -- .../interfaces/metatileentity/IMetaTileEntity.java | 26 - .../tileentity/IHasWorldObjectAndCoords.java | 23 +- .../java/gregtech/api/items/GT_Generic_Item.java | 5 - .../api/metatileentity/BaseTileEntity.java | 21 - .../api/metatileentity/CommonMetaTileEntity.java | 2 +- .../api/metatileentity/CoverableTileEntity.java | 20 +- .../api/metatileentity/MetaPipeEntity.java | 16 - .../api/metatileentity/MetaTileEntity.java | 34 - .../implementations/GT_MetaPipeEntity_Cable.java | 20 - .../implementations/GT_MetaPipeEntity_Fluid.java | 11 - .../GT_MetaTileEntity_BasicBatteryBuffer.java | 5 - .../GT_MetaTileEntity_BasicGenerator.java | 5 - .../GT_MetaTileEntity_BasicMachine.java | 5 - .../GT_MetaTileEntity_BasicTank.java | 20 - .../implementations/GT_MetaTileEntity_Buffer.java | 5 - .../GT_MetaTileEntity_Hatch_DataAccess.java | 5 - .../GT_MetaTileEntity_Hatch_Input.java | 5 - .../GT_MetaTileEntity_Hatch_InputBus.java | 12 - .../GT_MetaTileEntity_Hatch_Maintenance.java | 5 - .../GT_MetaTileEntity_Hatch_MultiInput.java | 5 - .../GT_MetaTileEntity_Hatch_Output.java | 5 - .../GT_MetaTileEntity_Hatch_OutputBus.java | 12 - .../GT_MetaTileEntity_MagHatch.java | 5 - .../GT_MetaTileEntity_MultiBlockBase.java | 11 - .../GT_MetaTileEntity_TieredMachineBlock.java | 7 - src/main/java/gregtech/api/net/GT_PacketTypes.java | 8 - .../api/net/GT_Packet_GtTileEntityGuiRequest.java | 122 ---- .../java/gregtech/api/net/GT_Packet_Sound.java | 5 +- .../api/net/GT_Packet_TileEntityCover.java | 98 --- .../api/net/GT_Packet_TileEntityCoverGUI.java | 219 ------ .../api/net/GT_Packet_TileEntityCoverNew.java | 119 ---- .../api/net/GT_Packet_WirelessRedstoneCover.java | 99 --- .../java/gregtech/api/util/GT_CoverBehavior.java | 29 +- .../gregtech/api/util/GT_CoverBehaviorBase.java | 35 +- src/main/java/gregtech/api/util/GT_ModHandler.java | 54 -- .../java/gregtech/api/util/GT_PlayedSound.java | 11 - src/main/java/gregtech/api/util/GT_Utility.java | 100 --- 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 - .../java/gregtech/loaders/preload/GT_PreLoad.java | 16 - .../core/container/Container_PestKiller.java | 89 ++- ...etaTileEntity_Hatch_ElementalDataOrbHolder.java | 5 - .../GT_MetaTileEntity_Hatch_InputBattery.java | 5 - .../GT_MetaTileEntity_Hatch_Muffler_Adv.java | 5 - .../GT_MetaTileEntity_Hatch_OutputBattery.java | 5 - .../GT_MetaTileEntity_Hatch_Steam_BusInput.java | 5 - .../GT_MetaTileEntity_Hatch_Steam_BusOutput.java | 5 - .../GT_MetaTileEntity_Hatch_Turbine.java | 5 - .../GT_MetaTileEntity_Hatch_CustomFluidBase.java | 5 - .../GregtechRocketFuelGeneratorBase.java | 5 - .../GT_MetaTileEntity_Hatch_NbtConsumable.java | 9 +- .../common/covers/GTPP_Cover_Overflow.java | 5 - .../GT_MetaTileEntity_ElectricAutoWorkbench.java | 5 - .../basic/GT_MetaTileEntity_CropHarvestor.java | 5 - .../GregtechMetaAtmosphericReconditioner.java | 5 - .../basic/GregtechMetaTileEntity_AutoChisel.java | 5 - .../GregtechMetaTileEntity_IndustrialMixer.java | 2 - .../GregtechMetaTileEntity_IndustrialWireMill.java | 2 - .../GT_MetaTileEntity_RedstoneCircuitBlock.java | 5 - .../storage/GT_MetaTileEntity_TieredChest.java | 5 - .../storage/GT_MetaTileEntity_TieredTank.java | 5 - .../implementations/KubaTechGTMultiBlockBase.java | 5 - 183 files changed, 152 insertions(+), 6440 deletions(-) delete mode 100644 src/main/java/gregtech/api/gui/GT_Container.java delete mode 100644 src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java delete mode 100644 src/main/java/gregtech/api/gui/GT_Container_1by1.java delete mode 100644 src/main/java/gregtech/api/gui/GT_Container_2by2.java delete mode 100644 src/main/java/gregtech/api/gui/GT_Container_3by3.java delete mode 100644 src/main/java/gregtech/api/gui/GT_Container_4by4.java delete mode 100644 src/main/java/gregtech/api/gui/GT_Container_BasicTank.java delete mode 100644 src/main/java/gregtech/api/gui/GT_Container_MultiMachine.java delete mode 100644 src/main/java/gregtech/api/gui/GT_GUIContainer.java delete mode 100644 src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java delete mode 100644 src/main/java/gregtech/api/gui/GT_GUIContainer_1by1.java delete mode 100644 src/main/java/gregtech/api/gui/GT_GUIContainer_2by2.java delete mode 100644 src/main/java/gregtech/api/gui/GT_GUIContainer_3by3.java delete mode 100644 src/main/java/gregtech/api/gui/GT_GUIContainer_4by4.java delete mode 100644 src/main/java/gregtech/api/gui/GT_GUIContainer_BasicTank.java delete mode 100644 src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java delete mode 100644 src/main/java/gregtech/api/gui/GT_GUICover.java delete mode 100644 src/main/java/gregtech/api/gui/GT_GUIDialogSelectItem.java delete mode 100644 src/main/java/gregtech/api/gui/GT_GUIScreen.java delete mode 100644 src/main/java/gregtech/api/gui/GT_Slot_Armor.java delete mode 100644 src/main/java/gregtech/api/gui/GT_Slot_DataOrb.java delete mode 100644 src/main/java/gregtech/api/gui/GT_Slot_Holo.java delete mode 100644 src/main/java/gregtech/api/gui/GT_Slot_Output.java delete mode 100644 src/main/java/gregtech/api/gui/GT_Slot_Render.java delete mode 100644 src/main/java/gregtech/api/gui/widgets/GT_GuiCoverTabLine.java delete mode 100644 src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java delete mode 100644 src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java delete mode 100644 src/main/java/gregtech/api/gui/widgets/GT_GuiIconButton.java delete mode 100644 src/main/java/gregtech/api/gui/widgets/GT_GuiIconCheckButton.java delete mode 100644 src/main/java/gregtech/api/gui/widgets/GT_GuiIntegerTextBox.java delete mode 100644 src/main/java/gregtech/api/gui/widgets/GT_GuiSlotTooltip.java delete mode 100644 src/main/java/gregtech/api/gui/widgets/GT_GuiSmartTooltip.java delete mode 100644 src/main/java/gregtech/api/gui/widgets/GT_GuiTab.java delete mode 100644 src/main/java/gregtech/api/gui/widgets/GT_GuiTabLine.java delete mode 100644 src/main/java/gregtech/api/gui/widgets/GT_GuiTooltip.java delete mode 100644 src/main/java/gregtech/api/gui/widgets/GT_GuiTooltipManager.java delete mode 100644 src/main/java/gregtech/api/interfaces/IDragAndDropSupport.java delete mode 100644 src/main/java/gregtech/api/interfaces/IFluidAccess.java delete mode 100644 src/main/java/gregtech/api/interfaces/IGlobalWirelessEnergy.java delete mode 100644 src/main/java/gregtech/api/interfaces/IGuiIcon.java delete mode 100644 src/main/java/gregtech/api/interfaces/IGuiScreen.java delete mode 100644 src/main/java/gregtech/api/net/GT_Packet_GtTileEntityGuiRequest.java delete mode 100644 src/main/java/gregtech/api/net/GT_Packet_TileEntityCover.java delete mode 100644 src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java delete mode 100644 src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverNew.java delete mode 100644 src/main/java/gregtech/api/net/GT_Packet_WirelessRedstoneCover.java delete mode 100644 src/main/java/gregtech/common/net/MessageSetFlaskCapacity.java (limited to 'src/main/java') diff --git a/src/main/java/com/elisis/gtnhlanth/common/hatch/TileHatchBeamlineConnector.java b/src/main/java/com/elisis/gtnhlanth/common/hatch/TileHatchBeamlineConnector.java index c0fa41774b..0c9cb9ad51 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/hatch/TileHatchBeamlineConnector.java +++ b/src/main/java/com/elisis/gtnhlanth/common/hatch/TileHatchBeamlineConnector.java @@ -33,7 +33,7 @@ public abstract class TileHatchBeamlineConnector extends G TT_Utility.setTier(aTier, this); } - protected TileHatchBeamlineConnector(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + protected TileHatchBeamlineConnector(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); } diff --git a/src/main/java/com/elisis/gtnhlanth/common/hatch/TileHatchInputBeamline.java b/src/main/java/com/elisis/gtnhlanth/common/hatch/TileHatchInputBeamline.java index e5a5c9df2f..ffa0ecf56c 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/hatch/TileHatchInputBeamline.java +++ b/src/main/java/com/elisis/gtnhlanth/common/hatch/TileHatchInputBeamline.java @@ -34,7 +34,7 @@ public class TileHatchInputBeamline extends TileHatchBeamlineConnector 1 } - @Override - public boolean useModularUI() { - return true; - } - @Override public void addGregTechLogo(ModularWindow.Builder builder) { builder.widget( diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java index 6ecbe67d22..2b0a4f2674 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java @@ -340,11 +340,6 @@ public class GT_MetaTileEntity_Hatch_Uncertainty extends GT_MetaTileEntity_Hatch return status; } - @Override - public boolean useModularUI() { - return true; - } - @Override public void addGregTechLogo(ModularWindow.Builder builder) { builder.widget( diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessComputation_Input.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessComputation_Input.java index c29a5320dd..6824ce2ef1 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessComputation_Input.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessComputation_Input.java @@ -84,11 +84,6 @@ public class GT_MetaTileEntity_Hatch_WirelessComputation_Input extends GT_MetaTi super.onFirstTick(aBaseMetaTileEntity); } - @Override - public boolean useModularUI() { - return true; - } - @Override public void addGregTechLogo(ModularWindow.Builder builder) { builder.widget( diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessMulti.java index 3d3f417b51..7d4baca7cd 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessMulti.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessMulti.java @@ -9,9 +9,12 @@ import static com.gtnewhorizon.gtnhlib.util.AnimatedTooltipHandler.BOLD; import static com.gtnewhorizon.gtnhlib.util.AnimatedTooltipHandler.GRAY; import static gregtech.api.enums.GT_Values.AuthorColen; import static gregtech.api.enums.GT_Values.V; +import static gregtech.common.misc.WirelessNetworkManager.addEUToGlobalEnergyMap; +import static gregtech.common.misc.WirelessNetworkManager.strongCheckOrAddUser; import static java.lang.Long.min; import java.math.BigInteger; +import java.util.UUID; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -19,21 +22,19 @@ import net.minecraftforge.common.util.ForgeDirection; import com.github.technus.tectech.util.TT_Utility; -import gregtech.api.interfaces.IGlobalWirelessEnergy; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.IWirelessEnergyHatchInformation; import gregtech.api.metatileentity.MetaTileEntity; public class GT_MetaTileEntity_Hatch_WirelessMulti extends GT_MetaTileEntity_Hatch_EnergyMulti - implements IGlobalWirelessEnergy, IWirelessEnergyHatchInformation { + implements IWirelessEnergyHatchInformation { private final BigInteger eu_transferred_per_operation = BigInteger .valueOf(Amperes * V[mTier] * ticks_between_energy_addition); private final long eu_transferred_per_operation_long = eu_transferred_per_operation.longValue(); - private String owner_uuid; - private String owner_name; + private UUID owner_uuid; public GT_MetaTileEntity_Hatch_WirelessMulti(int aID, String aName, String aNameRegional, int aTier, int aAmp) { super( @@ -177,11 +178,9 @@ public class GT_MetaTileEntity_Hatch_WirelessMulti extends GT_MetaTileEntity_Hat // On first tick find the player name and attempt to add them to the map. // UUID and username of the owner. - owner_uuid = aBaseMetaTileEntity.getOwnerUuid() - .toString(); - owner_name = aBaseMetaTileEntity.getOwnerName(); + owner_uuid = aBaseMetaTileEntity.getOwnerUuid(); - strongCheckOrAddUser(owner_uuid, owner_name); + strongCheckOrAddUser(owner_uuid); tryFetchingEnergy(); } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java index 8d578c8f5d..b091d33e32 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java @@ -18,6 +18,8 @@ import static gregtech.api.enums.GT_Values.AuthorColen; import static gregtech.api.util.GT_ParallelHelper.calculateChancedOutputMultiplier; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gregtech.api.util.GT_Utility.formatNumbers; +import static gregtech.common.misc.WirelessNetworkManager.addEUToGlobalEnergyMap; +import static gregtech.common.misc.WirelessNetworkManager.strongCheckOrAddUser; import static java.lang.Math.exp; import static java.lang.Math.max; import static java.lang.Math.pow; @@ -37,6 +39,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.UUID; import javax.annotation.Nonnull; @@ -76,7 +79,6 @@ import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.Textures; -import gregtech.api.interfaces.IGlobalWirelessEnergy; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -97,7 +99,7 @@ import pers.gwyog.gtneioreplugin.plugin.block.ModBlocks; @SuppressWarnings("SpellCheckingInspection") public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_MultiblockBase_EM - implements IConstructable, IGlobalWirelessEnergy, ISurvivalConstructable { + implements IConstructable, ISurvivalConstructable { public static final boolean EOH_DEBUG_MODE = false; private static final long MOLTEN_SPACETIME_PER_FAILURE_TIER = 14_400L; @@ -128,7 +130,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl // Exact value to get 2^21 parallels. private static final long ASTRAL_ARRAY_LIMIT = 8637; - private String userUUID = ""; + private UUID userUUID; private BigInteger outputEU_BigInt = BigInteger.ZERO; private long startEU = 0; @@ -1506,9 +1508,8 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl super.onPreTick(aBaseMetaTileEntity, aTick); if (aTick == 1) { - userUUID = String.valueOf(getBaseMetaTileEntity().getOwnerUuid()); - String userName = getBaseMetaTileEntity().getOwnerName(); - strongCheckOrAddUser(userUUID, userName); + userUUID = getBaseMetaTileEntity().getOwnerUuid(); + strongCheckOrAddUser(userUUID); } if (!recipeRunning && mMachine) { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java index c3aef39047..1d358e4947 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java @@ -7,11 +7,11 @@ import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStat import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_OK; import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_LOW; import static com.github.technus.tectech.util.CommonValues.MULTI_CHECK_AT; -import static com.github.technus.tectech.util.CommonValues.V; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.enums.GT_HatchElement.Energy; import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_Values.V; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gregtech.api.util.GT_Utility.filterValidMTEs; import static net.minecraft.util.StatCollector.translateToLocal; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dataBank.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dataBank.java index b084e632d4..cc4954a15d 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dataBank.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dataBank.java @@ -4,9 +4,9 @@ import static com.github.technus.tectech.recipe.TT_recipeAdder.nullItem; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; -import static com.github.technus.tectech.util.CommonValues.V; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static gregtech.api.enums.GT_Values.V; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static net.minecraft.util.StatCollector.translateToLocal; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java index e890f86ebf..5f1e4f4778 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java @@ -3,12 +3,12 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; -import static com.github.technus.tectech.util.CommonValues.V; -import static com.github.technus.tectech.util.CommonValues.VN; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.enums.GT_HatchElement.Energy; import static gregtech.api.enums.GT_HatchElement.Maintenance; +import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.GT_Values.VN; import static gregtech.api.recipe.RecipeMaps.scannerFakeRecipes; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gregtech.api.util.GT_Utility.filterValidMTEs; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java index b408e63af4..60eeb842a0 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java @@ -9,9 +9,9 @@ import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStat import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_OK; import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_LOW; import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_WRONG; -import static com.github.technus.tectech.util.CommonValues.V; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static gregtech.api.enums.GT_Values.V; import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; import static net.minecraft.util.StatCollector.translateToLocal; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java index 8c3ad47ebe..4bf5b8f868 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java @@ -18,7 +18,6 @@ import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStat import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_LOW; import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_WRONG; import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_WTF; -import static com.github.technus.tectech.util.CommonValues.V; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksTiered; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; @@ -27,6 +26,7 @@ import static gregtech.api.enums.GT_HatchElement.Energy; import static gregtech.api.enums.GT_HatchElement.InputHatch; import static gregtech.api.enums.GT_HatchElement.Maintenance; import static gregtech.api.enums.GT_HatchElement.OutputHatch; +import static gregtech.api.enums.GT_Values.V; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gregtech.api.util.GT_Utility.filterValidMTEs; import static java.lang.Math.min; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java index 2e89aa7f82..48c2e44bba 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java @@ -6,8 +6,6 @@ import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texture import static com.github.technus.tectech.util.CommonValues.MULTI_CHECK_AT; import static com.github.technus.tectech.util.CommonValues.RECIPE_AT; import static com.github.technus.tectech.util.CommonValues.TEC_MARK_GENERAL; -import static com.github.technus.tectech.util.CommonValues.V; -import static com.github.technus.tectech.util.CommonValues.VN; import static com.github.technus.tectech.util.TT_Utility.getTier; import static gregtech.api.enums.GT_HatchElement.InputBus; import static gregtech.api.enums.GT_HatchElement.InputHatch; @@ -15,6 +13,8 @@ import static gregtech.api.enums.GT_HatchElement.Maintenance; import static gregtech.api.enums.GT_HatchElement.Muffler; import static gregtech.api.enums.GT_HatchElement.OutputBus; import static gregtech.api.enums.GT_HatchElement.OutputHatch; +import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.GT_Values.VN; import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY; import static gregtech.api.util.GT_Utility.filterValidMTEs; import static java.lang.Math.min; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java index f8ed346fa9..a4187da2ef 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java @@ -3,7 +3,8 @@ package com.github.technus.tectech.thing.metaTileEntity.single; import static com.github.technus.tectech.thing.metaTileEntity.Textures.MACHINE_CASINGS_TT; import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_POWER_TT; import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_POWER_TT; -import static com.github.technus.tectech.util.CommonValues.VN; +import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.GT_Values.VN; import static net.minecraft.util.StatCollector.translateToLocal; import java.util.function.Consumer; @@ -173,7 +174,7 @@ public class GT_MetaTileEntity_BuckConverter extends GT_MetaTileEntity_TieredMac @Override public long maxEUInput() { - return CommonValues.V[mTier]; + return V[mTier]; } @Override @@ -183,12 +184,12 @@ public class GT_MetaTileEntity_BuckConverter extends GT_MetaTileEntity_TieredMac @Override public long maxEUStore() { - return CommonValues.V[mTier] << 4; + return V[mTier] << 4; } @Override public long getMinimumStoredEU() { - return CommonValues.V[mTier] << 2; + return V[mTier] << 2; } @Override @@ -201,11 +202,6 @@ public class GT_MetaTileEntity_BuckConverter extends GT_MetaTileEntity_TieredMac return (int) getBaseMetaTileEntity().getUniversalEnergyCapacity(); } - @Override - public boolean useModularUI() { - return true; - } - @Override public void addGregTechLogo(ModularWindow.Builder builder) { builder.widget( diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPollutor.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPollutor.java index 9e2a5ced60..0e1ad53a1b 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPollutor.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPollutor.java @@ -154,11 +154,6 @@ public class GT_MetaTileEntity_DebugPollutor extends GT_MetaTileEntity_TieredMac return false; } - @Override - public boolean useModularUI() { - return true; - } - @Override public void addGregTechLogo(ModularWindow.Builder builder) { builder.widget( diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java index 342ca69864..469e6e4225 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java @@ -6,7 +6,7 @@ import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_LASER_TT; import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_POWER_TT; import static com.github.technus.tectech.util.CommonValues.TRANSFER_AT; -import static com.github.technus.tectech.util.CommonValues.VN; +import static gregtech.api.enums.GT_Values.VN; import static net.minecraft.util.StatCollector.translateToLocal; import java.util.function.Consumer; @@ -311,11 +311,6 @@ public class GT_MetaTileEntity_DebugPowerGenerator extends GT_MetaTileEntity_Tie } } - @Override - public boolean useModularUI() { - return true; - } - @Override public void addGregTechLogo(ModularWindow.Builder builder) { builder.widget( diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java index 519ea19641..1b9455fb6e 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java @@ -208,11 +208,6 @@ public class GT_MetaTileEntity_DebugStructureWriter extends GT_MetaTileEntity_Ti return result; } - @Override - public boolean useModularUI() { - return true; - } - @Override public void addGregTechLogo(ModularWindow.Builder builder) { builder.widget( diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java index e19ac1bf7d..d5c0be6b21 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java @@ -9,7 +9,7 @@ import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_POWER_TT; import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_TT; import static com.github.technus.tectech.thing.metaTileEntity.Textures.TESLA_TRANSCEIVER_TOP_BA; -import static com.github.technus.tectech.util.CommonValues.V; +import static gregtech.api.enums.GT_Values.V; import static java.lang.Math.round; import static net.minecraft.util.StatCollector.translateToLocal; import static net.minecraft.util.StatCollector.translateToLocalFormatted; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java index ab73cba63e..dfb43eca51 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.single; -import static com.github.technus.tectech.util.CommonValues.V; +import static gregtech.api.enums.GT_Values.V; import static net.minecraft.util.StatCollector.translateToLocal; import com.github.technus.tectech.util.CommonValues; diff --git a/src/main/java/com/github/technus/tectech/util/CommonValues.java b/src/main/java/com/github/technus/tectech/util/CommonValues.java index 8e4539a17a..3f9e3eabac 100644 --- a/src/main/java/com/github/technus/tectech/util/CommonValues.java +++ b/src/main/java/com/github/technus/tectech/util/CommonValues.java @@ -2,8 +2,6 @@ package com.github.technus.tectech.util; import net.minecraft.util.EnumChatFormatting; -import gregtech.api.enums.GT_Values; - /** * Created by danie_000 on 11.01.2017. */ @@ -23,9 +21,6 @@ public final class CommonValues { public static final byte MULTI_CHECK_AT = 12; // multiblock checks its state public static final byte TRANSFER_AT = 16; - public static final String[] VN = GT_Values.VN; - public static final long[] V = GT_Values.V; - public static final String[] EOH_TIER_FANCY_NAMES = { "Crude", "Primitive", "Stable", "Advanced", "Superb", "Exotic", "Perfect", "Tipler", EnumChatFormatting.BOLD + "Gallifreyan" }; diff --git a/src/main/java/com/github/technus/tectech/util/TT_Utility.java b/src/main/java/com/github/technus/tectech/util/TT_Utility.java index cc5f262018..1bf7eae552 100644 --- a/src/main/java/com/github/technus/tectech/util/TT_Utility.java +++ b/src/main/java/com/github/technus/tectech/util/TT_Utility.java @@ -1,5 +1,7 @@ package com.github.technus.tectech.util; +import static gregtech.api.enums.GT_Values.V; + import java.lang.reflect.Field; import java.math.BigInteger; import java.util.Formatter; @@ -98,10 +100,10 @@ public final class TT_Utility { do { ++b; - if (b >= CommonValues.V.length) { + if (b >= V.length) { return b; } - } while (l > CommonValues.V[b]); + } while (l > V[b]); return b; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronSensor.java b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronSensor.java index 86bcbeece9..10a6814ddb 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronSensor.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronSensor.java @@ -234,11 +234,6 @@ public class NeutronSensor extends GT_MetaTileEntity_Hatch { return false; } - @Override - public boolean useModularUI() { - return true; - } - @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { final String INVERTED = GT_Utility.trans("INVERTED", "Inverted"); diff --git a/src/main/java/goodgenerator/blocks/tileEntity/SupercriticalFluidTurbine.java b/src/main/java/goodgenerator/blocks/tileEntity/SupercriticalFluidTurbine.java index 26ed966008..f04cf2eecb 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/SupercriticalFluidTurbine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/SupercriticalFluidTurbine.java @@ -1,5 +1,7 @@ package goodgenerator.blocks.tileEntity; +import static gregtech.api.util.GT_Utility.trans; + import java.util.ArrayList; import net.minecraft.block.Block; diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index 4c23d22802..17d76f564d 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -166,16 +166,8 @@ import ic2.api.recipe.RecipeOutput; + " after:gendustry;") public class GT_Mod implements IGT_Mod { - @Deprecated // Keep for use in BaseMetaTileEntity - public static final int VERSION = VERSION_MAJOR, SUBVERSION = VERSION_MINOR; - - @Deprecated - public static final int TOTAL_VERSION = calculateTotalGTVersion(VERSION, SUBVERSION); public static final int NBT_VERSION = calculateTotalGTVersion(VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH); - @Deprecated - public static final int REQUIRED_IC2 = 624; - @Mod.Instance(Mods.Names.GREG_TECH) public static GT_Mod instance; @@ -214,11 +206,6 @@ public class GT_Mod implements IGT_Mod { Textures.ItemIcons.VOID.name(); } - @SuppressWarnings("unused") // TODO: Delete this method - public static int calculateTotalGTVersion(int minorVersion) { - return calculateTotalGTVersion(VERSION, minorVersion); - } - public static int calculateTotalGTVersion(int majorVersion, int minorVersion) { return calculateTotalGTVersion(majorVersion, minorVersion, 0); } @@ -243,7 +230,6 @@ public class GT_Mod implements IGT_Mod { } Configuration tMainConfig = GT_PreLoad.getConfiguration(aEvent.getModConfigurationDirectory()); - GT_PreLoad.initCompat(); GT_PreLoad.createLogFiles( aEvent.getModConfigurationDirectory() .getParentFile(), diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java index cdcc3b4a0f..932cd3b715 100644 --- a/src/main/java/gregtech/api/GregTech_API.java +++ b/src/main/java/gregtech/api/GregTech_API.java @@ -1,8 +1,6 @@ package gregtech.api; import static gregtech.api.enums.GT_Values.B; -import static gregtech.api.enums.GT_Values.L; -import static gregtech.api.enums.GT_Values.M; import static gregtech.api.enums.Mods.IndustrialCraft2; import java.util.ArrayList; @@ -94,16 +92,6 @@ import gregtech.common.items.GT_IntegratedCircuit_Item; @SuppressWarnings("unused") // API class has legitimately unused methods and members public class GregTech_API { - /** - * @deprecated Use {@link GT_Values#M} - */ - @Deprecated - public static final long MATERIAL_UNIT = M; - /** - * @deprecated Use {@link GT_Values#L} - */ - @Deprecated - public static final long FLUID_MATERIAL_UNIT = L; /** * Fixes the HashMap Mappings for ItemStacks once the Server started *
@@ -312,16 +300,6 @@ public class GregTech_API { sMachineWireFire = true, mOutputRF = false, mInputRF = false, meIOLoaded = false, mRFExplosions = false, mServerStarted = false; - @Deprecated - public static boolean mIC2Classic = false, mMagneticraft = false, mImmersiveEngineering = false, - mGTPlusPlus = false, mTranslocator = false, mTConstruct = false, mGalacticraft = false, mHodgepodge = false, - mAvaritia = false; - /** - * This is always set to true - */ - @Deprecated - public boolean mAE2 = true; - public static int mEUtoRF = 360, mRFtoEU = 20; /** @@ -899,17 +877,6 @@ public class GregTech_API { aStackList.forEach(tStack -> GregTech_API.registerCover(tStack, aCover, aBehavior)); } - /** - * returns a Cover behavior, guaranteed to not return null after preload - */ - @Deprecated - public static GT_CoverBehavior getCoverBehavior(ItemStack aStack) { - if (aStack == null || aStack.getItem() == null) return sNoBehavior; - GT_CoverBehaviorBase rCover = sCoverBehaviors.get(new GT_ItemStack(aStack)); - if (!(rCover instanceof GT_CoverBehavior)) return sDefaultBehavior; - return (GT_CoverBehavior) rCover; - } - /** * returns a Cover behavior, guaranteed to not return null after preload * @@ -924,15 +891,6 @@ public class GregTech_API { return sDefaultBehavior; } - /** - * returns a Cover behavior, guaranteed to not return null - */ - @Deprecated - public static GT_CoverBehavior getCoverBehavior(int aStack) { - if (aStack == 0) return sNoBehavior; - return getCoverBehavior(GT_Utility.intToStack(aStack)); - } - /** * returns a Cover behavior, guaranteed to not return null */ diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java index a7fde53b66..ec4a6ce5c7 100644 --- a/src/main/java/gregtech/api/enums/GT_Values.java +++ b/src/main/java/gregtech/api/enums/GT_Values.java @@ -208,16 +208,6 @@ public class GT_Values { @Deprecated public static final String TEX_DIR = "textures/"; @Deprecated - public static final String TEX_DIR_GUI = TEX_DIR + "gui/"; - @Deprecated - public static final String TEX_DIR_ITEM = TEX_DIR + "items/"; - @Deprecated - public static final String TEX_DIR_BLOCK = TEX_DIR + "blocks/"; - @Deprecated - public static final String TEX_DIR_ENTITY = TEX_DIR + "entity/"; - @Deprecated - public static final String TEX_DIR_ASPECTS = TEX_DIR + "aspects/"; - @Deprecated public static final String RES_PATH = GregTech.getResourcePath(TEX_DIR); @Deprecated public static final String RES_PATH_GUI = GregTech.getResourcePath("textures", "gui/"); diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index a703e8690a..67371a3a9a 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -35,16 +35,6 @@ public enum OrePrefixes { ___placeholder___("Placeholder", "", "", false, false, false, false, false, false, false, false, false, false, 0, 0, 1, -1), - @Deprecated - pulp("Pulps", "", "", false, false, false, false, false, false, false, false, false, false, - B[0] | B[1] | B[2] | B[3], -1, 64, -1), - @Deprecated - leaves("Leaves", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), - @Deprecated - sapling("Saplings", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), - @Deprecated - itemDust("Dusts", "", "", false, false, false, false, false, false, false, false, false, false, - B[0] | B[1] | B[2] | B[3], -1, 64, -1), /** In case of an End-Ores Mod. Ore -> Material is a Oneway Operation! */ oreBlackgranite("Black Granite Ores", "Granite ", " Ore", true, true, false, false, false, true, false, false, false, true, B[3], -1, 64, -1), @@ -63,9 +53,6 @@ public enum OrePrefixes { /** Prefix of the Nether-Ores Mod. Causes Ores to double. Ore -> Material is a Oneway Operation! */ oreNether("Nether Ores", "Nether ", " Ore", true, true, false, false, false, true, false, false, false, true, B[3], -1, 64, -1), - @Deprecated - denseore("Dense Ores", "", "", false, false, false, fal