General work

Author: TheRandomLabs

build.gradle

@@ -76,6 +76,11 @@ tasks.withType(SpotBugsTask) {
 	}
 }
 
+tasks.withType(JavaCompile) {
+	options.encoding = "UTF-8"
+	options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
+}
+
 task sourcesJar(type: Jar, dependsOn: classes) {
 	archiveClassifier.set("sources")
 	from sourceSets.main.allSource

config/pmd.xml

@@ -100,7 +100,6 @@
 	<rule ref="category/java/errorprone.xml/CloneMethodMustImplementCloneable"/>
 	<rule ref="category/java/errorprone.xml/CloneMethodReturnTypeMustMatchClassName"/>
 	<rule ref="category/java/errorprone.xml/CloseResource"/>
-	<rule ref="category/java/errorprone.xml/CompareObjectsWithEquals"/>
 	<rule ref="category/java/errorprone.xml/DoNotCallGarbageCollectionExplicitly"/>
 	<rule ref="category/java/errorprone.xml/DoNotExtendJavaLangThrowable"/>
 	<rule ref="category/java/errorprone.xml/DontUseFloatTypeForLoopIndices"/>

src/main/java/com/therandomlabs/curseapi/minecraft/CurseAPIMinecraft.java

@@ -7,7 +7,7 @@
  */
 public final class CurseAPIMinecraft {
 	/**
-	 * The ID of Minecraft on CurseForge.
+	 * Minecraft's ID on CurseForge.
 	 */
 	public static final int MINECRAFT_ID = 432;
 

src/main/java/com/therandomlabs/curseapi/minecraft/ForgeSVCMinecraftProvider.java

@@ -4,7 +4,6 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import com.google.common.collect.ImmutableSortedSet;
 import com.therandomlabs.curseapi.CurseAPIProvider;
 import com.therandomlabs.curseapi.CurseException;
 import com.therandomlabs.curseapi.forgesvc.ForgeSVCProvider;
@@ -36,15 +35,19 @@ private ForgeSVCMinecraftProvider() {}
 	 */
 	@Override
 	public SortedSet<? extends CurseGameVersion<?>> gameVersions(int id) {
-		if (failedToRetrieveVersions && versions.isEmpty()) {
-			//This initializes the MCVersion constants, which create local MCVersion instances
-			//if failedToRetrieveVersions is true.
-			MCVersions.getAll();
-		}
-
+		MCVersions.initialize();
 		return id == CurseAPIMinecraft.MINECRAFT_ID ? new TreeSet<>(versions) : null;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public CurseGameVersion<?> gameVersion(int gameID, String versionString) {
+		MCVersions.initialize();
+		return gameID == CurseAPIMinecraft.MINECRAFT_ID ? MCVersions.get(versionString) : null;
+	}
+
 	@SuppressWarnings("PMD.ForLoopCanBeForeach")
 	private static SortedSet<MCVersion> getVersions() {
 		final Logger logger = LoggerFactory.getLogger(ForgeSVCMinecraftProvider.class);
@@ -55,12 +58,14 @@ private static SortedSet<MCVersion> getVersions() {
 
 			for (int i = 0; i < versions.size(); i++) {
 				final MCVersion version = versions.get(i);
-				version.setIndex(versions.size() - i - 1);
-				//Initialize MCVersionGroup instance.
+				//Initialize MCVersion#versionGroup so that the MCVersion adds itself to the
+				//version group.
 				version.versionGroup();
+				//We multiply the index by 2 so that snapshots defined in MCVersions can fit in.
+				version.setSortIndex((versions.size() - i - 1) * 2);
 			}
 
-			return ImmutableSortedSet.copyOf(versions);
+			return new TreeSet<>(versions);
 		} catch (CurseException ex) {
 			logger.error(
 					"Failed to retrieve Minecraft versions; a local copy will be used instead", ex

src/main/java/com/therandomlabs/curseapi/minecraft/MCVersion.java

@@ -6,6 +6,7 @@
 import java.util.Set;
 import java.util.TreeSet;
 
+import com.google.common.primitives.Ints;
 import com.therandomlabs.curseapi.game.CurseGameVersion;
 import com.therandomlabs.curseapi.game.CurseGameVersionGroup;
 
@@ -38,8 +39,14 @@ public Set<MCVersion> versions() {
 			return new TreeSet<>(versions);
 		}
 
-		static MCVersionGroup get(MCVersion version) {
+		static CurseGameVersionGroup<MCVersion> get(MCVersion version) {
 			final String[] versionElements = version.versionString().split("\\.");
+
+			//Modloaders don't have version groups.
+			if (Ints.tryParse(versionElements[0]) == null) {
+				return CurseGameVersionGroup.none(CurseAPIMinecraft.MINECRAFT_ID);
+			}
+
 			final String versionString = versionElements[0] + "." + versionElements[1];
 			final MCVersionGroup versionGroup =
 					versionGroups.computeIfAbsent(versionString, MCVersionGroup::new);
@@ -48,13 +55,13 @@ static MCVersionGroup get(MCVersion version) {
 		}
 	}
 
-	private int index;
+	private int sortIndex;
 	private String versionString;
 
-	private transient MCVersionGroup versionGroup;
+	private transient CurseGameVersionGroup<MCVersion> versionGroup;
 
-	MCVersion(int index, String versionString) {
-		this.index = index;
+	MCVersion(int sortIndex, String versionString) {
+		this.sortIndex = sortIndex;
 		this.versionString = versionString;
 	}
 
@@ -91,11 +98,16 @@ public String versionString() {
 	 */
 	@Override
 	public int compareTo(MCVersion version) {
-		return Integer.compare(index, version.index);
+		return Integer.compare(sortIndex, version.sortIndex);
+	}
+
+	//This method is called by MCVersions.
+	int getSortIndex() {
+		return sortIndex;
 	}
 
-	//This method is called by ForgeSVCMinecraftProvider.
-	void setIndex(int index) {
-		this.index = index;
+	//This method is called by ForgeSVCMinecraftProvider and MCVersions.
+	void setSortIndex(int sortIndex) {
+		this.sortIndex = sortIndex;
 	}
 }

src/main/java/com/therandomlabs/curseapi/minecraft/MCVersionGroups.java

@@ -82,5 +82,10 @@ public final class MCVersionGroups {
 	 */
 	public static final CurseGameVersionGroup<MCVersion> V1_14 = MCVersions.V1_14.versionGroup();
 
+	/**
+	 * Minecraft 1.15.
+	 */
+	public static final CurseGameVersionGroup<MCVersion> V1_15 = MCVersions.V1_15.versionGroup();
+
 	private MCVersionGroups() {}
 }

src/main/java/com/therandomlabs/curseapi/minecraft/MCVersions.java

@@ -9,6 +9,11 @@
  * by CurseForge.
  */
 public final class MCVersions {
+	/**
+	 * Represents an unknown version of Minecraft.
+	 */
+	public static final MCVersion UNKNOWN = new MCVersion(-1, "Unknown");
+
 	/**
 	 * Minecraft 1.0.
 	 */
@@ -149,6 +154,11 @@ public final class MCVersions {
 	 */
 	public static final MCVersion V1_7_10 = initialize("1.7.10");
 
+	/**
+	 * Minecraft 1.8 snapshots.
+	 */
+	public static final MCVersion V1_8_SNAPSHOT = create("1.8", "1.8-Snapshot");
+
 	/**
 	 * Minecraft 1.8.
 	 */
@@ -199,6 +209,11 @@ public final class MCVersions {
 	 */
 	public static final MCVersion V1_8_9 = initialize("1.8.9");
 
+	/**
+	 * Minecraft 1.9 snapshots.
+	 */
+	public static final MCVersion V1_9_SNAPSHOT = create("1.9", "1.9-Snapshot");
+
 	/**
 	 * Minecraft 1.9.
 	 */
@@ -224,6 +239,11 @@ public final class MCVersions {
 	 */
 	public static final MCVersion V1_9_4 = initialize("1.9.4");
 
+	/**
+	 * Minecraft 1.10 snapshots.
+	 */
+	public static final MCVersion V1_10_SNAPSHOT = create("1.10", "1.10-Snapshot");
+
 	/**
 	 * Minecraft 1.10.
 	 */
@@ -239,6 +259,11 @@ public final class MCVersions {
 	 */
 	public static final MCVersion V1_10_2 = initialize("1.10.2");
 
+	/**
+	 * Minecraft 1.11 snapshots.
+	 */
+	public static final MCVersion V1_11_SNAPSHOT = create("1.11", "1.11-Snapshot");
+
 	/**
 	 * Minecraft 1.11.
 	 */
@@ -254,6 +279,11 @@ public final class MCVersions {
 	 */
 	public static final MCVersion V1_11_2 = initialize("1.11.2");
 
+	/**
+	 * Minecraft 1.12 snapshots.
+	 */
+	public static final MCVersion V1_12_SNAPSHOT = create("1.12", "1.12-Snapshot");
+
 	/**
 	 * Minecraft 1.12.
 	 */
@@ -269,6 +299,11 @@ public final class MCVersions {
 	 */
 	public static final MCVersion V1_12_2 = initialize("1.12.2");
 
+	/**
+	 * Minecraft 1.13 snapshots.
+	 */
+	public static final MCVersion V1_13_SNAPSHOT = create("1.13", "1.13-Snapshot");
+
 	/**
 	 * Minecraft 1.13.
 	 */
@@ -284,6 +319,11 @@ public final class MCVersions {
 	 */
 	public static final MCVersion V1_13_2 = initialize("1.13.2");
 
+	/**
+	 * Minecraft 1.14 snapshots.
+	 */
+	public static final MCVersion V1_14_SNAPSHOT = create("1.14", "1.14-Snapshot");
+
 	/**
 	 * Minecraft 1.14.
 	 */
@@ -310,9 +350,34 @@ public final class MCVersions {
 	public static final MCVersion V1_14_4 = initialize("1.14.4");
 
 	/**
-	 * Represents an unknown version of Minecraft.
+	 * Minecraft 1.15 snapshots.
 	 */
-	public static final MCVersion UNKNOWN = new MCVersion(-1, "Unknown");
+	public static final MCVersion V1_15_SNAPSHOT = create("1.15", "1.15-Snapshot");
+
+	/**
+	 * Minecraft 1.15.
+	 */
+	public static final MCVersion V1_15 = initialize("1.15");
+
+	/**
+	 * Minecraft 1.15.1.
+	 */
+	public static final MCVersion V1_15_1 = initialize("1.15.1");
+
+	/**
+	 * The Fabric modloader.
+	 */
+	public static final MCVersion FABRIC = initialize("Fabric");
+
+	/**
+	 * The Minecraft Forge modloader.
+	 */
+	public static final MCVersion FORGE = initialize("Forge");
+
+	/**
+	 * The Rift modloader.
+	 */
+	public static final MCVersion RIFT = initialize("Rift");
 
 	private MCVersions() {}
 
@@ -355,14 +420,13 @@ public static MCVersion get(String versionString) {
 		return UNKNOWN;
 	}
 
+	static void initialize() {
+		//This is called by ForgeSVCMinecraftProvider.
+	}
+
 	private static MCVersion initialize(String versionString) {
 		if (ForgeSVCMinecraftProvider.failedToRetrieveVersions) {
-			final MCVersion version =
-					new MCVersion(ForgeSVCMinecraftProvider.versions.size(), versionString);
-			ForgeSVCMinecraftProvider.versions.add(version);
-			//Initialize MCVersionGroup instance.
-			version.versionGroup();
-			return version;
+			return create(-1, versionString);
 		}
 
 		for (MCVersion version : ForgeSVCMinecraftProvider.versions) {
@@ -371,6 +435,33 @@ private static MCVersion initialize(String versionString) {
 			}
 		}
 
-		throw new IllegalArgumentException("Invalid version string: " + versionString);
+		//The Minecraft versions API often takes some time to acknowledge newer versions of
+		//Minecraft.
+		return create(-1, versionString);
+	}
+
+	//Snapshots and modloaders are also not provided in the Minecraft versions API.
+	private static MCVersion create(int index, String versionString) {
+		if (index == -1) {
+			index = ForgeSVCMinecraftProvider.versions.size() * 2;
+		}
+
+		final MCVersion version = new MCVersion(index, versionString);
+		//Initialize MCVersion#versionGroup so that the MCVersion adds itself to the version group.
+		version.versionGroup();
+		ForgeSVCMinecraftProvider.versions.add(version);
+		return version;
+	}
+
+	//This method is used to create snapshot versions.
+	private static MCVersion create(String nextVersionString, String versionString) {
+		if (ForgeSVCMinecraftProvider.failedToRetrieveVersions) {
+			return create(-1, versionString);
+		}
+
+		final MCVersion nextVersion = get(nextVersionString);
+		//Since sort indexes are normally separated by 2,
+		//there should be a gap that this version can fit in.
+		return create(nextVersion == UNKNOWN ? -1 : nextVersion.getSortIndex() - 1, versionString);
 	}
 }

src/test/java/com/therandomlabs/curseapi/minecraft/MCVersionsTest.java

@@ -22,6 +22,7 @@ public void mcVersionsShouldNotBeEmpty() throws CurseException {
 	@Test
 	public void mcVersionComparisonsShouldBeCorrect() {
 		assertThat(MCVersions.V1_14_4.newerThan(MCVersions.V1_14_3)).isTrue();
+		assertThat(MCVersions.V1_8_SNAPSHOT.olderThan(MCVersions.V1_8)).isTrue();
 		assertThat(MCVersions.V1_0.olderThan(MCVersions.V1_2_1)).isTrue();
 		assertThat(MCVersions.V1_1.olderThan(MCVersions.V1_0)).isFalse();
 	}