fix: move to nanite library, fix issues

Author: MichaelHillcox

CHANGELOG.md

@@ -1,3 +1,12 @@
 # Changelog
 
-Ported to 26.1
+## [26.1.2.1]
+
+### Changed
+
+- Remove dependency on `ClothConfig` in preference for `Nanite Library`
+- Fixed issues with the last update for 26.1
+
+## [Pre 26.1 version numbering]
+
+Ported to 26.1

build.gradle

@@ -3,43 +3,32 @@ plugins {
     id 'fabric-loom' version '1.15-SNAPSHOT' apply(false)
     id 'net.neoforged.moddev' version '2.0.141' apply(false)
     id "me.modmuss50.mod-publish-plugin" version "1.1.0"
+    id "dev.nanite.nanite-plugin" version "0.1.0-SNAPSHOT"
 }
 
-def ENV = System.getenv()
+nanite {
+    changelog {
+        file = file("./CHANGELOG.md")
+    }
+}
 
 allprojects {
     apply plugin: 'idea'
     apply plugin: 'java-library'
     apply plugin: 'maven-publish'
 
-    version = "${mod_version}-build.${ENV.GITHUB_RUN_NUMBER ?: 9999}+mc${minecraft_version}"
+    version = naniteUtils.createModVersion()
     group = maven_group
 
     repositories {
         mavenLocal()
-        maven {
-            url = "https://jitpack.io"
-            content {
-                includeGroup "com.github.rtyley"
-                includeGroup "com.github.jagrosh"
-            }
-        }
-        maven {
-            url = "https://maven.latvian.dev/releases"
-            content {
-                includeGroup "dev.latvian.mods"
-                includeGroup "dev.latvian.apps"
-            }
-        }
         maven {
             url "https://maven.nanite.dev/releases"
             content {
                 includeGroup "dev.nanite.forks"
+                includeGroup "dev.nanite.mods"
             }
         }
-        maven {
-            url = "https://maven.shedaniel.me/"
-        }
     }
 
     tasks.withType(JavaCompile).configureEach {
@@ -57,7 +46,7 @@ allprojects {
 
 subprojects {
     base {
-        archivesName = rootProject.archives_base_name + project.name
+        archivesName = "${archives_base_name}-$project.name"
     }
 
     if (project.name != "common") {
@@ -73,13 +62,15 @@ subprojects {
     def replaceProperties = [
             mod_id: mod_id,
             minecraft_version: minecraft_version,
-            minecraft_version_range: minecraft_version_range,
+            minecraft_version_range_maven: minecraft_version_range_maven,
+            minecraft_version_range_semver: minecraft_version_range_semver,
             neoforge_version: neoforge_version,
             neoforge_version_range: neoforge_version_range,
             fabric_loader_version: fabric_loader_version,
             fabric_api_version: fabric_api_version,
-            cloth_config_version: cloth_config_version,
-            cloth_config_version_range: cloth_config_version_range,
+            fabric_api_version_range: fabric_api_version_range,
+            nanite_library_version_maven: nanite_library_version_maven,
+            nanite_library_version_semver: nanite_library_version_semver,
             version: version,
     ]
 
@@ -114,57 +105,59 @@ subprojects {
     }
 }
 
+tasks.named("publishMods") {
+    dependsOn tasks.named("createChangelog")
+}
+
 publishMods {
     dryRun = providers.environmentVariable("CURSE_TOKEN").getOrNull() == null
-    changelog = file("./CHANGELOG.md").text
-    version = "${mod_version}"
+    changelog = tasks.named("createChangelog").flatMap { it.outputFile }.map { it.asFile.text }
+    version = project.version
     type = STABLE
 
-    def fabricOptions = publishOptions {
-        file = project.provider { project(":fabric").tasks.jar }.flatMap { it.archiveFile }
-        displayName = "[FABRIC][${minecraft_version}] ${project.name} ${mod_version}"
-        modLoaders.add("fabric")
-    }
-
-    def neoforgeOptions = publishOptions {
-        file = project.provider { project(":neoforge").tasks.jar }.flatMap { it.archiveFile }
-        displayName = "[NEOFORGE][${minecraft_version}] ${project.name} ${mod_version}"
-        modLoaders.add("neoforge")
-    }
+    def createOptions = { String modLoader -> publishOptions {
+        file = project.provider { project(":${modLoader}").tasks.jar }.flatMap { it.archiveFile }
+        displayName = "SimpleDiscordRichPresense ${modLoader.capitalize()} ${project.version}"
+        modLoaders.add(modLoader)
+    }}
 
     def curseForgeOptions = curseforgeOptions {
         accessToken = providers.environmentVariable("CURSE_TOKEN")
         projectId = "${curseforge_id}"
-        minecraftVersions.add("${minecraft_version}")
+        supported_minecraft_versions.split(",").each {
+            minecraftVersions.add(it.trim())
+        }
     }
 
     def modrinthOptions = modrinthOptions {
         accessToken = providers.environmentVariable("MODRINTH_TOKEN")
         projectId = "${modrinth_id}"
-        minecraftVersions.add("${minecraft_version}")
+        supported_minecraft_versions.split(",").each {
+            minecraftVersions.add(it.trim())
+        }
     }
 
     curseforge("curseforgeFabric") {
-        from(curseForgeOptions, fabricOptions)
+        from(curseForgeOptions, createOptions("fabric"))
         requires("fabric-api")
-        requires("cloth-config")
+        requires("nanite-library")
     }
 
     curseforge("curseforgeNeoforge") {
-        from(curseForgeOptions, neoforgeOptions)
-        requires("cloth-config")
+        from(curseForgeOptions, createOptions("neoforge"))
+        requires("nanite-library")
     }
 
     if (providers.environmentVariable("MODRINTH_TOKEN").getOrNull() != null) {
         modrinth("modrinthFabric") {
             from(modrinthOptions, fabricOptions)
             requires("fabric-api")
-            requires("cloth-config")
+            requires("nanite-library")
         }
 
         modrinth("modrinthNeoforge") {
             from(modrinthOptions, neoforgeOptions)
-            requires("cloth-config")
+            requires("nanite-library")
         }
     }
 }

common/build.gradle

@@ -15,8 +15,7 @@ dependencies {
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
 
     compileOnly("dev.nanite.forks:discord-ipc:${ipc_version}")
-
-    compileOnly("me.shedaniel.cloth:cloth-config:${project.cloth_config_version}")
+    api("dev.nanite.mods:nanite-library-common:${nanite_library_version}")
 
     // Unit testing
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'

common/src/main/java/com/sunekaer/sdrp/SDRP.java

@@ -2,9 +2,7 @@
 
 import com.sunekaer.sdrp.config.SDRPConfig;
 import com.sunekaer.sdrp.discord.RPClient;
-import me.shedaniel.autoconfig.AutoConfig;
-import me.shedaniel.autoconfig.ConfigHolder;
-import me.shedaniel.autoconfig.serializer.JanksonConfigSerializer;
+import dev.nanite.library.core.config.ConfigManager;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.player.AbstractClientPlayer;
@@ -19,20 +17,20 @@ public class SDRP {
     public static RPClient RP_CLIENT;
     public static final OffsetDateTime START_TIME = OffsetDateTime.now();
 
-    public static SDRPConfig config;
-
     public static void init() {
-        ConfigHolder<SDRPConfig> register = AutoConfig.register(SDRPConfig.class, JanksonConfigSerializer::new);
-        config = register.getConfig();
+        ConfigManager.register(SDRPConfig.CONFIG);
+    }
+
 
+    public static void setup() {
         RP_CLIENT = new RPClient();
     }
 
     /**
      * Called by platform event handlers when a screen is initialized.
      */
     public static void onScreenInit(Screen screen) {
-        if (!config.enabled || !config.enableUpdateScreenPresence) {
+        if (!SDRPConfig.enabled.get() || !SDRPConfig.enableUpdateScreenPresence.get()) {
             return;
         }
 
@@ -41,7 +39,7 @@ public static void onScreenInit(Screen screen) {
 
     private static void updateScreen(Screen screen) {
         var screenClassName = screen.getClass().getName();
-        var screenPresence = config.screens.stream()
+        var screenPresence = SDRPConfig.screens.get().stream()
                 .filter(e -> e.screenClass.contains(screenClassName))
                 .findFirst();
 
@@ -60,7 +58,7 @@ private static void updateScreen(Screen screen) {
      * Called by platform event handlers when an entity is added to a level.
      */
     public static void onClientJoin(Entity entity, Level level) {
-        if (!config.enabled || !config.enableUpdateDimensionPresence) {
+        if (!SDRPConfig.enabled.get() || !SDRPConfig.enableUpdateDimensionPresence.get()) {
             return;
         }
 
@@ -77,7 +75,7 @@ public static void onClientJoin(Entity entity, Level level) {
     public static void setDimension(Level level, Player player) {
         var dimensionName = level.dimension().identifier().toString();
 
-        for (var entry : config.dimensionsSupport) {
+        for (var entry : SDRPConfig.dimensionsSupport.get()) {
             if (entry.matches(dimensionName)) {
                 var state = entry.createPresence(level.dimension().identifier(), player);
                 RP_CLIENT.setState(state);