1.3.0

CHANGELOG.md

@@ -8,6 +8,7 @@ Changelog to track updates for this mod.
 ### Added
 
 ### Changed
+- Port MC1.21.1
 
 ### Deprecated
 

build.gradle

@@ -1,8 +1,10 @@
+import net.darkhax.curseforgegradle.TaskPublishCurseForge
+
 plugins {
     id 'fabric-loom' version '1.7-SNAPSHOT'
     id 'maven-publish'
-    id 'com.matthewprenger.cursegradle' version '1.4.0'
-    id "com.modrinth.minotaur" version "2.8.0"
+    id 'net.darkhax.curseforgegradle' version '1.1.25'
+    id "com.modrinth.minotaur" version '2.8.7'
     id 'org.jetbrains.changelog' version "2.0.0"
 }
 
@@ -166,56 +168,53 @@ publishing {
     }
 }
 
-curseforge {
+def mainJar = file("${project.layout.buildDirectory.get().asFile}/libs/${project.archives_base_name}-mc${project.minecraft_version}-${project.mod_version}.jar")
+def sourcesJar = file("${project.layout.buildDirectory.get().asFile}/libs/${project.archives_base_name}-mc${project.minecraft_version}-${project.mod_version}-sources.jar")
+def changeLogFile = file('../LATEST_CHANGELOG.md')
+def uploadMainName = "${project.mod_display_name}-${project.minecraft_version}-${project.mod_version}"
+def uploadSourcesName = "${project.mod_display_name}-${project.minecraft_version}-${project.mod_version}-sources"
+
+tasks.register('publishCurseForge', TaskPublishCurseForge) {
     if (System.getenv('curesforgeapikey') != null && "${project.curesforge_id}" != '') {
-        apiKey = System.getenv('curesforgeapikey')
-        project {
-            id = "${rootProject.curesforge_id}"
+        apiToken = System.getenv('curesforgeapikey')
 
-            changelogType = 'markdown'
-            changelog = file('./LATEST_CHANGELOG.md')
+        def mainFile = upload(findProperty('curesforge_id'), mainJar)
+        mainFile.changelogType = 'markdown'
+        mainFile.changelog = changeLogFile.text
+        mainFile.releaseType = "${project.release_type}"
+        mainFile.displayName = uploadMainName
 
-            releaseType = "${rootProject.release_type}"
-            addGameVersion "${rootProject.minecraft_version}"
-            addGameVersion 'Java 17'
-            addGameVersion "Fabric"
-            addGameVersion "Quilt"
+        project.support_versions.split(",").each {
+            String version -> mainFile.addGameVersion(version)
+        }
 
-            relations {
-                requiredDependency "fabric-api"
-            }
+        mainFile.addJavaVersion('Java 21')
 
-            mainArtifact(file("${project.buildDir}/libs/${project.archives_base_name}-mc${project.minecraft_version}-${project.mod_version}.jar")) {
-                displayName = "${project.mod_display_name}-${project.minecraft_version}-${project.mod_version}"
-            }
+        mainFile.addModLoader('Fabric')
+        mainFile.addModLoader('Quilt')
 
-            addArtifact(file("${project.buildDir}/libs/${project.archives_base_name}-mc${project.minecraft_version}-${project.mod_version}-sources.jar")) {
-                displayName = "${project.mod_display_name}-${project.minecraft_version}-${project.mod_version}-sources"
-            }
-            afterEvaluate {
-                uploadTask.dependsOn("build")
-            }
-        }
-    }
-    options {
-        forgeGradleIntegration = false
+        mainFile.addGameVersion('Client')
+
+        mainFile.addRequirement("fabric-api")
+
+        def sourcesFile = mainFile.withAdditionalFile(sourcesJar)
+        sourcesFile.displayName = uploadSourcesName
     }
 }
 
-
 if (System.getenv('modrinthapikey') != null && "${modrinth_id}" != '') {
     modrinth {
         token = System.getenv('modrinthapikey')
         projectId = "${project.modrinth_id}"
-        versionName = "${project.mod_display_name}-${project.minecraft_version}-${project.mod_version}"
+        versionName = uploadMainName
         versionNumber = "${project.minecraft_version}-${project.mod_version}"
         versionType = "${project.release_type}"
-        uploadFile = file("${project.buildDir}/libs/${project.archives_base_name}-mc${project.minecraft_version}-${project.mod_version}.jar")
-        gameVersions = List.of(project.minecraft_version)
+        uploadFile = mainJar
+        gameVersions = List.of(project.support_versions.split(","))
         loaders = ["fabric", "quilt"]
         dependencies {
-            required.project("P7dR8mSH")//Fabric API
+            required.project("P7dR8mSH") //Fabric API
         }
-        changelog = file('./LATEST_CHANGELOG.md').text
+        changelog = changeLogFile.text
     }
 }

gradle.properties

@@ -3,10 +3,11 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.parallel=true
 #Minecraft
 minecraft_version=1.21.1
+support_versions=1.21.1
 #Mod
 archives_base_name=special-model-loader
 mod_display_name=SpecialModelLoader
-mod_version=1.3.0+pre.4
+mod_version=1.3.0
 #Dependencies
 loader_version=0.16.2
 fabric_version=0.102.1+1.21.1

src/client/java/dev/felnull/specialmodelloader/api/model/ModelLoader.java

@@ -2,7 +2,6 @@
 
 import com.google.gson.JsonObject;
 import dev.felnull.specialmodelloader.impl.SpecialModelLoader;
-import dev.felnull.specialmodelloader.impl.SpecialModelLoaderClient;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.resources.ResourceManager;

src/client/java/dev/felnull/specialmodelloader/impl/handler/package-info.java

@@ -0,0 +1,4 @@
+@ApiStatus.Internal
+package dev.felnull.specialmodelloader.impl.handler;
+
+import org.jetbrains.annotations.ApiStatus;

src/client/java/dev/felnull/specialmodelloader/impl/mixin/package-info.java

@@ -0,0 +1,4 @@
+@ApiStatus.Internal
+package dev.felnull.specialmodelloader.impl.mixin;
+
+import org.jetbrains.annotations.ApiStatus;

src/client/java/dev/felnull/specialmodelloader/impl/model/obj/package-info.java

@@ -0,0 +1,4 @@
+@ApiStatus.Internal
+package dev.felnull.specialmodelloader.impl.model.obj;
+
+import org.jetbrains.annotations.ApiStatus;

src/client/java/dev/felnull/specialmodelloader/impl/model/package-info.java

@@ -0,0 +1,4 @@
+@ApiStatus.Internal
+package dev.felnull.specialmodelloader.impl.model;
+
+import org.jetbrains.annotations.ApiStatus;

src/client/java/dev/felnull/specialmodelloader/impl/util/package-info.java

@@ -0,0 +1,4 @@
+@ApiStatus.Internal
+package dev.felnull.specialmodelloader.impl.util;
+
+import org.jetbrains.annotations.ApiStatus;

src/main/java/dev/felnull/specialmodelloader/impl/package-info.java

@@ -0,0 +1,4 @@
+@ApiStatus.Internal
+package dev.felnull.specialmodelloader.impl;
+
+import org.jetbrains.annotations.ApiStatus;