remove 2.9 deprecated code (#2741)

src/main/java/gregtech/api/GTValues.java

@@ -7,8 +7,6 @@
 import net.minecraftforge.fml.relauncher.FMLLaunchHandler;
 import net.minecraftforge.oredict.OreDictionary;
 
-import org.jetbrains.annotations.ApiStatus;
-
 import java.time.LocalDate;
 import java.util.Random;
 import java.util.function.Supplier;
@@ -173,48 +171,6 @@ public class GTValues {
      */
     public static final String MOD_NAME = "GregTech";
 
-    /** @deprecated Use {@link gregtech.api.util.Mods} instead */
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval(inVersion = "2.9")
-    public static final String MODID_FR = "forestry",
-            MODID_CT = "crafttweaker",
-            MODID_TOP = "theoneprobe",
-            MODID_CTM = "ctm",
-            MODID_CC = "cubicchunks",
-            MODID_AR = "advancedrocketry",
-            MODID_ECORE = "endercore",
-            MODID_EIO = "enderio",
-            MODID_BC = "buildcraftcore",
-            MODID_COFH = "cofhcore",
-            MODID_APPENG = "appliedenergistics2",
-            MODID_JEI = "jei",
-            MODID_GROOVYSCRIPT = "groovyscript",
-            MODID_NC = "nuclearcraft",
-            MODID_IE = "immersiveengineering",
-            MODID_OC = "opencomputers",
-            MODID_JOURNEYMAP = "journeymap",
-            MODID_VOXELMAP = "voxelmap",
-            MODID_XAERO_MINIMAP = "xaerominimap",
-            MODID_HWYLA = "hwyla",
-            MODID_BAUBLES = "baubles",
-            MODID_TOP_ADDONS = "topaddons",
-            MODID_IC2 = "ic2",
-            MODID_GTFO = "gregtechfoodoption",
-            MODID_BINNIE = "binniecore",
-            MODID_XU2 = "extrautils2",
-            MODID_TR = "techreborn",
-            MODID_MB = "magicbees",
-            MODID_EB = "extrabees",
-            MODID_ET = "extratrees",
-            MODID_GENETICS = "genetics",
-            MODID_BOP = "biomesoplenty",
-            MODID_TCON = "tconstruct",
-            MODID_PROJRED_CORE = "projectred-core",
-            MODID_RC = "railcraft",
-            MODID_CHISEL = "chisel",
-            MODID_RS = "refinedstorage",
-            MODID_LITTLETILES = "littletiles";
-
     private static Boolean isClient;
 
     public static boolean isClientSide() {

src/main/java/gregtech/api/block/VariantBlock.java

@@ -26,14 +26,12 @@
 import java.util.Collections;
 import java.util.List;
 
-@SuppressWarnings("deprecation")
-public class VariantBlock<T extends Enum<T> & IStringSerializable> extends Block implements IWalkingSpeedBonus {
+public class VariantBlock<T extends Enum<T> & IStringSerializable> extends Block {
 
     protected PropertyEnum<T> VARIANT;
     protected T[] VALUES;
 
-    @SuppressWarnings("DataFlowIssue")
-    public VariantBlock(Material materialIn) {
+    public VariantBlock(@NotNull Material materialIn) {
         super(materialIn);
         if (VALUES.length > 0 && VALUES[0] instanceof IStateHarvestLevel) {
             for (T t : VALUES) {

src/main/java/gregtech/api/gui/widgets/TankWidget.java

@@ -30,7 +30,6 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -126,15 +125,6 @@ public String getFluidLocalizedName() {
         return lastFluidInTank == null ? "" : lastFluidInTank.getLocalizedName();
     }
 
-    /**
-     * @deprecated use {@link #getFluidTextComponent()}
-     */
-    @ApiStatus.ScheduledForRemoval(inVersion = "2.9")
-    @Deprecated
-    public String getFluidUnlocalizedName() {
-        return lastFluidInTank == null ? "" : lastFluidInTank.getUnlocalizedName();
-    }
-
     @Nullable
     public TextComponentTranslation getFluidTextComponent() {
         if (lastFluidInTank == null) return null;

src/main/java/gregtech/api/metatileentity/MTETrait.java

@@ -9,7 +9,6 @@
 
 import it.unimi.dsi.fastutil.objects.Object2IntFunction;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.function.Consumer;
@@ -80,31 +79,9 @@ public void deserializeNBT(@NotNull NBTTagCompound compound) {}
     @Override
     public void writeInitialSyncData(@NotNull PacketBuffer buf) {}
 
-    /**
-     * Deprecated since 2.8 and will be removed in 2.9.
-     *
-     * @deprecated Use {@link #writeInitialSyncData(PacketBuffer)}
-     */
-    @ApiStatus.ScheduledForRemoval(inVersion = "2.9")
-    @Deprecated
-    public void writeInitialData(@NotNull PacketBuffer buffer) {
-        writeInitialSyncData(buffer);
-    }
-
     @Override
     public void receiveInitialSyncData(@NotNull PacketBuffer buf) {}
 
-    /**
-     * Deprecated since 2.8 and will be removed in 2.9.
-     *
-     * @deprecated use {@link #receiveInitialSyncData(PacketBuffer)}
-     */
-    @ApiStatus.ScheduledForRemoval(inVersion = "2.9")
-    @Deprecated
-    public void receiveInitialData(@NotNull PacketBuffer buffer) {
-        receiveInitialSyncData(buffer);
-    }
-
     @Override
     public void receiveCustomData(int discriminator, @NotNull PacketBuffer buf) {}
 

src/main/java/gregtech/api/metatileentity/MetaTileEntity.java

@@ -827,29 +827,10 @@ public void updateInputRedstoneSignals() {
         }
     }
 
-    /**
-     * @deprecated Will be removed in 2.9. Comparators no longer supported for MetaTileEntities, as cover are
-     *             interactions favored.
-     */
-    @ApiStatus.ScheduledForRemoval(inVersion = "2.9")
-    @Deprecated
-    public int getActualComparatorValue() {
-        return 0;
-    }
-
     public int getActualLightValue() {
         return 0;
     }
 
-    /**
-     * @deprecated Will be removed in 2.9.
-     */
-    @ApiStatus.ScheduledForRemoval(inVersion = "2.9")
-    @Deprecated
-    public final int getComparatorValue() {
-        return 0;
-    }
-
     public final int getLightValue() {
         return cachedLightValue;
     }
@@ -1023,7 +1004,7 @@ public void writeInitialSyncData(@NotNull PacketBuffer buf) {
         buf.writeShort(this.mteTraitByNetworkId.size());
         for (Int2ObjectMap.Entry<MTETrait> entry : mteTraitByNetworkId.int2ObjectEntrySet()) {
             buf.writeVarInt(entry.getIntKey());
-            entry.getValue().writeInitialData(buf);
+            entry.getValue().writeInitialSyncData(buf);
         }
         CoverSaveHandler.writeInitialSyncData(buf, this);
         buf.writeBoolean(muffled);

src/main/java/gregtech/api/metatileentity/SteamMetaTileEntity.java

@@ -36,7 +36,6 @@
 import codechicken.lib.vec.Matrix4;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.tuple.Pair;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
@@ -157,15 +156,6 @@ public void randomDisplayTick() {
         }
     }
 
-    /** @deprecated No longer used, look at {@link VanillaParticleEffects#defaultFrontEffect} to see old logic. */
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval(inVersion = "2.9")
-    @SideOnly(Side.CLIENT)
-    protected void randomDisplayTick(float x, float y, float z, EnumParticleTypes flame, EnumParticleTypes smoke) {
-        getWorld().spawnParticle(smoke, x, y, z, 0, 0, 0);
-        getWorld().spawnParticle(flame, x, y, z, 0, 0, 0);
-    }
-
     @Override
     public boolean needsSneakToRotate() {
         return true;

src/main/java/gregtech/api/metatileentity/multiblock/MultiblockWithDisplayBase.java

@@ -33,7 +33,6 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
@@ -274,16 +273,6 @@ public boolean isMufflerFaceFree() {
                 getAbilities(MultiblockAbility.MUFFLER_HATCH).get(0).isFrontFaceFree();
     }
 
-    /**
-     * @deprecated Override {@link #getMufflerParticle()} instead.
-     */
-    @ApiStatus.ScheduledForRemoval(inVersion = "2.9")
-    @Deprecated
-    @SideOnly(Side.CLIENT)
-    public void runMufflerEffect(float xPos, float yPos, float zPos, float xSpd, float ySpd, float zSpd) {
-        getWorld().spawnParticle(EnumParticleTypes.SMOKE_LARGE, xPos, yPos, zPos, xSpd, ySpd, zSpd);
-    }
-
     @SideOnly(Side.CLIENT)
     public @NotNull EnumParticleTypes getMufflerParticle() {
         return EnumParticleTypes.SMOKE_LARGE;

src/main/java/gregtech/api/recipes/ModHandler.java

@@ -10,7 +10,6 @@
 import gregtech.api.unification.material.Materials;
 import gregtech.api.unification.material.properties.PropertyKey;
 import gregtech.api.unification.ore.OrePrefix;
-import gregtech.api.unification.stack.ItemMaterialInfo;
 import gregtech.api.unification.stack.MaterialStack;
 import gregtech.api.unification.stack.UnificationEntry;
 import gregtech.api.util.DummyContainer;
@@ -44,7 +43,6 @@
 import crafttweaker.mc1120.furnace.MCFurnaceManager;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -417,19 +415,6 @@ public static Object finalizeIngredient(@NotNull Object ingredient) {
         return ingredient;
     }
 
-    /**
-     * @param outputCount the amount of outputs the recipe has
-     * @param recipe      the recipe to retrieve from
-     * @return the recycling ingredients for a recipe
-     * @deprecated Use {@link RecyclingHandler#getRecyclingIngredients(int, Object...)}. Will be removed in 2.9
-     */
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval(inVersion = "2.9")
-    @Nullable
-    public static ItemMaterialInfo getRecyclingIngredients(int outputCount, @NotNull Object... recipe) {
-        return RecyclingHandler.getRecyclingIngredients(outputCount, recipe);
-    }
-
     /**
      * Add a shapeless recipe
      *

src/main/java/gregtech/api/unification/material/Material.java

@@ -43,7 +43,6 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import crafttweaker.annotations.ZenRegister;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import stanhebben.zenscript.annotations.OperatorType;
@@ -972,34 +971,6 @@ public Builder rotorStats(float speed, float damage, int durability) {
             return this;
         }
 
-        /** @deprecated use {@link Material.Builder#blast(int)}. */
-        @ApiStatus.ScheduledForRemoval(inVersion = "2.9")
-        @Deprecated
-        public Builder blastTemp(int temp) {
-            return blast(temp);
-        }
-
-        /** @deprecated use {@link Material.Builder#blast(int, BlastProperty.GasTier)}. */
-        @ApiStatus.ScheduledForRemoval(inVersion = "2.9")
-        @Deprecated
-        public Builder blastTemp(int temp, BlastProperty.GasTier gasTier) {
-            return blast(temp, gasTier);
-        }
-
-        /** @deprecated use {@link Material.Builder#blast(UnaryOperator)} for more detailed stats. */
-        @ApiStatus.ScheduledForRemoval(inVersion = "2.9")
-        @Deprecated
-        public Builder blastTemp(int temp, BlastProperty.GasTier gasTier, int eutOverride) {
-            return blast(b -> b.temp(temp, gasTier).blastStats(eutOverride));
-        }
-
-        /** @deprecated use {@link Material.Builder#blast(UnaryOperator)} for more detailed stats. */
-        @ApiStatus.ScheduledForRemoval(inVersion = "2.9")
-        @Deprecated
-        public Builder blastTemp(int temp, BlastProperty.GasTier gasTier, int eutOverride, int durationOverride) {
-            return blast(b -> b.temp(temp, gasTier).blastStats(eutOverride, durationOverride));
-        }
-
         public Builder blast(int temp) {
             properties.setProperty(PropertyKey.BLAST, new BlastProperty(temp));
             return this;

src/main/java/gregtech/api/unification/material/properties/FluidProperty.java

@@ -36,17 +36,6 @@ public FluidProperty(@NotNull FluidStorageKey key, @NotNull FluidBuilder builder
         enqueueRegistration(key, builder);
     }
 
-    /**
-     * Obsolete method, FluidProperty now contains this functionality.
-     *
-     * @deprecated {@link FluidStorage}
-     */
-    @ApiStatus.ScheduledForRemoval(inVersion = "2.9")
-    @Deprecated
-    public @NotNull FluidStorage getStorage() {
-        return this;
-    }
-
     /**
      * @see FluidStorageImpl#registerFluids(Material)
      */

src/main/java/gregtech/api/util/AssemblyLineManager.java

@@ -126,13 +126,6 @@ public static void createDefaultResearchRecipe(@NotNull AssemblyLineRecipeBuilde
         }
     }
 
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval(inVersion = "2.9")
-    public static void createDefaultResearchRecipe(@NotNull String researchId, @NotNull ItemStack researchItem,
-                                                   @NotNull ItemStack dataItem, int duration, long EUt, int CWUt) {
-        createDefaultResearchRecipe(researchId, researchItem, dataItem, true, duration, EUt, CWUt);
-    }
-
     public static void createDefaultResearchRecipe(@NotNull String researchId, @NotNull ItemStack researchItem,
                                                    @NotNull ItemStack dataItem, boolean ignoreNBT, int duration,
                                                    long EUt, int CWUt) {

src/main/java/gregtech/api/util/interpolate/Eases.java

@@ -1,7 +1,5 @@
 package gregtech.api.util.interpolate;
 
-import org.jetbrains.annotations.ApiStatus;
-
 public enum Eases implements IEase {
 
     LINEAR {
@@ -33,20 +31,5 @@ public float getInterpolation(float t) {
         public float getInterpolation(float t) {
             return -t * (t - 2);
         }
-    };
-
-    // Deprecated names below - will be removed on future update
-
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval(inVersion = "2.9")
-    public static final Eases EaseLinear = LINEAR;
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval(inVersion = "2.9")
-    public static final Eases EaseQuadIn = QUAD_IN;
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval(inVersion = "2.9")
-    public static final Eases EaseQuadInOut = QUAD_IN_OUT;
-    @Deprecated
-    @ApiStatus.ScheduledForRemoval(inVersion = "2.9")
-    public static final Eases EaseQuadOut = QUAD_OUT;
+    }
 }