diff --git a/src/main/java/gregtech/api/GTValues.java b/src/main/java/gregtech/api/GTValues.java index 29b540e1f7a..35f1c8a726d 100644 --- a/src/main/java/gregtech/api/GTValues.java +++ b/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; @@ -166,48 +164,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() { diff --git a/src/main/java/gregtech/api/block/IWalkingSpeedBonus.java b/src/main/java/gregtech/api/block/IWalkingSpeedBonus.java deleted file mode 100644 index 4b932286cdb..00000000000 --- a/src/main/java/gregtech/api/block/IWalkingSpeedBonus.java +++ /dev/null @@ -1,27 +0,0 @@ -package gregtech.api.block; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.Entity; - -import org.jetbrains.annotations.ApiStatus; - -/** - * @deprecated use {@link gregtech.api.util.BlockUtility#setWalkingSpeedBonus(IBlockState, double)} - */ -@SuppressWarnings("DeprecatedIsStillUsed") -@Deprecated -@ApiStatus.ScheduledForRemoval(inVersion = "2.9") -public interface IWalkingSpeedBonus { - - default double getWalkingSpeedBonus() { - return 1.0D; - } - - default boolean checkApplicableBlocks(IBlockState state) { - return false; - } - - default boolean bonusSpeedCondition(Entity walkingEntity) { - return !walkingEntity.isInWater() && !walkingEntity.isSneaking(); - } -} diff --git a/src/main/java/gregtech/api/block/VariantBlock.java b/src/main/java/gregtech/api/block/VariantBlock.java index 7e31dd48c3b..f50823b8cfc 100644 --- a/src/main/java/gregtech/api/block/VariantBlock.java +++ b/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 & IStringSerializable> extends Block implements IWalkingSpeedBonus { +public class VariantBlock & IStringSerializable> extends Block { protected PropertyEnum 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) { diff --git a/src/main/java/gregtech/api/gui/widgets/TankWidget.java b/src/main/java/gregtech/api/gui/widgets/TankWidget.java index 44e04a2768d..7a550ff478e 100644 --- a/src/main/java/gregtech/api/gui/widgets/TankWidget.java +++ b/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; diff --git a/src/main/java/gregtech/api/metatileentity/MTETrait.java b/src/main/java/gregtech/api/metatileentity/MTETrait.java index 3cc461e5c97..4579687a591 100644 --- a/src/main/java/gregtech/api/metatileentity/MTETrait.java +++ b/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) {} diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java index e6da891b45c..9eafc841c65 100644 --- a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java +++ b/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 entry : mteTraitByNetworkId.int2ObjectEntrySet()) { buf.writeVarInt(entry.getIntKey()); - entry.getValue().writeInitialData(buf); + entry.getValue().writeInitialSyncData(buf); } CoverSaveHandler.writeInitialSyncData(buf, this); buf.writeBoolean(muffled); diff --git a/src/main/java/gregtech/api/metatileentity/SteamMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/SteamMetaTileEntity.java index c6e879fffc0..ed904815d2d 100644 --- a/src/main/java/gregtech/api/metatileentity/SteamMetaTileEntity.java +++ b/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; diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/MultiblockWithDisplayBase.java b/src/main/java/gregtech/api/metatileentity/multiblock/MultiblockWithDisplayBase.java index 55723ef456d..8dc938db623 100644 --- a/src/main/java/gregtech/api/metatileentity/multiblock/MultiblockWithDisplayBase.java +++ b/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; diff --git a/src/main/java/gregtech/api/recipes/ModHandler.java b/src/main/java/gregtech/api/recipes/ModHandler.java index 10e55ea68b1..246350782d0 100644 --- a/src/main/java/gregtech/api/recipes/ModHandler.java +++ b/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 * diff --git a/src/main/java/gregtech/api/unification/material/Material.java b/src/main/java/gregtech/api/unification/material/Material.java index d0f42cbe1ac..a1c92b4074d 100644 --- a/src/main/java/gregtech/api/unification/material/Material.java +++ b/src/main/java/gregtech/api/unification/material/Material.java @@ -42,7 +42,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; @@ -951,34 +950,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; diff --git a/src/main/java/gregtech/api/unification/material/properties/FluidProperty.java b/src/main/java/gregtech/api/unification/material/properties/FluidProperty.java index d8662ec6bed..2d88d0241b0 100644 --- a/src/main/java/gregtech/api/unification/material/properties/FluidProperty.java +++ b/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) */ diff --git a/src/main/java/gregtech/api/util/AssemblyLineManager.java b/src/main/java/gregtech/api/util/AssemblyLineManager.java index 56dec95391f..9ab503b5f94 100644 --- a/src/main/java/gregtech/api/util/AssemblyLineManager.java +++ b/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) { diff --git a/src/main/java/gregtech/api/util/interpolate/Eases.java b/src/main/java/gregtech/api/util/interpolate/Eases.java index e3c3a7f4a0a..ba79022c428 100644 --- a/src/main/java/gregtech/api/util/interpolate/Eases.java +++ b/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; + } } diff --git a/src/main/java/gregtech/api/util/oreglob/OreGlob.java b/src/main/java/gregtech/api/util/oreglob/OreGlob.java index a560fcae1bf..bcd30e58dce 100644 --- a/src/main/java/gregtech/api/util/oreglob/OreGlob.java +++ b/src/main/java/gregtech/api/util/oreglob/OreGlob.java @@ -21,21 +21,6 @@ public abstract class OreGlob { private static OreGlobCompiler compiler; - /** - * Tries to compile the string expression into OreGlob instance. - * - * @param expression OreGlob expression - * @return Compilation result - * @throws IllegalStateException If compiler is not provided yet - * @deprecated use {@link #compile(String, boolean)} - */ - @NotNull - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2.9") - public static OreGlobCompileResult compile(@NotNull String expression) { - return compile(expression, true); - } - /** * Tries to compile the string expression into OreGlob instance. * @@ -73,26 +58,6 @@ public static void setCompiler(@NotNull OreGlobCompiler compiler) { */ public abstract boolean matches(@NotNull String input); - /** - *

- * Tries to match each ore dictionary entries associated with given item. If any of them matches, {@code true} is - * returned. - *

- *

- * For items not associated with any ore dictionary entries, this method returns {@code true} if this instance - * matches empty string instead. - *

- * - * @param stack Item input - * @return Whether this instance matches the input - * @deprecated use {@link #matchesAll(ItemStack)} or {@link #matchesAny(ItemStack)} - */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2.9") - public final boolean matches(@NotNull ItemStack stack) { - return matchesAny(stack); - } - /** *

* Tries to match each ore dictionary entries associated with given item. If any of them matches, {@code true} is diff --git a/src/main/java/gregtech/client/shader/Shaders.java b/src/main/java/gregtech/client/shader/Shaders.java index 409818af327..1af02951ca1 100644 --- a/src/main/java/gregtech/client/shader/Shaders.java +++ b/src/main/java/gregtech/client/shader/Shaders.java @@ -2,7 +2,6 @@ import gregtech.api.GTValues; import gregtech.api.util.GTLog; -import gregtech.api.util.Mods; import gregtech.common.ConfigHolder; import net.minecraft.client.Minecraft; @@ -16,7 +15,6 @@ import codechicken.lib.render.shader.ShaderObject; import codechicken.lib.render.shader.ShaderProgram; -import org.jetbrains.annotations.ApiStatus; import java.util.HashMap; import java.util.Map; @@ -105,13 +103,6 @@ public static boolean allowedShader() { return OpenGlHelper.shadersSupported && ConfigHolder.client.shader.useShader; } - /** @deprecated Use {@link Mods#Optifine} to check this instead. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2.9") - public static boolean isOptiFineShaderPackLoaded() { - return Mods.Optifine.isModLoaded(); - } - public static Framebuffer renderFullImageInFBO(Framebuffer fbo, ShaderObject frag, Consumer uniformCache) { if (fbo == null || frag == null || !allowedShader()) return fbo; diff --git a/src/main/java/gregtech/client/utils/BloomEffectUtil.java b/src/main/java/gregtech/client/utils/BloomEffectUtil.java index 36671852320..cf673944599 100644 --- a/src/main/java/gregtech/client/utils/BloomEffectUtil.java +++ b/src/main/java/gregtech/client/utils/BloomEffectUtil.java @@ -25,7 +25,6 @@ import com.github.bsideup.jabel.Desugar; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -36,7 +35,6 @@ import java.util.Map; import java.util.Objects; import java.util.concurrent.locks.ReentrantLock; -import java.util.function.Consumer; import java.util.function.Predicate; import java.util.function.Supplier; @@ -48,13 +46,6 @@ public class BloomEffectUtil { private static final ReentrantLock BLOOM_RENDER_LOCK = new ReentrantLock(); - /** - * @deprecated use {@link #getBloomLayer()} - */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2.9") - public static BlockRenderLayer BLOOM; - private static BlockRenderLayer bloom; private static Framebuffer bloomFBO; @@ -66,16 +57,6 @@ public static BlockRenderLayer getBloomLayer() { return Objects.requireNonNull(bloom, "Bloom effect is not initialized yet"); } - /** - * @deprecated renamed for clarity; use {@link #getEffectiveBloomLayer()}. - */ - @NotNull - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2.9") - public static BlockRenderLayer getRealBloomLayer() { - return getEffectiveBloomLayer(); - } - /** * Get "effective bloom layer", i.e. the actual render layer that emissive textures get rendered. Effective bloom * layers can be changed depending on external factors, such as presence of Optifine. If the actual bloom layer is @@ -310,31 +291,8 @@ public static void invalidateWorldTickets(@NotNull World world) { } } - /** - * @deprecated use ticket-based bloom render hooks - */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2.9") - public static void requestCustomBloom(IBloomRenderFast handler, Consumer render) { - BloomType bloomType = BloomType.fromValue(handler.customBloomStyle()); - var validityChecker = new Predicate() { - - boolean invalid; - - @Override - public boolean test(BloomRenderTicket bloomRenderTicket) { - return !invalid; - } - }; - registerBloomRender(handler, bloomType, (b, c) -> { - render.accept(b); - validityChecker.invalid = true; - }, validityChecker); - } - public static void init() { bloom = BlockRenderLayer.valueOf("BLOOM"); - BLOOM = bloom; } // Calls injected via ASM @@ -600,20 +558,6 @@ public static final class BloomRenderTicket { this.worldContext = worldContext; } - @Nullable - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2.9") - public IRenderSetup getRenderSetup() { - return this.renderSetup; - } - - @NotNull - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2.9") - public BloomType getBloomType() { - return this.bloomType; - } - public boolean isValid() { return !this.invalidated; } @@ -628,25 +572,4 @@ private void checkValidity() { } } } - - /** - * @deprecated use ticket-based bloom render hooks - */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2.9") - public interface IBloomRenderFast extends IRenderSetup { - - /** - * Custom Bloom Style. - * - * @return 0 - Simple Gaussian Blur Bloom - *

- * 1 - Unity Bloom - *

- *

- * 2 - Unreal Bloom - *

- */ - int customBloomStyle(); - } } diff --git a/src/main/java/gregtech/common/EventHandlers.java b/src/main/java/gregtech/common/EventHandlers.java index ecbe6b16097..33ffd17f7e6 100644 --- a/src/main/java/gregtech/common/EventHandlers.java +++ b/src/main/java/gregtech/common/EventHandlers.java @@ -1,7 +1,6 @@ package gregtech.common; import gregtech.api.GTValues; -import gregtech.api.block.IWalkingSpeedBonus; import gregtech.api.items.armor.ArmorMetaItem; import gregtech.api.items.toolitem.ToolClasses; import gregtech.api.items.toolitem.ToolHelper; @@ -236,15 +235,6 @@ public static void onPlayerTick(TickEvent.PlayerTickEvent event) { IBlockState state = player.world.getBlockState(new BlockPos( player.posX, player.getEntityBoundingBox().minY - 1, player.posZ)); speedBonus = BlockUtility.WALKING_SPEED_BONUS.getDouble(state); - // { remove this bit while removing IWalkingSpeedBonus - if (speedBonus == 0 && - state.getBlock() instanceof IWalkingSpeedBonus walkingSpeedBonus && - walkingSpeedBonus.getWalkingSpeedBonus() != 1 && - walkingSpeedBonus.bonusSpeedCondition(player) && - walkingSpeedBonus.checkApplicableBlocks(state)) { - speedBonus = walkingSpeedBonus.getWalkingSpeedBonus() - 1; - } - // } } if (modifier != null) { if (speedBonus == modifier.getAmount()) return; diff --git a/src/main/java/gregtech/common/covers/CoverBehaviors.java b/src/main/java/gregtech/common/covers/CoverBehaviors.java index 355fe3b0dff..72168861ac5 100644 --- a/src/main/java/gregtech/common/covers/CoverBehaviors.java +++ b/src/main/java/gregtech/common/covers/CoverBehaviors.java @@ -116,7 +116,6 @@ public static void init() { CoverDetectorActivityAdvanced::new); registerBehavior(gregtechId("maintenance_detector"), MetaItems.COVER_MAINTENANCE_DETECTOR, CoverDetectorMaintenance::new); - registerCover(gregtechId("crafting_table"), ItemStack.EMPTY, CoverCraftingTable::new); registerBehavior(gregtechId("infinite_water"), MetaItems.COVER_INFINITE_WATER, CoverInfiniteWater::new); registerBehavior(gregtechId("ender_fluid_link"), MetaItems.COVER_ENDER_FLUID_LINK, CoverEnderFluidLink::new); registerBehavior(gregtechId("cover.digital"), MetaItems.COVER_DIGITAL_INTERFACE, CoverDigitalInterface::new); diff --git a/src/main/java/gregtech/common/covers/CoverCraftingTable.java b/src/main/java/gregtech/common/covers/CoverCraftingTable.java deleted file mode 100644 index 902873c7ffa..00000000000 --- a/src/main/java/gregtech/common/covers/CoverCraftingTable.java +++ /dev/null @@ -1,141 +0,0 @@ -package gregtech.common.covers; - -import gregtech.api.GregTechAPI; -import gregtech.api.cover.*; -import gregtech.api.util.GTTransferUtils; -import gregtech.api.util.GTUtility; -import gregtech.common.inventory.handlers.ToolItemStackHandler; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ITickable; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.ItemStackHandler; - -import codechicken.lib.render.CCRenderState; -import codechicken.lib.render.pipeline.IVertexOperation; -import codechicken.lib.vec.Cuboid6; -import codechicken.lib.vec.Matrix4; -import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.Collections; -import java.util.List; - -/** - * @deprecated Will be removed - */ -@ApiStatus.ScheduledForRemoval(inVersion = "2.9") -@Deprecated -public class CoverCraftingTable extends CoverBase implements ITickable { - - private static final ResourceLocation STORAGE_COVER_LOCATION = GTUtility.gregtechId("storage"); - private static @Nullable CoverDefinition storageCoverDefinition = null; - private static boolean attemptedStorageCoverLookup = false; - - private final ItemStackHandler internalInventory = new ItemStackHandler(18); - private final ItemStackHandler toolInventory = new ToolItemStackHandler(9); - - public CoverCraftingTable(@NotNull CoverDefinition definition, @NotNull CoverableView coverableView, - @NotNull EnumFacing attachedSide) { - super(definition, coverableView, attachedSide); - } - - @Override - public boolean canAttach(@NotNull CoverableView coverable, @NotNull EnumFacing side) { - return true; - } - - @Override - public boolean shouldAutoConnectToPipes() { - return false; - } - - @Override - public void renderCover(@NotNull CCRenderState renderState, @NotNull Matrix4 translation, - IVertexOperation[] pipeline, @NotNull Cuboid6 plateBox, @NotNull BlockRenderLayer layer) {} - - @Override - public void update() { - if (getWorld().isRemote) { - return; - } - CoverableView coverableView = getCoverableView(); - if (coverableView instanceof CoverHolder holder) { - EnumFacing coverSide = getAttachedSide(); - holder.removeCover(coverSide); - - if (!attemptedStorageCoverLookup) { - storageCoverDefinition = GregTechAPI.COVER_REGISTRY.getObject(STORAGE_COVER_LOCATION); - attemptedStorageCoverLookup = true; - } - - if (storageCoverDefinition == null) { - // Could not find a storage cover to convert to - // so drop contents on the ground instead - dropContents(); - return; - } - - Cover cover = storageCoverDefinition.createCover(holder, coverSide); - if (!holder.canPlaceCoverOnSide(coverSide) || !cover.canAttach(holder, coverSide)) { - // could not attach for some reason - // so drop contents on the ground instead - dropContents(); - return; - } - - holder.addCover(coverSide, cover); - cover.onAttachment(holder, coverSide, null, storageCoverDefinition.getDropItemStack()); - - IItemHandler itemHandler; - if (cover instanceof CoverStorage coverStorage) { - itemHandler = coverStorage.getStorageHandler(); - } else { - itemHandler = null; - } - - if (itemHandler == null) { - // could not retrieve item handler from the cover - // so drop contents on the ground instead - dropContents(); - return; - } - - // transfer what can fit into the storage cover - GTTransferUtils.moveInventoryItems(internalInventory, itemHandler); - GTTransferUtils.moveInventoryItems(toolInventory, itemHandler); - - // drop everything else on the ground - dropContents(); - } - } - - private void dropContents() { - dropInventoryContents(internalInventory); - dropInventoryContents(toolInventory); - } - - @Override - public @NotNull List getDrops() { - return Collections.emptyList(); - } - - @Override - public void writeToNBT(@NotNull NBTTagCompound tagCompound) { - super.writeToNBT(tagCompound); - tagCompound.setTag("ToolInventory", toolInventory.serializeNBT()); - tagCompound.setTag("InternalInventory", internalInventory.serializeNBT()); - } - - @Override - public void readFromNBT(@NotNull NBTTagCompound tagCompound) { - super.readFromNBT(tagCompound); - this.toolInventory.deserializeNBT(tagCompound.getCompoundTag("ToolInventory")); - this.internalInventory.deserializeNBT(tagCompound.getCompoundTag("InternalInventory")); - } -} diff --git a/src/main/java/gregtech/common/covers/CoverStorage.java b/src/main/java/gregtech/common/covers/CoverStorage.java index f9bb45f788c..4d4f35a5ec1 100644 --- a/src/main/java/gregtech/common/covers/CoverStorage.java +++ b/src/main/java/gregtech/common/covers/CoverStorage.java @@ -14,7 +14,6 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemStackHandler; import codechicken.lib.raytracer.CuboidRayTraceResult; @@ -30,7 +29,6 @@ import com.cleanroommc.modularui.value.sync.SyncHandlers; import com.cleanroommc.modularui.widgets.ItemSlot; import com.cleanroommc.modularui.widgets.layout.Grid; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; @@ -108,17 +106,6 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan .matrix(widgets)); } - /** - * @deprecated Only exists for compatibility with the crafting table cover and will be removed in the future. - * Do not depend on this method. - */ - @ApiStatus.ScheduledForRemoval(inVersion = "2.9") - @ApiStatus.Internal - @Deprecated - public @NotNull IItemHandler getStorageHandler() { - return this.storageHandler; - } - @Override public void writeToNBT(@NotNull NBTTagCompound tagCompound) { super.writeToNBT(tagCompound); diff --git a/src/main/java/gregtech/common/covers/filter/OreDictionaryItemFilter.java b/src/main/java/gregtech/common/covers/filter/OreDictionaryItemFilter.java index d12a346724a..1bfed239a08 100644 --- a/src/main/java/gregtech/common/covers/filter/OreDictionaryItemFilter.java +++ b/src/main/java/gregtech/common/covers/filter/OreDictionaryItemFilter.java @@ -232,22 +232,6 @@ protected String highlightRule(String text) { builder.insert(i++, TextFormatting.YELLOW); i += 2; } - case '$' -> { // TODO: remove this switch case in 2.9 - builder.insert(i, TextFormatting.DARK_GREEN); - for (; i < builder.length(); i++) { - switch (builder.charAt(i)) { - case ' ', '\t', '\n', '\r' -> {} - case '\\' -> { - i++; - continue; - } - default -> { - continue; - } - } - break; - } - } default -> { continue; } diff --git a/src/main/java/gregtech/common/covers/filter/oreglob/impl/OreGlobMessages.java b/src/main/java/gregtech/common/covers/filter/oreglob/impl/OreGlobMessages.java index d0c2d44e7df..8f773432013 100644 --- a/src/main/java/gregtech/common/covers/filter/oreglob/impl/OreGlobMessages.java +++ b/src/main/java/gregtech/common/covers/filter/oreglob/impl/OreGlobMessages.java @@ -2,8 +2,6 @@ import gregtech.api.util.LocalizationUtils; -import org.jetbrains.annotations.ApiStatus; - import java.util.Locale; interface OreGlobMessages { @@ -104,37 +102,6 @@ static String compileErrorUnexpectedTokenAfterEOF(String token) { return LocalizationUtils.format(COMPILE_ERROR_PREFIX + "unexpected_token_after_eof", token); } - // compilation flags are expected to be removed in future release - - @Deprecated - @SuppressWarnings("DeprecatedIsStillUsed") - @ApiStatus.ScheduledForRemoval(inVersion = "2.9") - static String compileErrorUnexpectedCompilationFlag() { - // Compilation flags in the middle of expression - return LocalizationUtils.format(COMPILE_ERROR_PREFIX + "unexpected_compilation_flag"); - } - - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2.9") - static String compileErrorEmptyCompilationFlag() { - // No compilation flags given - return LocalizationUtils.format(COMPILE_ERROR_PREFIX + "empty_compilation_flag"); - } - - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2.9") - static String compileErrorUnknownCompilationFlag(String flag) { - // Unknown compilation flag '%s' - return LocalizationUtils.format(COMPILE_ERROR_PREFIX + "unknown_compilation_flag", flag); - } - - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2.9") - static String compileErrorRedundantCompilationFlag(String flag) { - // Compilation flag '%s' written twice - return LocalizationUtils.format(COMPILE_ERROR_PREFIX + "redundant_compilation_flag", flag); - } - static String compileErrorEOFAfterEscape() { // End of file after escape character ('\\') return LocalizationUtils.format(COMPILE_ERROR_PREFIX + "eof_after_escape"); diff --git a/src/main/java/gregtech/common/covers/filter/oreglob/impl/OreGlobParser.java b/src/main/java/gregtech/common/covers/filter/oreglob/impl/OreGlobParser.java index b4cec035040..7847d2ee967 100644 --- a/src/main/java/gregtech/common/covers/filter/oreglob/impl/OreGlobParser.java +++ b/src/main/java/gregtech/common/covers/filter/oreglob/impl/OreGlobParser.java @@ -5,7 +5,6 @@ import gregtech.common.covers.filter.oreglob.node.OreGlobNode; import gregtech.common.covers.filter.oreglob.node.OreGlobNodes; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; @@ -69,9 +68,7 @@ private int readNextChar() { return input.codePointAt(i); } - @SuppressWarnings("deprecation") private void advance() { - boolean first = this.inputIndex == 0; while (true) { int start = this.inputIndex; switch (readNextChar()) { @@ -86,14 +83,6 @@ private void advance() { case '^' -> setCurrentToken(XOR, start, 1); case '*' -> setCurrentToken(ANY, start, 1); case '?' -> setCurrentToken(ANY_CHAR, start, 1); - case '$' -> { // TODO: remove this switch case in 2.9 - if (!first) { - error(OreGlobMessages.compileErrorUnexpectedCompilationFlag(), start, 1); - } - gatherFlags(first); - first = false; - continue; - } case CHAR_EOF -> setCurrentToken(EOF, input.length(), 0); default -> { this.inputIndex = start; @@ -147,42 +136,6 @@ private String gatherLiteralValue() { } } - @Deprecated - @SuppressWarnings("DeprecatedIsStillUsed") - @ApiStatus.ScheduledForRemoval(inVersion = "2.9") - private void gatherFlags(boolean add) { - while (true) { - int i = this.inputIndex; - int c = readNextChar(); - switch (c) { - case '\\' -> { - c = readNextChar(); - if (c == CHAR_EOF) { - error(OreGlobMessages.compileErrorEOFAfterEscape(), i, 1); - } else if (add) { - addFlag(c); - continue; - } - } - case ' ', '\t', '\n', '\r', CHAR_EOF -> {} - default -> { - if (add) { - addFlag(c); - } - continue; - } - } - warn("Compilation flags ('$') are scheduled to be removed in future releases."); - return; - } - } - - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2.9") - private void addFlag(int flag) { - if (flag == 'c' || flag == 'C') this.ignoreCase = false; - } - private boolean advanceIf(TokenType type) { if (tokenType != type) return false; advance(); diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMufflerHatch.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMufflerHatch.java index 3788ac57732..2d53b425b5f 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMufflerHatch.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMufflerHatch.java @@ -8,7 +8,6 @@ import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.metatileentity.multiblock.IMultiblockAbilityPart; import gregtech.api.metatileentity.multiblock.MultiblockAbility; -import gregtech.api.metatileentity.multiblock.MultiblockControllerBase; import gregtech.api.metatileentity.multiblock.MultiblockWithDisplayBase; import gregtech.api.mui.GTGuis; import gregtech.api.util.GTTransferUtils; @@ -24,8 +23,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import codechicken.lib.render.CCRenderState; import codechicken.lib.render.pipeline.IVertexOperation; @@ -39,7 +36,6 @@ import com.cleanroommc.modularui.widgets.ItemSlot; import com.cleanroommc.modularui.widgets.SlotGroupWidget; import com.cleanroommc.modularui.widgets.layout.Grid; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -120,17 +116,6 @@ private boolean checkFrontFaceFree() { return blockState.getBlock().isAir(blockState, getWorld(), frontPos) || GTUtility.isBlockSnow(blockState); } - /** @deprecated No longer needed. Multiblock controller sets the particle type. */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2.9") - @SideOnly(Side.CLIENT) - public void pollutionParticles() { - MultiblockControllerBase controller = getController(); - if (controller instanceof MultiblockWithDisplayBase displayBase) { - VanillaParticleEffects.mufflerEffect(this, displayBase.getMufflerParticle()); - } - } - @Override public void renderMetaTileEntity(CCRenderState renderState, Matrix4 translation, IVertexOperation[] pipeline) { super.renderMetaTileEntity(renderState, translation, pipeline); diff --git a/src/main/java/gregtech/common/metatileentities/steam/boiler/SteamBoiler.java b/src/main/java/gregtech/common/metatileentities/steam/boiler/SteamBoiler.java index 3d63eb651ab..f322cfbc4b8 100644 --- a/src/main/java/gregtech/common/metatileentities/steam/boiler/SteamBoiler.java +++ b/src/main/java/gregtech/common/metatileentities/steam/boiler/SteamBoiler.java @@ -49,7 +49,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.NotNull; import org.jetbrains.annotations.Nullable; @@ -403,14 +402,4 @@ 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) { - getWorld().spawnParticle(isHighPressure ? EnumParticleTypes.SMOKE_LARGE : EnumParticleTypes.SMOKE_NORMAL, x, y, - z, 0, 0, 0); - getWorld().spawnParticle(EnumParticleTypes.FLAME, x, y, z, 0, 0, 0); - } } diff --git a/src/main/java/gregtech/integration/IntegrationUtil.java b/src/main/java/gregtech/integration/IntegrationUtil.java deleted file mode 100644 index c25edab7be0..00000000000 --- a/src/main/java/gregtech/integration/IntegrationUtil.java +++ /dev/null @@ -1,121 +0,0 @@ -package gregtech.integration; - -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiErrorScreen; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.client.CustomModLoadingErrorDisplayException; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.FMLLaunchHandler; -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; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -@Deprecated -public class IntegrationUtil { - - /** - * Should only be called after {@link net.minecraftforge.fml.common.event.FMLPreInitializationEvent} - * - * @deprecated Use {@link gregtech.api.util.Mods} instead for these features. - */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2.9") - public static void throwIncompatibilityIfLoaded(String modID, String... customMessages) { - if (Loader.isModLoaded(modID)) { - String modName = TextFormatting.BOLD + modID + TextFormatting.RESET; - List messages = new ArrayList<>(); - messages.add(modName + " mod detected, this mod is incompatible with Gregification."); - messages.addAll(Arrays.asList(customMessages)); - throwIncompatibility(messages); - } - } - - /** - * Should only be called after {@link net.minecraftforge.fml.common.event.FMLPreInitializationEvent} - * - * @deprecated Use {@link gregtech.api.util.Mods} instead for these features. - */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2.9") - public static void throwIncompatibility(List messages) { - if (FMLLaunchHandler.side() == Side.SERVER) { - throw new RuntimeException(String.join(",", messages)); - } else { - throwClientIncompatibility(messages); - } - } - - /** - * @deprecated Use {@link gregtech.api.util.Mods} instead for these features. - */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2.9") - @NotNull - public static ItemStack getModItem(@NotNull String modid, @NotNull String name, int meta) { - return getModItem(modid, name, meta, 1, null); - } - - /** - * @deprecated Use {@link gregtech.api.util.Mods} instead for these features. - */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2.9") - @NotNull - public static ItemStack getModItem(@NotNull String modid, @NotNull String name, int meta, int amount) { - return getModItem(modid, name, meta, amount, null); - } - - /** - * @deprecated Use {@link gregtech.api.util.Mods} instead for these features. - */ - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2.9") - @NotNull - public static ItemStack getModItem(@NotNull String modid, @NotNull String name, int meta, int amount, - @Nullable String nbt) { - if (!Loader.isModLoaded(modid)) { - return ItemStack.EMPTY; - } - return GameRegistry.makeItemStack(modid + ":" + name, meta, amount, nbt); - } - - @SideOnly(Side.CLIENT) - private static void throwClientIncompatibility(List messages) { - throw new ModIncompatibilityException(messages); - } - - @SideOnly(Side.CLIENT) - private static class ModIncompatibilityException extends CustomModLoadingErrorDisplayException { - - private static final long serialVersionUID = 1L; - - private final List messages; - - public ModIncompatibilityException(List messages) { - this.messages = messages; - } - - @Override - public void initGui(GuiErrorScreen guiErrorScreen, FontRenderer fontRenderer) {} - - @Override - public void drawScreen(GuiErrorScreen errorScreen, FontRenderer fontRenderer, int mouseX, int mouseY, - float time) { - int x = errorScreen.width / 2; - int y = 75; - for (String message : messages) { - errorScreen.drawCenteredString(fontRenderer, message, x, y, 0xFFFFFF); - y += 15; - } - } - } -}