Merge branch 'main' into breaks-clause

neoforged · Dec 14, 2023 · 4e02fb9 · 4e02fb9
2 parents 05d5e9f + edb6959
commit 4e02fb9
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 236 deletions.
diff --git a/loader/src/main/java/net/neoforged/fml/common/asm/CapabilityTokenSubclass.java b/loader/src/main/java/net/neoforged/fml/common/asm/CapabilityTokenSubclass.java
diff --git a/loader/src/main/java/net/neoforged/fml/common/asm/ObjectHolderDefinalize.java b/loader/src/main/java/net/neoforged/fml/common/asm/ObjectHolderDefinalize.java
diff --git a/...orged/fml/loading/RuntimeDistCleaner.java → ...ed/fml/common/asm/RuntimeDistCleaner.java b/...orged/fml/loading/RuntimeDistCleaner.java → ...ed/fml/common/asm/RuntimeDistCleaner.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.neoforged.fml.loading;
+package net.neoforged.fml.common.asm;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/loader/src/main/java/net/neoforged/fml/loading/FMLLoader.java b/loader/src/main/java/net/neoforged/fml/loading/FMLLoader.java
@@ -11,6 +11,7 @@
 import cpw.mods.modlauncher.util.ServiceLoaderUtils;
 import net.neoforged.accesstransformer.api.AccessTransformerEngine;
 import net.neoforged.accesstransformer.ml.AccessTransformerService;
+import net.neoforged.fml.common.asm.RuntimeDistCleaner;
 import net.neoforged.fml.loading.mixin.DeferredMixinConfigRegistration;
 import net.neoforged.fml.loading.moddiscovery.BackgroundScanHandler;
 import net.neoforged.fml.loading.moddiscovery.ModDiscoverer;
@@ -20,7 +21,6 @@
 import net.neoforged.fml.loading.targets.CommonLaunchHandler;
 import net.neoforged.neoforgespi.Environment;
 import net.neoforged.neoforgespi.coremod.ICoreModProvider;
-import org.apache.commons.lang3.tuple.Pair;
 import org.slf4j.Logger;
 
 import java.io.IOException;

diff --git a/...src/main/resources/META-INF/services/cpw.mods.modlauncher.serviceapi.ILaunchPluginService b/...src/main/resources/META-INF/services/cpw.mods.modlauncher.serviceapi.ILaunchPluginService
@@ -1,5 +1,3 @@
 net.neoforged.fml.loading.log4j.SLF4JFixerLaunchPluginService
-net.neoforged.fml.loading.RuntimeDistCleaner
-net.neoforged.fml.common.asm.RuntimeEnumExtender
-net.neoforged.fml.common.asm.ObjectHolderDefinalize
-net.neoforged.fml.common.asm.CapabilityTokenSubclass
+net.neoforged.fml.common.asm.RuntimeDistCleaner
+net.neoforged.fml.common.asm.RuntimeEnumExtender