Move brigadier module to GAME layer

Fixes #1439
Sinytra · Dec 21, 2024 · 8fb49ad · 8fb49ad
1 parent f0ec6ce
commit 8fb49ad
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/org/sinytra/connector/service/ConnectorLoaderService.java b/src/main/java/org/sinytra/connector/service/ConnectorLoaderService.java
@@ -12,7 +12,6 @@
 import net.neoforged.fml.loading.LoadingModList;
 import net.neoforged.neoforgespi.earlywindow.ImmediateWindowProvider;
 import org.sinytra.connector.ConnectorEarlyLoader;
-import org.sinytra.connector.locator.ConnectorLocator;
 import org.sinytra.connector.service.hacks.ConnectorForkJoinThreadFactory;
 import org.sinytra.connector.service.hacks.FabricASMFixer;
 import org.sinytra.connector.service.hacks.LenientRuntimeEnumExtender;
@@ -38,6 +37,7 @@
 public class ConnectorLoaderService implements ITransformationService {
     private static final String NAME = "connector_loader";
     private static final String AUTHLIB_MODULE = "authlib";
+    private static final String BRIGADIER_MODULE = "brigadier";
     private static final Logger LOGGER = LogUtils.getLogger();
     private static final VarHandle PLUGINS = uncheck(() -> ConnectorUtil.TRUSTED_LOOKUP.findVarHandle(LaunchPluginHandler.class, "plugins", Map.class));
 
@@ -122,7 +122,8 @@ public List<Resource> completeScan(IModuleLayerManager layerManager) {
         }
         return List.of(new Resource(IModuleLayerManager.Layer.GAME, List.of(
             FabricASMFixer.provideGeneratedClassesJar(),
-            ModuleLayerMigrator.moveModule(AUTHLIB_MODULE)
+            ModuleLayerMigrator.moveModule(AUTHLIB_MODULE),
+            ModuleLayerMigrator.moveModule(BRIGADIER_MODULE)
         )));
     }