Move static final fields to PatchworkMappingService

Author: TheGlitch76

patchwork-fml/src/main/java/com/patchworkmc/impl/fml/PatchworkMappingService.java

@@ -19,20 +19,22 @@
 
 package com.patchworkmc.impl.fml;
 
-import static net.minecraftforge.fml.common.ObfuscationReflectionHelper.INTERMEDIARY;
-import static net.minecraftforge.fml.common.ObfuscationReflectionHelper.MAPPINGS;
-import static net.minecraftforge.fml.common.ObfuscationReflectionHelper.NAMED;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import cpw.mods.modlauncher.api.INameMappingService;
 
 import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.launch.common.FabricLauncherBase;
 import net.fabricmc.mapping.tree.ClassDef;
 import net.fabricmc.mapping.tree.Mapped;
+import net.fabricmc.mapping.tree.TinyTree;
 
 public class PatchworkMappingService {
+	public static final TinyTree MAPPINGS = FabricLauncherBase.getLauncher().getMappingConfiguration().getMappings();
+	public static final String INTERMEDIARY = "intermediary";
+	public static final String NAMED = "named";
+
 	private PatchworkMappingService() {
 		// NO-OP
 	}

patchwork-fml/src/main/java/net/minecraftforge/fml/common/ObfuscationReflectionHelper.java

@@ -34,9 +34,6 @@
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.MarkerManager;
 
-import net.fabricmc.loader.launch.common.FabricLauncherBase;
-import net.fabricmc.mapping.tree.TinyTree;
-
 import com.patchworkmc.impl.fml.PatchworkMappingService;
 
 /**
@@ -53,9 +50,6 @@ public class ObfuscationReflectionHelper {
 	private static final Logger LOGGER = LogManager.getLogger();
 	private static final Marker REFLECTION = MarkerManager.getMarker("REFLECTION");
 	// We're technically messing with Loader's internal APIs here, if Loader ever gets a better mapping resolution system this class should be refactored.
-	public static final TinyTree MAPPINGS = FabricLauncherBase.getLauncher().getMappingConfiguration().getMappings();
-	public static final String INTERMEDIARY = "intermediary";
-	public static final String NAMED = "named";
 
 	/**
 	 * Remaps a name from intermediary to whatever is currently being used at runtime.