Rework mod discovery, resolution and loading

build.gradle

@@ -61,8 +61,8 @@ dependencies {
 	implementation 'net.fabricmc:tiny-remapper:0.4.2'
 	implementation 'net.fabricmc:access-widener:1.0.0'
 
-	implementation 'com.google.jimfs:jimfs:1.2-fabric'
-	implementation 'net.fabricmc:fabric-loader-sat4j:2.3.5.4'
+	implementation 'org.ow2.sat4j:org.ow2.sat4j.core:2.3.6'
+	implementation 'org.ow2.sat4j:org.ow2.sat4j.pb:2.3.6'
 
 	// launchwrapper + dependencies
 	implementation ('net.minecraft:launchwrapper:1.12') {

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.11.6
+version = 0.12.0
 asm_version = 9.1

src/main/java/net/fabricmc/loader/api/SemanticVersion.java

@@ -18,7 +18,7 @@
 
 import java.util.Optional;
 
-import net.fabricmc.loader.impl.util.version.VersionDeserializer;
+import net.fabricmc.loader.impl.util.version.VersionParser;
 
 /**
  * Represents a <a href="https://semver.org/">Sematic Version</a>.
@@ -28,7 +28,7 @@
  *
  * @see Version
  */
-public interface SemanticVersion extends Version, Comparable<SemanticVersion> {
+public interface SemanticVersion extends Version {
 	/**
 	 * The value of {@linkplain #getVersionComponent(int) version component} that indicates
 	 * a {@linkplain #hasWildcard() wildcard}.
@@ -87,16 +87,12 @@ public interface SemanticVersion extends Version, Comparable<SemanticVersion> {
 	boolean hasWildcard();
 
 	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>Comparison of semantic versions is by the version components, from high to low;
-	 * then it falls back to comparing the prerelease notations.</p>
-	 *
-	 * @param o the other version
-	 * @return the result of comparison
+	 * @deprecated Use {@link #compareTo(Version)} instead
 	 */
-	@Override
-	int compareTo(SemanticVersion o);
+	@Deprecated
+	default int compareTo(SemanticVersion o) {
+		return compareTo((Version) o);
+	}
 
 	/**
 	 * Parses a semantic version from a string notation.
@@ -106,6 +102,6 @@ public interface SemanticVersion extends Version, Comparable<SemanticVersion> {
 	 * @throws VersionParsingException if a problem arises during version parsing
 	 */
 	static SemanticVersion parse(String s) throws VersionParsingException {
-		return VersionDeserializer.deserializeSemantic(s);
+		return VersionParser.parseSemantic(s);
 	}
 }

src/main/java/net/fabricmc/loader/api/Version.java

@@ -17,14 +17,14 @@
 package net.fabricmc.loader.api;
 
 import net.fabricmc.loader.api.metadata.ModMetadata;
-import net.fabricmc.loader.impl.util.version.VersionDeserializer;
+import net.fabricmc.loader.impl.util.version.VersionParser;
 
 /**
  * Represents a version of a mod.
  *
  * @see ModMetadata#getVersion()
  */
-public interface Version {
+public interface Version extends Comparable<Version> {
 	/**
 	 * Returns the user-friendly representation of this version.
 	 */
@@ -38,6 +38,6 @@ public interface Version {
 	 * @throws VersionParsingException if a problem arises during version parsing
 	 */
 	static Version parse(String string) throws VersionParsingException {
-		return VersionDeserializer.deserialize(string);
+		return VersionParser.parse(string, false);
 	}
 }

src/main/java/net/fabricmc/loader/api/metadata/ModDependency.java

@@ -16,15 +16,22 @@
 
 package net.fabricmc.loader.api.metadata;
 
-import java.util.Set;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
 import net.fabricmc.loader.api.Version;
-import net.fabricmc.loader.api.VersionPredicate;
+import net.fabricmc.loader.api.metadata.version.VersionPredicate;
 
 /**
  * Represents a dependency.
  */
 public interface ModDependency {
+	/**
+	 * Get the kind of dependency.
+	 */
+	Kind getKind();
+
 	/**
 	 * Returns the ID of the mod to check.
 	 */
@@ -42,5 +49,63 @@ public interface ModDependency {
 	 *
 	 * @return representation of the dependency's version requirements
 	 */
-	Set<VersionPredicate> getVersionRequirements();
+	Collection<VersionPredicate> getVersionRequirements();
+
+	enum Kind {
+		DEPENDS("depends", true, false),
+		RECOMMENDS("recommends", true, true),
+		SUGGESTS("suggests", true, true),
+		CONFLICTS("conflicts", false, true),
+		BREAKS("breaks", false, false);
+
+		private static final Map<String, Kind> map = createMap();
+		private final String key;
+		private final boolean positive;
+		private final boolean soft;
+
+		Kind(String key, boolean positive, boolean soft) {
+			this.key = key;
+			this.positive = positive;
+			this.soft = soft;
+		}
+
+		/**
+		 * Get the key for the dependency as used by fabric.mod.json (v1+) and dependency overrides.
+		 */
+		public String getKey() {
+			return key;
+		}
+
+		/**
+		 * Get whether the dependency is positive, encouraging the inclusion of a mod instead of negative/discouraging.
+		 */
+		public boolean isPositive() {
+			return positive;
+		}
+
+		/**
+		 * Get whether it is a soft dependency, allowing the mod to still load if the dependency is unmet.
+		 */
+		public boolean isSoft() {
+			return soft;
+		}
+
+		/**
+		 * Parse a dependency kind from its key as provided by {@link #getKey}.
+		 */
+		public static Kind parse(String key) {
+			return map.get(key);
+		}
+
+		private static Map<String, Kind> createMap() {
+			Kind[] values = values();
+			Map<String, Kind> ret = new HashMap<>(values.length);
+
+			for (Kind kind : values) {
+				ret.put(kind.key, kind);
+			}
+
+			return ret;
+		}
+	}
 }