cleanup

GregTechCEu · Jan 20, 2024 · 2338e88 · 2338e88
1 parent 96afae7
commit 2338e88
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/src/main/java/gregtech/api/GTValues.java b/src/main/java/gregtech/api/GTValues.java
@@ -7,6 +7,8 @@
 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;
@@ -124,7 +126,9 @@ public class GTValues {
      */
     public static final String MODID = "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",

diff --git a/src/main/java/gregtech/integration/IntegrationUtil.java b/src/main/java/gregtech/integration/IntegrationUtil.java
@@ -11,6 +11,7 @@
 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;
 
@@ -21,7 +22,13 @@
 @Deprecated
 public class IntegrationUtil {
 
-    /** Should only be called after {@link net.minecraftforge.fml.common.event.FMLPreInitializationEvent} */
+    /**
+     * 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;
@@ -32,7 +39,13 @@ public static void throwIncompatibilityIfLoaded(String modID, String... customMe
         }
     }
 
-    /** Should only be called after {@link net.minecraftforge.fml.common.event.FMLPreInitializationEvent} */
+    /**
+     * 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<String> messages) {
         if (FMLLaunchHandler.side() == Side.SERVER) {
             throw new RuntimeException(String.join(",", messages));
@@ -41,16 +54,31 @@ public static void throwIncompatibility(List<String> 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) {