Cleanup.

CHANGELOG.md

@@ -66,9 +66,12 @@
 
 ### 1.0.0-beta.13
 
+- \[1.20] Changed item for brush action on blackboards to the new brush item.
+- \[1.20] Changed painter's palette recipe to use the new brush item.
 - \[1.20] Added custom models for the bamboo pile.
-- \[1.19.4] Reorganized creative tab injection of Aurora's Decorations items to match the new tabs.
+- \[1.19.4+] Reorganized creative tab injection of Aurora's Decorations items to match the new tabs.
 - Fixed Lavender Plains replacing Flower Forest biomes sometimes.
 - Improved Painter's Palette texture.
+- Switched ModelLoaderMixin to new Model API usage.
 
 [EMI]: https://modrinth.com/mod/emi "EMI Modrinth page"

build.gradle

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = project.maven_group
-version = "${project.mod_version}+${MINECRAFT_VERSION}"
+version = "${project.mod_version}+${MINECRAFT_VERSION.version()}"
 archivesBaseName = project.archives_base_name
 
 if (!(System.getenv("CURSEFORGE_TOKEN") || System.getenv("MODRINTH_TOKEN"))) {
@@ -17,8 +17,8 @@ if (!(System.getenv("CURSEFORGE_TOKEN") || System.getenv("MODRINTH_TOKEN"))) {
 logger.lifecycle("Preparing version ${version}...")
 
 boolean isMCVersionNonRelease() {
-	return MINECRAFT_VERSION.matches('^\\d\\dw\\d\\d[a-z]$')
-			|| MINECRAFT_VERSION.matches('\\d+\\.\\d+-(pre|rc)(\\d+)')
+	return MINECRAFT_VERSION.version().matches('^\\d\\dw\\d\\d[a-z]$')
+			|| MINECRAFT_VERSION.version().matches('\\d+\\.\\d+-(pre|rc)(\\d+)')
 }
 
 String parseReadme() {
@@ -103,8 +103,8 @@ jar {
 
 modrinth {
 	projectId = project.modrinth_id
-	versionName = "Aurora's Decorations ${project.mod_version} (${MINECRAFT_VERSION})"
-	gameVersions = [MINECRAFT_VERSION]
+	versionName = "Aurora's Decorations ${project.mod_version} (${MINECRAFT_VERSION.version()})"
+	gameVersions = MINECRAFT_VERSION.all()
 	loaders = ["quilt"]
 	versionType = this.getVersionType()
 	uploadFile = tasks.remapJar
@@ -137,7 +137,9 @@ curseforge {
 	project {
 		id = project.curseforge_id
 		releaseType = this.getVersionType()
-		addGameVersion MINECRAFT_VERSION
+		MINECRAFT_VERSION.all().forEach {
+			addGameVersion it
+		}
 		addGameVersion "Quilt"
 		addGameVersion "Java 17"
 		addGameVersion "Java 18"
@@ -155,7 +157,7 @@ curseforge {
 		}
 
 		mainArtifact(remapJar) {
-			displayName = "Aurora's Decorations ${project.mod_version} (${MINECRAFT_VERSION})"
+			displayName = "Aurora's Decorations ${project.mod_version} (${MINECRAFT_VERSION.version()})"
 
 			relations {
 				requiredDependency "qsl"

build_logic/src/main/groovy/aurorasdeco.common.gradle

@@ -82,11 +82,11 @@ repositories {
 }
 
 dependencies {
-	minecraft "com.mojang:minecraft:${Constants.MINECRAFT_VERSION}"
-	mappings "org.quiltmc:quilt-mappings:${Constants.MINECRAFT_VERSION}+build.${Constants.MAPPINGS}:intermediary-v2"
+	minecraft "com.mojang:minecraft:${Constants.MINECRAFT_VERSION.version()}"
+	mappings "org.quiltmc:quilt-mappings:${Constants.MINECRAFT_VERSION.version()}+build.${Constants.MAPPINGS}:intermediary-v2"
 	modImplementation "org.quiltmc:quilt-loader:${Constants.LOADER_VERSION}"
 
-	modImplementation("org.quiltmc.quilted-fabric-api:quilted-fabric-api:${Constants.QFAPI_VERSION}-${Constants.MINECRAFT_VERSION}")
+	modImplementation("org.quiltmc.quilted-fabric-api:quilted-fabric-api:${Constants.QFAPI_VERSION}-${Constants.MINECRAFT_VERSION.version()}")
 	include(modImplementation("com.terraformersmc.terraform-api:terraform-wood-api-v1:${Constants.TERRAFORM_WOOD_API_VERSION}") {
 		exclude group: 'net.fabricmc'
 		exclude group: 'net.fabricmc.fabric-api'

build_logic/src/main/groovy/aurorasdeco/Constants.java

@@ -22,7 +22,7 @@ public final class Constants {
 
 	/* VERSIONS */
 
-	public static final String MINECRAFT_VERSION = "1.20.1";
+	public static final MinecraftVersions MINECRAFT_VERSION = new MinecraftVersions("1.20.1", "1.20");
 	public static final int MAPPINGS = 19;
 	public static final String LOADER_VERSION = "0.19.1";
 	public static final String QFAPI_VERSION = "7.1.0+0.86.1";

build_logic/src/main/groovy/aurorasdeco/MinecraftVersions.java

@@ -0,0 +1,17 @@
+package aurorasdeco;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public record MinecraftVersions(String version, List<String> supported) {
+	public MinecraftVersions(String version, String... supported) {
+		this(version, List.of(supported));
+	}
+
+	public List<String> all() {
+		var versions = new ArrayList<String>();
+		versions.add(this.version);
+		versions.addAll(this.supported);
+		return versions;
+	}
+}

build_logic/src/main/groovy/aurorasdeco/extension/AurorasDecoExtension.java

@@ -74,7 +74,8 @@ public void finalizeConfiguration() {
 
 				new aurorasdeco.DependencyAppenderUtil("emi", "dev.emi:emi-fabric:" + Constants.EMI_VERSION).apply(this.project);
 				new aurorasdeco.DependencyAppenderUtil("emi",
-						"org.quiltmc.quilted-fabric-api:quilted-fabric-api-deprecated:" + Constants.QFAPI_VERSION + "-" + Constants.MINECRAFT_VERSION
+						"org.quiltmc.quilted-fabric-api:quilted-fabric-api-deprecated:"
+								+ Constants.QFAPI_VERSION + "-" + Constants.MINECRAFT_VERSION.version()
 				).apply(this.project);
 
 				this.project.getDependencies().add("emiImplementation", sourceSets.getByName("main").getOutput());

build_logic/src/main/groovy/aurorasdeco/task/GenerateQmjTask.java

@@ -92,8 +92,20 @@ public void generateQmj() throws IOException {
 			{
 				writer.beginObject()
 						.name("id").value("minecraft")
-						.name("versions").value(Constants.MINECRAFT_VERSION)
-						.endObject();
+						.name("versions");
+				if (Constants.MINECRAFT_VERSION.supported().isEmpty()) {
+					writer.value(Constants.MINECRAFT_VERSION.version());
+				} else {
+					writer.beginObject()
+							.name("any").beginArray();
+					for (var version : Constants.MINECRAFT_VERSION.all()) {
+						writer.value("=" + version);
+					}
+					writer.endArray()
+							.endObject();
+				}
+				writer.endObject();
+
 				writer.beginObject()
 						.name("id").value("quilt_loader")
 						.name("versions").value(">=" + Constants.LOADER_VERSION)