1.21 deprecations (#161)

neoforged · Jun 10, 2024 · b36b821 · b36b821
1 parent 48d5020
commit b36b821
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 365 deletions.
diff --git a/loader/src/main/java/net/neoforged/fml/DistExecutor.java b/loader/src/main/java/net/neoforged/fml/DistExecutor.java
diff --git a/loader/src/main/java/net/neoforged/fml/ModContainer.java b/loader/src/main/java/net/neoforged/fml/ModContainer.java
@@ -47,7 +47,6 @@ public abstract class ModContainer {
     protected final String modId;
     protected final String namespace;
     protected final IModInfo modInfo;
-    protected Supplier<?> contextExtension;
     protected final Map<Class<? extends IExtensionPoint>, Supplier<?>> extensionPoints = new IdentityHashMap<>();
     protected final EnumMap<ModConfig.Type, ModConfig> configs = new EnumMap<>(ModConfig.Type.class);
 

diff --git a/loader/src/main/java/net/neoforged/fml/ModLoader.java b/loader/src/main/java/net/neoforged/fml/ModLoader.java
@@ -146,11 +146,6 @@ private static void cancelLoading(ModList modList) {
         modList.setLoadedMods(Collections.emptyList());
     }
 
-    @Deprecated(forRemoval = true, since = "20.5")
-    public static boolean isLoadingStateValid() {
-        return !hasErrors();
-    }
-
     private static void constructMods(Executor syncExecutor, Executor parallelExecutor, Runnable periodicTask) {
         var workQueue = new DeferredWorkQueue("Mod Construction");
         dispatchParallelTask("Mod Construction", parallelExecutor, periodicTask, modContainer -> {

diff --git a/loader/src/main/java/net/neoforged/fml/ModLoadingContext.java b/loader/src/main/java/net/neoforged/fml/ModLoadingContext.java
@@ -5,16 +5,10 @@
 
 package net.neoforged.fml;
 
-import com.mojang.logging.LogUtils;
 import java.util.function.Supplier;
-import net.neoforged.fml.config.IConfigSpec;
-import net.neoforged.fml.config.ModConfig;
-import org.slf4j.Logger;
 
 public class ModLoadingContext {
-    private static final Logger LOGGER = LogUtils.getLogger();
     private static final ThreadLocal<ModLoadingContext> context = ThreadLocal.withInitial(ModLoadingContext::new);
-    private Object languageExtension;
 
     public static ModLoadingContext get() {
         return context.get();
@@ -24,7 +18,6 @@ public static ModLoadingContext get() {
 
     public void setActiveContainer(final ModContainer container) {
         this.activeContainer = container;
-        this.languageExtension = container == null ? null : container.contextExtension.get();
     }
 
     public ModContainer getActiveContainer() {
@@ -45,25 +38,4 @@ public String getActiveNamespace() {
     public <T extends IExtensionPoint> void registerExtensionPoint(Class<T> point, Supplier<T> extension) {
         getActiveContainer().registerExtensionPoint(point, extension);
     }
-
-    /**
-     * @deprecated Use the corresponding method {@link ModContainer#registerConfig(ModConfig.Type, IConfigSpec)}
-     */
-    @Deprecated(forRemoval = true)
-    public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) {
-        getActiveContainer().registerConfig(type, spec);
-    }
-
-    /**
-     * @deprecated Use the corresponding method {@link ModContainer#registerConfig(ModConfig.Type, IConfigSpec, String)}
-     */
-    @Deprecated(forRemoval = true)
-    public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec, String fileName) {
-        getActiveContainer().registerConfig(type, spec, fileName);
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T> T extension() {
-        return (T) languageExtension;
-    }
 }
diff --git a/loader/src/main/java/net/neoforged/fml/javafmlmod/FMLJavaModLoadingContext.java b/loader/src/main/java/net/neoforged/fml/javafmlmod/FMLJavaModLoadingContext.java