Remove naming related functionality from FML

neoforged · Jan 8, 2024 · c6dda19 · c6dda19
1 parent 29b9b43
commit c6dda19
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 376 deletions.
diff --git a/core/src/main/java/net/neoforged/fml/ModLoader.java b/core/src/main/java/net/neoforged/fml/ModLoader.java
@@ -113,7 +113,6 @@ private ModLoader()
         this.stateManager = new ModStateManager();
         CrashReportCallables.registerCrashCallable("ModLauncher", FMLLoader::getLauncherInfo);
         CrashReportCallables.registerCrashCallable("ModLauncher launch target", FMLLoader::launcherHandlerName);
-        CrashReportCallables.registerCrashCallable("ModLauncher naming", FMLLoader::getNaming);
         CrashReportCallables.registerCrashCallable("ModLauncher services", this::computeModLauncherServiceList);
         CrashReportCallables.registerCrashCallable("FML Language Providers", this::computeLanguageList);
     }

diff --git a/core/src/main/java/net/neoforged/fml/util/ObfuscationReflectionHelper.java b/core/src/main/java/net/neoforged/fml/util/ObfuscationReflectionHelper.java
diff --git a/loader/src/main/java/net/neoforged/fml/loading/FMLEnvironment.java b/loader/src/main/java/net/neoforged/fml/loading/FMLEnvironment.java
@@ -15,16 +15,10 @@
 public class FMLEnvironment
 {
     public static final Dist dist = FMLLoader.getDist();
-    public static final String naming = FMLLoader.getNaming();
     public static final boolean production = FMLLoader.isProduction() || System.getProperties().containsKey("production");
     public static final boolean secureJarsEnabled = FMLLoader.isSecureJarEnabled();
 
     static void setupInteropEnvironment(IEnvironment environment) {
-        environment.computePropertyIfAbsent(IEnvironment.Keys.NAMING.get(), v->naming);
         environment.computePropertyIfAbsent(Environment.Keys.DIST.get(), v->dist);
     }
-
-    public static class Keys {
-        public static final Supplier<TypesafeMap.Key<ClassLoader>> LOCATORCLASSLOADER = IEnvironment.buildKey("LOCATORCLASSLOADER",ClassLoader.class);
-    }
 }
diff --git a/loader/src/main/java/net/neoforged/fml/loading/FMLLoader.java b/loader/src/main/java/net/neoforged/fml/loading/FMLLoader.java
@@ -27,7 +27,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
-import java.util.function.BiFunction;
 import java.util.stream.Collectors;
 
 public class FMLLoader
@@ -38,7 +37,6 @@ public class FMLLoader
     private static ICoreModProvider coreModProvider;
     private static LanguageLoadingProvider languageLoadingProvider;
     private static Dist dist;
-    private static String naming;
     private static LoadingModList loadingModList;
     private static RuntimeDistCleaner runtimeDistCleaner;
     private static Path gamePath;
@@ -138,7 +136,6 @@ static void setupLaunchHandler(final IEnvironment environment, final Map<String,
         launchHandlerName = launchHandler.get().name();
         gamePath = environment.getProperty(IEnvironment.Keys.GAMEDIR.get()).orElse(Paths.get(".").toAbsolutePath());
 
-        naming = commonLaunchHandler.getNaming();
         dist = commonLaunchHandler.getDist();
         production = commonLaunchHandler.isProduction();
 
@@ -218,14 +215,6 @@ public static Path getGamePath()
         return gamePath;
     }
 
-    public static String getNaming() {
-        return naming;
-    }
-
-    public static Optional<BiFunction<INameMappingService.Domain, String, String>> getNameFunction(final String naming) {
-        return Launcher.INSTANCE.environment().findNameMapping(naming);
-    }
-
     public static String getLauncherInfo() {
         return Launcher.INSTANCE.environment().getProperty(IEnvironment.Keys.MLIMPL_VERSION.get()).orElse("MISSING");
     }