From 630761e5d633eb976f4a1bd2178a3fbcae5072d4 Mon Sep 17 00:00:00 2001 From: miozune Date: Fri, 29 Dec 2023 21:32:03 +0900 Subject: Cleanup deprecation (#2416) * Remove isValidMetaTileEntity and filterValidMetaTileEntities * Remove OUTPUT_FULL * Remove calclavia oredict * Remove unused GT_GUIColorOverride constructor * Remove getItemGridPositions * Remove unused tool classes * Remove unused GT_Runnable_Sound constructors * Remove unused cover constructors * Remove getBasicOutput() * Remove unused GT_MetaTileEntity_GasTurbine constructors * Remove ImplosionCompressorRecipes#addImplosionRecipe * Remove mOutputItem1 & mOutputItem2 * Remove GT_MetaTileEntity_Miner#moveOneDown & #getFakePlayer * Remove unused GT_Worldgen_GT_Ore_Layer constructor * Remove GT_ModReference * Remove deprecated BaseMetaTileEntity#receiveMetaTileEntityData * Remove deprecated cover variables * Remove deprecated GT_CoverBehaviorBase#isCoverPlaceable * Remove unused variables from GT_MachineRecipeLoader * Remove #getCalcificationOutput * Remove IC2_Fuel_Can_Empty and IC2_Fuel_Can_Filled * Remove deprecated #polluteEnvironment() * Remove FluidDisplaySlotWidget --- .../boilers/GT_MetaTileEntity_Boiler_Solar.java | 21 --------------- .../generators/GT_MetaTileEntity_GasTurbine.java | 30 ---------------------- .../machines/basic/GT_MetaTileEntity_Miner.java | 23 ----------------- .../GT_MetaTileEntity_PrimitiveBlastFurnace.java | 6 ----- 4 files changed, 80 deletions(-) (limited to 'src/main/java/gregtech/common/tileentities') diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java index d136ec9e71..f5c59330ed 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java @@ -69,31 +69,10 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { return new Config(machineconfig + ".boiler.solar.bronze", 1080000, 40, 120, 45); } - /** - * for WAILA - * - * @deprecated replaced by {@link #getMaxOutputPerSecond()} - */ - @Deprecated - public int getBasicOutput() { - return (int) (getMaxOutputPerSecond() * 1.25F); - } - public int getMaxOutputPerSecond() { return mConfig.getMaxOutputPerSecond(); } - /** - * for WAILA - * - * @deprecated replaced by {@link #getProductionPerSecond()} - */ - @SuppressWarnings("unused") - @Deprecated - public int getCalcificationOutput() { - return (int) (getProductionPerSecond() * 1.25F); - } - @Override public String[] getDescription() { return String diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java index 163f9fa319..e18bc00b51 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java @@ -39,22 +39,6 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerat public int mEfficiency; - @Deprecated - public GT_MetaTileEntity_GasTurbine(int aID, String aName, String aNameRegional, int aTier) { - super( - aID, - aName, - aNameRegional, - aTier, - new String[] { "Requires flammable Gasses", - "Causes " - + (int) (GT_Mod.gregtechproxy.mPollutionBaseGasTurbinePerSecond - * GT_Mod.gregtechproxy.mPollutionGasTurbineReleasedByTier[aTier]) - + " Pollution per second" }); - this.mEfficiency = 100 - aTier * 5; - onConfigLoad(); - } - public GT_MetaTileEntity_GasTurbine(int aID, String aName, String aNameRegional, int aTier, int mEfficiency) { super( aID, @@ -70,20 +54,6 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerat onConfigLoad(); } - @Deprecated - public GT_MetaTileEntity_GasTurbine(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - this.mEfficiency = 100 - aTier * 5; - onConfigLoad(); - } - - @Deprecated - public GT_MetaTileEntity_GasTurbine(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - this.mEfficiency = 100 - aTier * 5; - onConfigLoad(); - } - public GT_MetaTileEntity_GasTurbine(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, int mEfficiency) { super(aName, aTier, aDescription, aTextures); 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 39581c6d93..2acaea8050 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 @@ -14,7 +14,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.ChunkPosition; -import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.ForgeDirection; import com.gtnewhorizons.modularui.api.drawable.FallbackableUITexture; @@ -392,28 +391,6 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine return mSpeed; } - /** - * @deprecated This method are obsolete, and may be removed in further updates. Please use - * 'this.getPipe().descent()' access! - */ - @Deprecated - public boolean moveOneDown(IGregTechTileEntity tileEntity) { - boolean descends = pipe.descent(tileEntity); - if (descends) { - fillOreList(tileEntity); - } - return descends; - } - - /** - * @deprecated This method are obsolete, and may be removed in further updates. Please use - * 'this.getPipe().getFakePlayer(te)' access! - */ - @Deprecated - protected FakePlayer getFakePlayer(IGregTechTileEntity aBaseTile) { - return pipe.getFakePlayer(aBaseTile); - } - public GT_DrillingLogicDelegate getPipe() { return pipe; } 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 670d2a3aba..e69d2c2921 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 @@ -81,12 +81,6 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn public ItemStack[] mOutputItems = new ItemStack[OUTPUT_SLOTS]; - @Deprecated - public ItemStack mOutputItem1; - - @Deprecated - public ItemStack mOutputItem2; - public GT_MetaTileEntity_PrimitiveBlastFurnace(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional, INPUT_SLOTS + OUTPUT_SLOTS); } -- cgit