Don't apply this on Neo

architectury · Dec 12, 2023 · 8a8bdd5 · 8a8bdd5
1 parent 2648db4
commit 8a8bdd5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeProvider.java
@@ -51,7 +51,7 @@ public void provide(DependencyInfo dependency) throws Exception {
 		addDependency(dependency.getDepString() + ":userdev", Constants.Configurations.FORGE_USERDEV);
 		addDependency(dependency.getDepString() + ":installer", Constants.Configurations.FORGE_INSTALLER);
 
-		if (version.getMajorVersion() >= Constants.Forge.MIN_UNION_RELAUNCHER_VERSION) {
+		if (getExtension().isForge() && version.getMajorVersion() >= Constants.Forge.MIN_UNION_RELAUNCHER_VERSION) {
 			addDependency(LoomVersions.UNION_RELAUNCHER.mavenNotation(), Constants.Configurations.FORGE_EXTRA);
 		}
 	}

diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeRunTemplate.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeRunTemplate.java
@@ -112,7 +112,7 @@ public void applyTo(RunConfigSettings settings, ConfigValue.Resolver configValue
 
 		final ForgeProvider forgeProvider = settings.getExtension().getForgeProvider();
 
-		if (forgeProvider.getVersion().getMajorVersion() >= Constants.Forge.MIN_UNION_RELAUNCHER_VERSION) {
+		if (settings.getExtension().isForge() && forgeProvider.getVersion().getMajorVersion() >= Constants.Forge.MIN_UNION_RELAUNCHER_VERSION) {
 			settings.defaultMainClass(Constants.Forge.UNION_RELAUNCHER_MAIN_CLASS);
 			settings.property(Constants.Forge.UNION_RELAUNCHER_MAIN_CLASS_PROPERTY, main);
 		}