aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2024-08-16 22:26:16 +0900
committerGitHub <noreply@github.com>2024-08-16 22:26:16 +0900
commit83ebeadd3b867f45914972f4573211b3324ca433 (patch)
tree02acdcbb7cda6ee8c72cf7b4f575aa6591373d74 /src/main/java/gregtech/api
parent07610983b13813893b482e2c1a050355fd007c60 (diff)
downloadGT5-Unofficial-83ebeadd3b867f45914972f4573211b3324ca433.tar.gz
GT5-Unofficial-83ebeadd3b867f45914972f4573211b3324ca433.tar.bz2
GT5-Unofficial-83ebeadd3b867f45914972f4573211b3324ca433.zip
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>
Diffstat (limited to 'src/main/java/gregtech/api')
-rw-r--r--src/main/java/gregtech/api/GregTech_API.java42
-rw-r--r--src/main/java/gregtech/api/enums/GT_Values.java10
-rw-r--r--src/main/java/gregtech/api/enums/OrePrefixes.java44
-rw-r--r--src/main/java/gregtech/api/graphs/paths/PowerNodePath.java36
-rw-r--r--src/main/java/gregtech/api/gui/GT_Container.java740
-rw-r--r--src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java244
-rw-r--r--src/main/java/gregtech/api/gui/GT_Container_1by1.java30
-rw-r--r--src/main/java/gregtech/api/gui/GT_Container_2by2.java33
-rw-r--r--src/main/java/gregtech/api/gui/GT_Container_3by3.java38
-rw-r--r--src/main/java/gregtech/api/gui/GT_Container_4by4.java45
-rw-r--r--src/main/java/gregtech/api/gui/GT_Container_BasicTank.java138
-rw-r--r--src/main/java/gregtech/api/gui/GT_Container_MultiMachine.java39
-rw-r--r--src/main/java/gregtech/api/gui/GT_GUIColorOverride.java1
-rw-r--r--src/main/java/gregtech/api/gui/GT_GUIContainer.java99
-rw-r--r--src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java271
-rw-r--r--src/main/java/gregtech/api/gui/GT_GUIContainer_1by1.java42
-rw-r--r--src/main/java/gregtech/api/gui/GT_GUIContainer_2by2.java42
-rw-r--r--src/main/java/gregtech/api/gui/GT_GUIContainer_3by3.java42
-rw-r--r--src/main/java/gregtech/api/gui/GT_GUIContainer_4by4.java42
-rw-r--r--src/main/java/gregtech/api/gui/GT_GUIContainer_BasicTank.java47
-rw-r--r--src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java173
-rw-r--r--src/main/java/gregtech/api/gui/GT_GUICover.java55
-rw-r--r--src/main/java/gregtech/api/gui/GT_GUIDialogSelectItem.java229
-rw-r--r--src/main/java/gregtech/api/gui/GT_GUIScreen.java327
-rw-r--r--src/main/java/gregtech/api/gui/GT_Slot_Armor.java30
-rw-r--r--src/main/java/gregtech/api/gui/GT_Slot_DataOrb.java19
-rw-r--r--src/main/java/gregtech/api/gui/GT_Slot_Holo.java77
-rw-r--r--src/main/java/gregtech/api/gui/GT_Slot_Output.java17
-rw-r--r--src/main/java/gregtech/api/gui/GT_Slot_Render.java24
-rw-r--r--src/main/java/gregtech/api/gui/widgets/GT_GuiCoverTabLine.java179
-rw-r--r--src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java162
-rw-r--r--src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java157
-rw-r--r--src/main/java/gregtech/api/gui/widgets/GT_GuiIconButton.java114
-rw-r--r--src/main/java/gregtech/api/gui/widgets/GT_GuiIconCheckButton.java43
-rw-r--r--src/main/java/gregtech/api/gui/widgets/GT_GuiIntegerTextBox.java73
-rw-r--r--src/main/java/gregtech/api/gui/widgets/GT_GuiSlotTooltip.java24
-rw-r--r--src/main/java/gregtech/api/gui/widgets/GT_GuiSmartTooltip.java27
-rw-r--r--src/main/java/gregtech/api/gui/widgets/GT_GuiTab.java174
-rw-r--r--src/main/java/gregtech/api/gui/widgets/GT_GuiTabLine.java274
-rw-r--r--src/main/java/gregtech/api/gui/widgets/GT_GuiTooltip.java121
-rw-r--r--src/main/java/gregtech/api/gui/widgets/GT_GuiTooltipManager.java80
-rw-r--r--src/main/java/gregtech/api/interfaces/IDragAndDropSupport.java58
-rw-r--r--src/main/java/gregtech/api/interfaces/IFluidAccess.java26
-rw-r--r--src/main/java/gregtech/api/interfaces/IGlobalWirelessEnergy.java98
-rw-r--r--src/main/java/gregtech/api/interfaces/IGuiIcon.java19
-rw-r--r--src/main/java/gregtech/api/interfaces/IGuiScreen.java45
-rw-r--r--src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java26
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IHasWorldObjectAndCoords.java23
-rw-r--r--src/main/java/gregtech/api/items/GT_Generic_Item.java5
-rw-r--r--src/main/java/gregtech/api/metatileentity/BaseTileEntity.java21
-rw-r--r--src/main/java/gregtech/api/metatileentity/CommonMetaTileEntity.java2
-rw-r--r--src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java20
-rw-r--r--src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java16
-rw-r--r--src/main/java/gregtech/api/metatileentity/MetaTileEntity.java34
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java20
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java11
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java5
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java5
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java5
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicTank.java20
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java5
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DataAccess.java5
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Input.java5
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBus.java12
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java5
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_MultiInput.java5
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java5
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java12
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MagHatch.java5
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java11
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java7
-rw-r--r--src/main/java/gregtech/api/net/GT_PacketTypes.java8
-rw-r--r--src/main/java/gregtech/api/net/GT_Packet_GtTileEntityGuiRequest.java122
-rw-r--r--src/main/java/gregtech/api/net/GT_Packet_Sound.java5
-rw-r--r--src/main/java/gregtech/api/net/GT_Packet_TileEntityCover.java98
-rw-r--r--src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java219
-rw-r--r--src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverNew.java119
-rw-r--r--src/main/java/gregtech/api/net/GT_Packet_WirelessRedstoneCover.java99
-rw-r--r--src/main/java/gregtech/api/util/GT_CoverBehavior.java29
-rw-r--r--src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java35
-rw-r--r--src/main/java/gregtech/api/util/GT_ModHandler.java54
-rw-r--r--src/main/java/gregtech/api/util/GT_PlayedSound.java11
-rw-r--r--src/main/java/gregtech/api/util/GT_Utility.java100
83 files changed, 12 insertions, 5827 deletions
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;
@@ -95,16 +93,6 @@ import gregtech.common.items.GT_IntegratedCircuit_Item;
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
* <br>
* <br>
@@ -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;
/**
@@ -901,17 +879,6 @@ public class GregTech_API {
/**
* 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
*
* @return The Cover behavior
*/
@@ -927,15 +894,6 @@ public class GregTech_API {
/**
* 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
- */
public static GT_CoverBehaviorBase<?> getCoverBehaviorNew(int aStack) {
if (aStack == 0) return sNoBehavior;
return getCoverBehaviorNew(GT_Utility.intToStack(aStack));
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, false, false, true, false, false, false, true, B[3], -1, 64,
- -1),
/** Prefix of the Dense-Ores Mod. Causes Ores to double. Ore -> Material is a Oneway Operation! */
oreDense("Dense Ores", "Dense ", " Ore", true, true, false, false, false, true, false, false, false, true, B[3], -1,
64, -1),
@@ -87,8 +74,6 @@ public enum OrePrefixes {
/** In case of an End-Ores Mod. Ore -> Material is a Oneway Operation! */
oreEnd("End Ores", "End ", " Ore", true, true, false, false, false, true, false, false, false, true, B[3], -1, 64,
-1),
- @Deprecated
- oreGem("Ores", "", "", false, false, false, false, false, true, false, false, false, true, B[3], -1, 64, -1),
/** Regular Ore Prefix. Ore -> Material is a Oneway Operation! Introduced by Eloraam */
ore("Ores", "", " Ore", true, true, false, false, false, true, false, false, false, true, B[3], -1, 64, 68),
crushedCentrifuged("Centrifuged Ores", "Centrifuged ", " Ore", true, true, false, false, false, false, false, true,
@@ -118,9 +103,6 @@ public enum OrePrefixes {
/** A quadruple Ingot. */
ingotQuadruple("4x Ingots", "Quadruple ", " Ingot", true, true, false, false, false, false, true, true, false,
false, B[1], M * 4, 64, 15),
- @Deprecated
- ingotQuad("4x Ingots", "Quadruple ", " Ingot", false, false, false, false, false, false, false, false, false, false,
- B[1], -1, 64, 15),
/** A triple Ingot. */
ingotTriple("3x Ingots", "Triple ", " Ingot", true, true, false, false, false, false, true, false, false, false,
B[1], M * 3, 64, 14),
@@ -147,9 +129,6 @@ public enum OrePrefixes {
false, B[2], M * 4, 64, 62),
/** A regular Gem worth one Dust. Introduced by Eloraam */
gem("Gemstones", "", "", true, true, true, false, false, false, true, true, false, false, B[2], M * 1, 64, 8),
- @Deprecated
- dustDirty("Impure Dusts", "", "", false, false, false, false, false, false, false, false, false, true, B[3], -1, 64,
- 3),
/** 1/9th of a Dust. */
dustTiny("Tiny Dusts", "Tiny Pile of ", " Dust", true, true, false, false, false, false, false, true, false, false,
B[0] | B[1] | B[2] | B[3], M / 9, 64, 0),
@@ -181,9 +160,6 @@ public enum OrePrefixes {
false, B[1], M * 5, 64, 21),
plateQuadruple("4x Plates", "Quadruple ", " Plate", true, true, false, false, false, false, true, true, false,
false, B[1], M * 4, 64, 20),
- @Deprecated
- plateQuad("4x Plates", "", "", false, false, false, false, false, false, false, false, false, false, B[1], -1, 64,
- 20),
plateTriple("3x Plates", "Triple ", " Plate", true, true, false, false, false, false, true, true, false, false,
B[1], M * 3, 64, 19),
plateDouble("2x Plates", "Double ", " Plate", true, true, false, false, false, false, true, true, false, false,
@@ -391,15 +367,9 @@ public enum OrePrefixes {
/** Mossy Cobble. */
stoneMossy("Mossy Stones", "", "", false, false, true, false, false, true, false, false, false, false, 0, -1, 64,
-1),
- @Deprecated
- stoneBricksMossy("Mossy Stone Bricks", "", "", false, false, false, false, false, true, false, false, false, false,
- 0, -1, 64, -1),
/** Stone Bricks. */
stoneBricks("Stone Bricks", "", "", false, false, true, false, false, true, false, false, false, false, 0, -1, 64,
-1),
- @Deprecated
- stoneBrick("Stone Bricks", "", "", false, false, false, false, false, true, false, false, false, false, 0, -1, 64,
- -1),
/** Cracked Bricks. */
stoneCracked("Cracked Stones", "", "", false, false, true, false, false, true, false, false, false, false, 0, -1,
64, -1),
@@ -655,18 +625,6 @@ public enum OrePrefixes {
cellSteamCracked3);
static {
- pulp.mPrefixInto = dust;
- oreGem.mPrefixInto = ore;
- leaves.mPrefixInto = treeLeaves;
- sapling.mPrefixInto = treeSapling;
- itemDust.mPrefixInto = dust;
- dustDirty.mPrefixInto = dustImpure;
- denseore.mPrefixInto = oreDense;
- ingotQuad.mPrefixInto = ingotQuadruple;
- plateQuad.mPrefixInto = plateQuadruple;
- stoneBrick.mPrefixInto = stoneBricks;
- stoneBricksMossy.mPrefixInto = stoneMossyBricks;
-
ingotHot.mHeatDamage = 3.0F;
cellMolten.mHeatDamage = 3;
cellPlasma.mHeatDamage = 6.0F;
@@ -977,7 +935,7 @@ public enum OrePrefixes {
public final List<TC_AspectStack> mAspects = new ArrayList<>();
public final Collection<OrePrefixes> mFamiliarPrefixes = new HashSet<>();
/**
- * Used to determine the amount of Material this Prefix contains. Multiply or Divide GregTech_API.MATERIAL_UNIT to
+ * Used to determine the amount of Material this Prefix contains. Multiply or Divide