Remove INameMappingService (#121)

NeoForge now uses Mojang mappings at runtime, making the name mapping service redundant.

src/main/java/cpw/mods/modlauncher/Environment.java

@@ -22,7 +22,6 @@
 import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
 
 import java.util.*;
-import java.util.function.BiFunction;
 import java.util.function.Function;
 
 /**
@@ -57,11 +56,6 @@ public Optional<IModuleLayerManager> findModuleLayerManager() {
         return launcher.findLayerManager();
     }
 
-    @Override
-    public Optional<BiFunction<INameMappingService.Domain, String, String>> findNameMapping(final String targetMapping) {
-        return launcher.findNameMapping(targetMapping);
-    }
-
     @Override
     public <T> T computePropertyIfAbsent(final TypesafeMap.Key<T> key, final Function<? super TypesafeMap.Key<T>, ? extends T> valueFunction) {
         return environment.computeIfAbsent(key, valueFunction);

src/main/java/cpw/mods/modlauncher/Launcher.java

@@ -23,9 +23,7 @@
 import org.apache.logging.log4j.LogManager;
 import cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
 
-import java.nio.file.Path;
 import java.util.*;
-import java.util.function.BiFunction;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -40,7 +38,6 @@ public class Launcher {
     private final TransformationServicesHandler transformationServicesHandler;
     private final Environment environment;
     private final TransformStore transformStore;
-    private final NameMappingServiceHandler nameMappingServiceHandler;
     private final ArgumentHandler argumentHandler;
     private final LaunchServiceHandler launchService;
     private final LaunchPluginHandler launchPlugins;
@@ -61,7 +58,6 @@ private Launcher() {
         this.transformStore = new TransformStore();
         this.transformationServicesHandler = new TransformationServicesHandler(this.transformStore, this.moduleLayerHandler);
         this.argumentHandler = new ArgumentHandler();
-        this.nameMappingServiceHandler = new NameMappingServiceHandler(this.moduleLayerHandler);
         this.launchPlugins = new LaunchPluginHandler(this.moduleLayerHandler);
     }
 
@@ -86,7 +82,7 @@ public final TypesafeMap blackboard() {
     private void run(String... args) {
         final ArgumentHandler.DiscoveryData discoveryData = this.argumentHandler.setArgs(args);
         this.transformationServicesHandler.discoverServices(discoveryData);
-        final var scanResults = this.transformationServicesHandler.initializeTransformationServices(this.argumentHandler, this.environment, this.nameMappingServiceHandler)
+        final var scanResults = this.transformationServicesHandler.initializeTransformationServices(this.argumentHandler, this.environment)
                 .stream().collect(Collectors.groupingBy(ITransformationService.Resource::target));
         scanResults.getOrDefault(IModuleLayerManager.Layer.PLUGIN, List.of())
                 .stream()
@@ -121,10 +117,6 @@ Optional<ILaunchHandlerService> findLaunchHandler(final String name) {
         return launchService.findLaunchHandler(name);
     }
 
-    Optional<BiFunction<INameMappingService.Domain, String, String>> findNameMapping(final String targetMapping) {
-        return nameMappingServiceHandler.findNameTranslator(targetMapping);
-    }
-
     public Optional<IModuleLayerManager> findLayerManager() {
         return Optional.ofNullable(this.moduleLayerHandler);
     }

src/main/java/cpw/mods/modlauncher/TransformationServicesHandler.java

@@ -44,14 +44,11 @@ class TransformationServicesHandler {
         this.layerHandler = layerHandler;
     }
 
-    List<ITransformationService.Resource> initializeTransformationServices(ArgumentHandler argumentHandler, Environment environment, final NameMappingServiceHandler nameMappingServiceHandler) {
+    List<ITransformationService.Resource> initializeTransformationServices(ArgumentHandler argumentHandler, Environment environment) {
         loadTransformationServices(environment);
         validateTransformationServices();
         processArguments(argumentHandler, environment);
         initialiseTransformationServices(environment);
-        // force the naming to "mojang" if nothing has been populated during transformer setup
-        environment.computePropertyIfAbsent(IEnvironment.Keys.NAMING.get(), a-> "mojang");
-        nameMappingServiceHandler.bindNamingServices(environment.getProperty(Environment.Keys.NAMING.get()).orElse("mojang"));
         return runScanningTransformationServices(environment);
     }
 

src/main/java/cpw/mods/modlauncher/api/IEnvironment.java

@@ -64,13 +64,6 @@ public interface IEnvironment {
 
     Optional<IModuleLayerManager> findModuleLayerManager();
 
-    /**
-     * Find the naming translation for the targetMapping.
-     * @param targetMapping the name of the mapping to lookup
-     * @return a function mapping names from the current naming domain to the requested one, if available
-     */
-    Optional<BiFunction<INameMappingService.Domain, String, String>> findNameMapping(String targetMapping);
-
     final class Keys {
         /**
          * Version passed in through arguments
@@ -92,10 +85,6 @@ final class Keys {
          * The name of the identified launch target (passed as an argument)
          */
         public static final Supplier<TypesafeMap.Key<String>> LAUNCHTARGET = buildKey("launchtarget", String.class);
-        /**
-         * The naming scheme in use. Populated at startup. See: {@link INameMappingService}
-         */
-        public static final Supplier<TypesafeMap.Key<String>> NAMING = buildKey("naming", String.class);
         /**
          * The audit trail for transformers applied to a class. See {@link ITransformerAuditTrail}
          */

src/main/java/module-info.java

@@ -12,7 +12,6 @@
     exports cpw.mods.modlauncher.util;
     exports cpw.mods.modlauncher;
     uses cpw.mods.modlauncher.api.ILaunchHandlerService;
-    uses cpw.mods.modlauncher.api.INameMappingService;
     uses cpw.mods.modlauncher.api.ITransformationService;
     uses cpw.mods.modlauncher.serviceapi.ILaunchPluginService;
     uses cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService;