feat: port to 1.21 and dropped forge

.gitignore

@@ -16,4 +16,6 @@ classes/
 .metadata
 .vscode
 .settings
-*.launch
+*.launch
+
+.DS_Store

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [21.0.0]
+
+### Changed
+
+- Ported to 1.21
+- Switched to using the `Neoforge` version scheme meaning we've switched from 86.0.0 to 21.0.0... Sorry for the confusion... I don't like it either.
+
 ## [86.0.0]
 
 ### Changed

build.gradle

@@ -1,7 +1,8 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
     id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
-    id "me.modmuss50.mod-publish-plugin" version "0.4.5"
+    id "me.modmuss50.mod-publish-plugin" version "0.5.1"
+    id 'pro.mikey.plugins.insaniam' version "0.1-SNAPSHOT"
 }
 
 architectury {
@@ -29,9 +30,6 @@ allprojects {
     apply plugin: "architectury-plugin"
     apply plugin: "maven-publish"
 
-    def ENV = System.getenv()
-    ext.ENV = ENV
-
     archivesBaseName = rootProject.archives_base_name
     version = rootProject.mod_version
     group = rootProject.maven_group
@@ -55,40 +53,42 @@ allprojects {
 
     publishing {
         repositories {
-            if (ENV.NANITE_TOKEN) {
+            def naniteToken = providers.environmentVariable("NANITE_TOKEN")
+            if (naniteToken.isPresent()) {
                 maven {
                     url "https://maven.nanite.dev/releases"
                     credentials {
                         username = "nanite"
-                        password = "${ENV.NANITE_TOKEN}"
+                        password = naniteToken.get()
                     }
                 }
             }
         }
     }
 }
 
+def changelogData = insaniamUtils.createChangelog {
+    file = file('CHANGELOG.md')
+    versionPattern = ~/## \[[^]]+]/
+    fallbackValue = "No changelog provided"
+    version = project.mod_version
+}
+
 publishMods {
     dryRun = providers.environmentVariable("CURSE_TOKEN").getOrNull() == null
-    changelog = file("./CHANGELOG.md").text
+    changelog = changelogData
     version = "${mod_version}"
     type = STABLE
 
     def fabricOptions = publishOptions {
         file = project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
-        displayName = "[FABRIC][${minecraft_version}] Default Server Properties ${mod_version}"
+        displayName = "[FABRIC] Default Server Properties ${mod_version}"
         modLoaders.add("fabric")
     }
 
-//    def forgeOptions = publishOptions {
-//        file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
-//        displayName = "[FORGE][${minecraft_version}] Default Server Properties ${mod_version}"
-//        modLoaders.add("forge")
-//    }
-
     def neoForge = publishOptions {
         file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
-        displayName = "[NEOFORGE][${minecraft_version}] Default Server Properties ${mod_version}"
+        displayName = "[NEOFORGE] Default Server Properties ${mod_version}"
         modLoaders.add("neoforge")
     }
 
@@ -111,10 +111,6 @@ publishMods {
         }
     }
 
-//    curseforge("curseforgeForge") {
-//        from(curseForgeOptions, forgeOptions)
-//    }
-
     curseforge("curseforgeNeoForge") {
         from(curseForgeOptions, neoForge)
     }
@@ -126,16 +122,11 @@ publishMods {
         }
     }
 
-//    modrinth("modrinthForge") {
-//        from(modrinthOptions, forgeOptions)
-//    }
-
     modrinth("modrinthNeoforge") {
         from(modrinthOptions, neoForge)
     }
 
     github {
-//        file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
         file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
         additionalFiles.from project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
 

common/build.gradle

@@ -17,16 +17,4 @@ publishing {
             from components.java
         }
     }
-
-    repositories {
-        if (ENV.NANITE_TOKEN) {
-            maven {
-                url "https://maven.nanite.dev/releases"
-                credentials {
-                    username = "nanite"
-                    password = "${ENV.NANITE_TOKEN}"
-                }
-            }
-        }
-    }
 }

gradle.properties

@@ -1,18 +1,16 @@
 org.gradle.jvmargs=-Xmx2048M
 
-minecraft_version=1.20.6
-#enabled_platforms=fabric,forge,neoforge
+minecraft_version=1.21
 enabled_platforms=fabric,neoforge
 
 archives_base_name=default-server-properties
-mod_version=86.0.0
+mod_version=21.0.0
 maven_group=dev.nanite.mods
 
 fabric_loader_version=0.15.11
-fabric_api_version=0.100.0+1.20.6
+fabric_api_version=0.100.1+1.21
 
-#forge_version=49.0.12
-neo_forge=20.6.113-beta
+neoforge_version=21.0.10-beta
 
 curseforge_id=676811
 modrinth_id=Fnrzx9Jl

neoforge/build.gradle

@@ -29,7 +29,7 @@ configurations {
 }
 
 dependencies {
-    neoForge "net.neoforged:neoforge:${rootProject.neo_forge}"
+    neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}"
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive = false }

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -17,14 +17,14 @@ displayTest="IGNORE_ALL_VERSION"
 [[dependencies.dsp]]
 modId = "neoforge"
 required = true
-versionRange = "[20.6,)"
+versionRange = "[21.0,)"
 ordering = "NONE"
 side = "SERVER"
 
 [[dependencies.dsp]]
 modId = "minecraft"
 required = true
-versionRange = "[1.20.6,)"
+versionRange = "[1.21,)"
 ordering = "NONE"
 side = "SERVER"
 

settings.gradle

@@ -4,6 +4,8 @@ pluginManagement {
         maven { url "https://maven.architectury.dev/" }
         maven { url "https://maven.minecraftforge.net/" }
         maven { url "https://maven.neoforged.net/releases" }
+        maven { url "https://maven.saps.dev/releases" }
+        maven { url "https://maven.saps.dev/snapshots" }
         gradlePluginPortal()
     }
 }