Fix dependency overrides not applying.

FabricMC · Nov 30, 2021 · 8ccda57 · 8ccda57
1 parent fc76668
commit 8ccda57
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -6,5 +6,5 @@ group = net.fabricmc
 description = The mod loading component of Fabric
 url = https://github.com/FabricMC/fabric-loader
 
-version = 0.12.6
+version = 0.12.7
 asm_version = 9.2
diff --git a/src/main/java/net/fabricmc/loader/impl/discovery/BuiltinMetadataWrapper.java b/src/main/java/net/fabricmc/loader/impl/discovery/BuiltinMetadataWrapper.java
@@ -38,13 +38,11 @@
 class BuiltinMetadataWrapper extends AbstractModMetadata implements LoaderModMetadata {
 	private final ModMetadata parent;
 	private Version version;
-	private final Collection<ModDependency> dependencies;
 
 	BuiltinMetadataWrapper(ModMetadata parent) {
 		this.parent = parent;
 
 		version = parent.getVersion();
-		dependencies = parent.getDependencies();
 	}
 
 	@Override
@@ -84,7 +82,7 @@ public Collection<ModDependency> getDependencies() {
 
 	@Override
 	public void setDependencies(Collection<ModDependency> dependencies) {
-		dependencies = Collections.unmodifiableCollection(dependencies);
+		((LoaderModMetadata) parent).setDependencies(dependencies);
 	}
 
 	@Override

diff --git a/src/main/java/net/fabricmc/loader/impl/metadata/V0ModMetadata.java b/src/main/java/net/fabricmc/loader/impl/metadata/V0ModMetadata.java
@@ -38,7 +38,7 @@ final class V0ModMetadata extends AbstractModMetadata implements LoaderModMetada
 	private Version version;
 
 	// Optional (Environment)
-	private final Collection<ModDependency> dependencies;
+	private Collection<ModDependency> dependencies;
 	private final String languageAdapter = "net.fabricmc.loader.language.JavaLanguageAdapter"; // TODO: Constants class?
 	private final Mixins mixins;
 	private final ModEnvironment environment; // REMOVEME: Replacing Side in old metadata with this
@@ -129,7 +129,7 @@ public Collection<ModDependency> getDependencies() {
 
 	@Override
 	public void setDependencies(Collection<ModDependency> dependencies) {
-		dependencies = Collections.unmodifiableCollection(dependencies);
+		this.dependencies = Collections.unmodifiableCollection(dependencies);
 	}
 
 	// General metadata

diff --git a/src/main/java/net/fabricmc/loader/impl/metadata/V1ModMetadata.java b/src/main/java/net/fabricmc/loader/impl/metadata/V1ModMetadata.java
@@ -53,7 +53,7 @@ final class V1ModMetadata extends AbstractModMetadata implements LoaderModMetada
 	private final String accessWidener;
 
 	// Optional (dependency resolution)
-	private final Collection<ModDependency> dependencies;
+	private Collection<ModDependency> dependencies;
 	// Happy little accidents
 	private final boolean hasRequires;
 
@@ -168,7 +168,7 @@ public Collection<ModDependency> getDependencies() {
 
 	@Override
 	public void setDependencies(Collection<ModDependency> dependencies) {
-		dependencies = Collections.unmodifiableCollection(dependencies);
+		this.dependencies = Collections.unmodifiableCollection(dependencies);
 	}
 
 	// General metadata