feat: port to 26.1 YOLO

Author: Sunekaer

.github/workflows/build-release.yml

@@ -11,10 +11,10 @@ jobs:
       !contains(github.event.head_commit.message, '[ciskip]')
     uses: nanite/workflows/.github/workflows/standard-modmuss.yml@v1.1
     with:
-      java-version: 21
+      java-version: 25
       changelog-file: "./CHANGELOG.md"
       release-to-github: false
     secrets:
       nanite-token: ${{ secrets.NANITE_DEPLOY }}
       curse-token: ${{ secrets.CURSE_DEPLOY }}
-      modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+      modrinth-token: ${{ secrets.MODRINTH_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,3 @@
-## 98.0.1
+# Changelog
 
-### Fixed
-
-- The discord RPC should now shutdown properly when exiting the game.
+Ported to 26.1

build.gradle

@@ -1,52 +1,29 @@
 plugins {
-    id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.13-SNAPSHOT" apply false
+    id 'java-library'
+    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"
 }
 
-architectury {
-    minecraft = rootProject.minecraft_version
-}
-
-subprojects {
-    apply plugin: "dev.architectury.loom"
-
-    loom {
-        silentMojangMappingsLicense()
-    }
+def ENV = System.getenv()
 
-    dependencies {
-        minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-        mappings loom.officialMojangMappings()
-    }
-}
+version = "${mod_version}-build.${ENV.GITHUB_RUN_NUMBER ?: 9999}+mc${minecraft_version}"
+group = maven_group
 
 allprojects {
-    apply plugin: "java"
-    apply plugin: "architectury-plugin"
-    apply plugin: "maven-publish"
-
-    def ENV = System.getenv()
+    apply plugin: 'idea'
+    apply plugin: 'java-library'
+    apply plugin: 'maven-publish'
 
-    archivesBaseName = rootProject.archives_base_name + "-" + project.name
-    version = "${mod_version}-build.${ENV.GITHUB_RUN_NUMBER ?: 9999}+mc${minecraft_version}"
-    group = rootProject.maven_group
+    version = rootProject.version
 
     repositories {
         mavenLocal()
-        maven {
-            url = "https://maven.neoforged.net/releases"
-        }
         maven {
             url = "https://jitpack.io"
             content {
                 includeGroup "com.github.rtyley"
-            }
-        }
-        maven {
-            url = "https://maven.architectury.dev/"
-            content {
-                includeGroup "dev.architectury"
+                includeGroup "com.github.jagrosh"
             }
         }
         maven {
@@ -62,51 +39,20 @@ allprojects {
                 includeGroup "dev.nanite.forks"
             }
         }
-        maven { url 'https://jitpack.io'
-            content {
-                includeGroup "com.github.jagrosh"
-            }
-        }
         maven {
-            url "https://maven.blamejared.com"
-            content {
-                includeGroup "com.faux.ingredientextension"
-            }
+            url = "https://maven.shedaniel.me/"
         }
     }
 
-    tasks.withType(JavaCompile) {
-        options.encoding = "UTF-8"
-        options.release = 21
-    }
-
-    java {
-        withSourcesJar()
+    tasks.withType(JavaCompile).configureEach {
+        options.encoding = 'UTF-8'
+        options.release = 25
     }
 
-    processResources {
-        // Patch in vars for fabric.mod.json, neoforge.mods.toml, etc.
-        def map = [
-            version: project.version,
-            minecraft_version: project.minecraft_version,
-            minecraft_version_sem_range: project.minecraft_version_sem_range,
-            minecraft_version_mav_range: project.minecraft_version_mav_range,
-            architectury_version: project.architectury_version,
-            architectury_version_sem_range: project.architectury_version_sem_range,
-            architectury_version_mav_range: project.architectury_version_mav_range,
-            fabric_loader_version: project.fabric_loader_version,
-            fabric_api_version: project.fabric_api_version,
-            neoforge_version: project.neoforge_version,
-            neoforge_version_range: project.neoforge_version_range,
-            kubejs_version: project.kubejs_version,
-            cloth_config_version: project.cloth_config_version,
-            cloth_config_version_sem_range: project.cloth_config_version_sem_range,
-            cloth_config_version_mav_range: project.cloth_config_version_mav_range,
-        ]
-
-        inputs.properties(map)
-        filesMatching(["fabric.mod.json", "META-INF/neoforge.mods.toml"]) {
-            expand(map)
+    idea {
+        module {
+            downloadSources = true
+            downloadJavadoc = true
         }
     }
 
@@ -125,20 +71,57 @@ allprojects {
     }
 }
 
+subprojects {
+    base {
+        archivesName = "${archives_base_name}-$project.name"
+    }
+
+    if (project.name != "common") {
+        dependencies {
+            api project(":common")
+        }
+
+        jar {
+            from project(":common").sourceSets.main.output
+        }
+    }
+
+    def replaceProperties = [
+            mod_id: mod_id,
+            minecraft_version: minecraft_version,
+            minecraft_version_range: minecraft_version_range,
+            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,
+            version: version,
+    ]
+
+    processResources {
+        inputs.properties replaceProperties
+
+        filesMatching(["META-INF/neoforge.mods.toml", "fabric.mod.json"]) {
+            expand replaceProperties
+        }
+    }
+}
+
 publishMods {
     dryRun = providers.environmentVariable("CURSE_TOKEN").getOrNull() == null
     changelog = file("./CHANGELOG.md").text
     version = "${mod_version}"
     type = STABLE
 
     def fabricOptions = publishOptions {
-        file = project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
+        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.remapJar }.flatMap { it.archiveFile }
+        file = project.provider { project(":neoforge").tasks.jar }.flatMap { it.archiveFile }
         displayName = "[NEOFORGE][${minecraft_version}] ${project.name} ${mod_version}"
         modLoaders.add("neoforge")
     }
@@ -157,78 +140,25 @@ publishMods {
 
     curseforge("curseforgeFabric") {
         from(curseForgeOptions, fabricOptions)
-        requires {
-            slug = "fabric-api"
-        }
-        requires {
-            slug = "cloth-config"
-        }
-        requires {
-            slug = "architectury-api"
-        }
+        requires("fabric-api")
+        requires("cloth-config")
     }
 
     curseforge("curseforgeNeoforge") {
         from(curseForgeOptions, neoforgeOptions)
-        requires {
-            slug = "cloth-config"
-        }
-        requires {
-            slug = "architectury-api"
-        }
+        requires("cloth-config")
     }
 
     if (providers.environmentVariable("MODRINTH_TOKEN").getOrNull() != null) {
         modrinth("modrinthFabric") {
             from(modrinthOptions, fabricOptions)
-            requires {
-                slug = "fabric-api"
-            }
-            requires {
-
-                slug = "cloth-config"
-            }
-            requires {
-                slug = "architectury-api"
-            }
+            requires("fabric-api")
+            requires("cloth-config")
         }
 
         modrinth("modrinthNeoforge") {
             from(modrinthOptions, neoforgeOptions)
-            requires {
-                slug = "cloth-config"
-            }
-            requires {
-                slug = "architectury-api"
-            }
+            requires("cloth-config")
         }
     }
 }
-
-tasks.register("getMinecraftIncrementalId") {
-    group = "other"
-
-    doLast {
-        // Load the versions data
-        def url = "https://launchermeta.mojang.com/mc/game/version_manifest_v2.json"
-        def json = new groovy.json.JsonSlurper().parseText(url.toURL().text)
-        def versions = json.versions
-
-        // Reverse the list so the oldest version is first
-        versions = versions.reverse()
-
-        def currentNumber = 0;
-        for (version in versions) {
-            if (version.type != "release") {
-                continue
-            }
-
-            currentNumber++
-            if (version.id == rootProject.minecraft_version) {
-                break
-            }
-        }
-
-        println("Minecraft incremental ID: ${currentNumber}")
-    }
-}

common/build.gradle

@@ -1,27 +1,22 @@
-architectury {
-    common(rootProject.enabled_platforms.split(","))
+plugins {
+    id 'net.fabricmc.fabric-loom'
 }
 
 loom {
-    accessWidenerPath = file("src/main/resources/sdrp.accesswidener")
-}
-
-configurations {
-    shadowCommon
+    // accessWidenerPath = file("src/main/resources/sdrp.accesswidener")
 }
 
 repositories {
 }
 
 dependencies {
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
 
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
 
     compileOnly("dev.nanite.forks:discord-ipc:${ipc_version}")
 
-    modApi("me.shedaniel.cloth:cloth-config:${rootProject.cloth_config_version}")
-    modApi "dev.architectury:architectury:${rootProject.architectury_version}"
+    compileOnly("me.shedaniel.cloth:cloth-config:${project.cloth_config_version}")
 
     // Unit testing
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
@@ -31,15 +26,3 @@ dependencies {
 test {
     useJUnitPlatform()
 }
-
-def ENV = System.getenv()
-
-publishing {
-    publications {
-        mavenCommon(MavenPublication) {
-            artifactId = rootProject.archives_base_name + "-" + project.name
-            from components.java
-        }
-    }
-}
-

common/gradle.properties

@@ -0,0 +1 @@
+fabric.loom.dontRemap=true

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

@@ -2,10 +2,6 @@
 
 import com.sunekaer.sdrp.config.SDRPConfig;
 import com.sunekaer.sdrp.discord.RPClient;
-import dev.architectury.event.EventResult;
-import dev.architectury.event.events.client.ClientGuiEvent;
-import dev.architectury.event.events.common.EntityEvent;
-import dev.architectury.hooks.client.screen.ScreenAccess;
 import me.shedaniel.autoconfig.AutoConfig;
 import me.shedaniel.autoconfig.ConfigHolder;
 import me.shedaniel.autoconfig.serializer.JanksonConfigSerializer;
@@ -30,15 +26,12 @@ public static void init() {
         config = register.getConfig();
 
         RP_CLIENT = new RPClient();
-
-        EntityEvent.ADD.register(SDRP::clientJoinEvent);
-        ClientGuiEvent.INIT_POST.register(SDRP::screenEvent);
     }
 
     /**
-     * When the screen is part of the main menu screens, attempt to update discord about it
+     * Called by platform event handlers when a screen is initialized.
      */
-    private static void screenEvent(Screen screen, ScreenAccess screenAccess) {
+    public static void onScreenInit(Screen screen) {
         if (!config.enabled || !config.enableUpdateScreenPresence) {
             return;
         }
@@ -64,20 +57,18 @@ private static void updateScreen(Screen screen) {
     }
 
     /**
-     * When the client joins, send out a setDim event to discord
+     * Called by platform event handlers when an entity is added to a level.
      */
-    private static EventResult clientJoinEvent(Entity entity, Level level) {
+    public static void onClientJoin(Entity entity, Level level) {
         if (!config.enabled || !config.enableUpdateDimensionPresence) {
-            return EventResult.pass();
+            return;
         }
 
         if (entity instanceof AbstractClientPlayer) {
             if (entity.getUUID().equals(Minecraft.getInstance().player.getUUID())){
                 setDimension(level, (Player) entity);
             }
         }
-
-        return EventResult.pass();
     }
 
     /**