diff options
Diffstat (limited to 'src/main/java/gregtech/api')
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 GT_Values.M to * get the Amounts in comparision to one Ingot. 0 = Null Negative = Undefined Amount */ public final long mMaterialAmount; diff --git a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java index 8a869c333e..d09cf059e9 100644 --- a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java +++ b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java @@ -85,42 +85,6 @@ public class PowerNodePath extends NodePath { } } - // if no amps pass through for more than 0.5 second reduce them to minimize wrong results - // but still allow the player to see if activity is happening - @Deprecated - public long getAmps() { - int tTime = MinecraftServer.getServer() - .getTickCounter() - 10; - if (mTick < tTime) { - reset(tTime - mTick); - mTick = tTime; - } - return mAmps; - } - - @Deprecated - public long getVoltage(MetaPipeEntity aCable) { - int tLoss = 0; - if (mCountUp) { - for (MetaPipeEntity mPipe : mPipes) { - GT_MetaPipeEntity_Cable tCable = (GT_MetaPipeEntity_Cable) mPipe; - tLoss += tCable.mCableLossPerMeter; - if (aCable == tCable) { - return Math.max(mVoltage - tLoss, 0); - } - } |