Port to 1.21.1 Neoforge

.gitignore

@@ -21,3 +21,5 @@ build
 eclipse
 run
 libs
+
+src/generated/**/.cache/

build.gradle.kts

@@ -1,201 +1,187 @@
-import com.matthewprenger.cursegradle.CurseArtifact
-import com.matthewprenger.cursegradle.CurseExtension
-import com.matthewprenger.cursegradle.CurseProject
-import com.matthewprenger.cursegradle.CurseRelation
-import net.minecraftforge.gradle.common.util.RunConfig
-import java.time.Instant
-import java.time.format.DateTimeFormatter
-
-fun property(key: String) = project.findProperty(key).toString()
-
-apply(from = "https://gist.githubusercontent.com/Harleyoc1/4d23d4e991e868d98d548ac55832381e/raw/applesiliconfg.gradle")
+import me.modmuss50.mpp.ReleaseType
+import org.gradle.api.publish.maven.MavenPublication
 
 plugins {
-    id("java")
-    id("net.minecraftforge.gradle")
-    id("org.parchmentmc.librarian.forgegradle")
-    id("idea")
+    id("java-library")
     id("maven-publish")
-    id("com.matthewprenger.cursegradle") version "1.4.0"
-    id("com.modrinth.minotaur") version "2.+"
-    id("com.harleyoconnor.autoupdatetool") version "1.0.7"
+    id("net.neoforged.moddev") version "2.0.143"
+    id("me.modmuss50.mod-publish-plugin") version "2.+"
 }
 
-repositories {
-    maven("https://ldtteam.jfrog.io/ldtteam/modding/")
-    maven("https://www.cursemaven.com") {
-        content {
-            includeGroup("curse.maven")
-        }
-    }
-    maven("https://harleyoconnor.com/maven")
-    maven("https://squiddev.cc/maven/")
-    mavenLocal()
-    flatDir {
-        dirs("libs")
-    }
+val mcVersion = providers.gradleProperty("mcVersion")
+val neoVersion = providers.gradleProperty("neoVersion")
+val modName = providers.gradleProperty("modName")
+val modId = providers.gradleProperty("modId")
+val modVersion = providers.gradleProperty("modVersion")
+val modGroup = providers.gradleProperty("group")
+val dynamicTreesVersion = providers.gradleProperty("dynamicTreesVersion")
+val dynamicTreesPlusVersion = providers.gradleProperty("dynamicTreesPlusVersion")
+val dynamicTreesAddonLibVersion = providers.gradleProperty("dynamicTreesAddonLibVersion")
+val ecologicsVersion = providers.gradleProperty("ecologicsVersion")
+val versionType = providers.gradleProperty("versionType")
+val curseProjectId = providers.gradleProperty("curseProjectId")
+val rinthProjectId = providers.gradleProperty("rinthProjectId")
+
+version = "${mcVersion.get()}-${modVersion.get()}"
+group = modGroup.get()
+
+base {
+    archivesName.set(modName)
 }
 
-val modName = property("modName")
-val modId = property("modId")
-val modVersion = property("modVersion")
-val mcVersion = property("mcVersion")
+java {
+    withSourcesJar()
 
-version = "$mcVersion-$modVersion"
-group = property("group")
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
+}
 
-minecraft {
-    mappings("parchment", "${property("mappingsVersion")}-$mcVersion")
+neoForge {
+    version = neoVersion.get()
 
     runs {
         create("client") {
-            applyDefaultConfiguration()
-
-            if (project.hasProperty("mcUuid")) {
-                args("--uuid", property("mcUuid"))
-            }
-            if (project.hasProperty("mcUsername")) {
-                args("--username", property("mcUsername"))
-            }
-            if (project.hasProperty("mcAccessToken")) {
-                args("--accessToken", property("mcAccessToken"))
-            }
+            client()
         }
 
         create("server") {
-            applyDefaultConfiguration("run-server")
+            server()
         }
 
         create("data") {
-            applyDefaultConfiguration()
+            data()
 
-            args(
-                "--mod", modId,
+            programArguments.addAll(
                 "--all",
-                "--output", file("src/generated/resources/"),
-                "--existing", file("src/main/resources"),
+                "--existing", file("src/main/resources").absolutePath,
+                "--output", file("src/generated/resources/").absolutePath,
+                "--mod", modId.get(),
                 "--existing-mod", "dynamictrees",
                 "--existing-mod", "dynamictreesplus",
                 "--existing-mod", "ecologics"
             )
         }
     }
-}
 
-sourceSets.main.get().resources {
-    srcDir("src/generated/resources")
-}
+    mods {
+        create(modId.get()) {
+            sourceSet(sourceSets.main.get())
+        }
+    }
 
-dependencies {
-    // Forge
-    minecraft("net.minecraftforge:forge:$mcVersion-${property("forgeVersion")}")
-
-    // DynamicTrees
-    implementation(fg.deobf("com.ferreusveritas.dynamictrees:DynamicTrees-$mcVersion:${property("dynamicTreesVersion")}"))
-    implementation(fg.deobf("com.ferreusveritas.dynamictreesplus:DynamicTreesPlus-$mcVersion:${property("dynamicTreesPlusVersion")}"))
-    implementation(fg.deobf("curse.maven:dynamic-trees-addon-lib-1404692:8289347"))
-
-    // DynmaicTrees Tools/Utilities
-    runtimeOnly(fg.deobf("curse.maven:jade-324717:5072729"))
-    runtimeOnly(fg.deobf("curse.maven:jei-238222:5101366"))
-    runtimeOnly(fg.deobf("curse.maven:cc-tweaked-282001:5118388"))
-    runtimeOnly(fg.deobf("curse.maven:suggestion-provider-fix-469647:4591193"))
-    runtimeOnly(fg.deobf("vazkii.patchouli:Patchouli:${property("patchouliVersion")}"))
-
-    //Other
-    implementation(fg.deobf("curse.maven:ecologics-570463:4857272"))
+    parchment {
+        minecraftVersion.set(mcVersion)
+    }
 }
 
-tasks.jar {
-    manifest.attributes(
-        "Specification-Title" to project.name,
-        "Specification-Vendor" to "Max Hyper",
-        "Specification-Version" to "1",
-        "Implementation-Title" to project.name,
-        "Implementation-Version" to project.version,
-        "Implementation-Vendor" to "Max Hyper",
-        "Implementation-Timestamp" to DateTimeFormatter.ISO_INSTANT.format(Instant.now())
-    )
-
-    archiveBaseName.set(modName)
-    finalizedBy("reobfJar")
+sourceSets {
+    main {
+        resources {
+            srcDir("src/generated/resources")
+        }
+    }
 }
 
-java {
-    withSourcesJar()
-
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+repositories {
+    maven("https://ldtteam.jfrog.io/ldtteam/modding/")
+    exclusiveContent {
+        forRepository {
+            maven("https://api.modrinth.com/maven") {
+                name = "Modrinth"
+            }
+        }
+        filter {
+            includeGroup("maven.modrinth")
+        }
+    }
+    maven("https://www.cursemaven.com") {
+        content {
+            includeGroup("curse.maven")
+        }
     }
+    flatDir {
+        dir("libs")
+    }
+    mavenLocal()
 }
 
-curseforge {
-    if (project.hasProperty("curseApiKey") && project.hasProperty("curseFileType")) {
-        apiKey = property("curseApiKey")
+dependencies {
+    implementation("com.dtteam.dynamictrees:dynamictrees-neoforge-${mcVersion.get()}:${dynamicTreesVersion.get()}")
+    implementation("com.dtteam.dynamictreesplus:DynamicTreesPlus:${dynamicTreesPlusVersion.get()}")
+    implementation("maven.modrinth:dynamic-trees-addon-lib:${dynamicTreesAddonLibVersion.get()}")
 
-        project {
-            id = property("curseProjectId")
+    implementation("maven.modrinth:ecologics:${ecologicsVersion.get()}-NeoForge")
+}
 
-            addGameVersion(mcVersion)
+tasks.processResources {
+    val replaceProperties = mapOf(
+        "mcVersion" to mcVersion,
+        "neoVersion" to neoVersion,
+        "modId" to modId,
+        "modVersion" to modVersion,
+        "dynamicTreesVersion" to dynamicTreesVersion,
+        "dynamicTreesPlusVersion" to dynamicTreesPlusVersion,
+        "dynamicTreesAddonLibVersion" to dynamicTreesAddonLibVersion,
+        "ecologicsVersion" to ecologicsVersion
+    )
 
-            changelog = file("build/changelog.txt")
-            changelogType = "markdown"
-            releaseType = property("curseFileType")
+    inputs.properties(replaceProperties)
 
-            addArtifact(tasks.findByName("sourcesJar"))
+    filteringCharset = "UTF-8"
 
-            mainArtifact(tasks.findByName("jar")) {
-                relations {
-                    requiredDependency("dynamictrees")
-                    optionalDependency("dynamictreesplus")
-                    requiredDependency("ecologics")
-                }
-            }
-        }
-    } else {
-        project.logger.log(LogLevel.WARN, "API Key and file type for CurseForge not detected; uploading will be disabled.")
+    filesMatching("META-INF/neoforge.mods.toml") {
+        expand(replaceProperties.mapValues { it.value.get() })
     }
 }
 
-tasks.withType<GenerateModuleMetadata> {
-    enabled = false
+tasks.withType<JavaCompile>().configureEach {
+    options.encoding = "UTF-8"
+}
+
+tasks.jar {
+    from("LICENSE")
 }
 
 publishing {
     publications {
-        create<MavenPublication>("mavenJava") {
+        register<MavenPublication>("mavenJava") {
             from(components["java"])
         }
     }
     repositories {
-        maven("file:///${project.projectDir}/mcmodsrepo")
+        maven("file://${project.projectDir}/repo")
     }
 }
 
-fun RunConfig.applyDefaultConfiguration(runDirectory: String = "run") {
-    workingDirectory = file(runDirectory).absolutePath
-
-    property("forge.logging.markers", "SCAN,REGISTRIES,REGISTRYDUMP")
-    property("forge.logging.console.level", "debug")
-
-    property("mixin.env.remapRefMap", "true")
-    property("mixin.env.refMapRemappingFile", "${buildDir}/createSrgToMcp/output.srg")
-
-    mods {
-        create(modId) {
-            source(sourceSets.main.get())
-        }
+publishMods {
+    file.set(tasks.jar.flatMap { it.archiveFile })
+    additionalFiles.from(tasks.named("sourcesJar"))
+    displayName.set("${modName.get()}-NeoForge-${project.version}")
+    val changelogFile = file("build/changelog.md")
+    if (changelogFile.exists()) {
+        changelog.set(changelogFile.readText())
+    }
+    type.set(versionType.map(String::uppercase).map(ReleaseType::of))
+    modLoaders.add("neoforge")
+
+    curseforge {
+        projectId.set(curseProjectId)
+        projectSlug.set("dynamic-trees-ecologics")
+        accessToken.set(System.getenv("CURSEFORGE_API_KEY"))
+        minecraftVersions.add(mcVersion)
+        requires("dynamictrees")
+        optional("dynamictreesplus")
+        requires("dynamic-trees-addon-lib")
+        requires("ecologics")
+    }
+    modrinth {
+        projectId.set(rinthProjectId)
+        accessToken.set(System.getenv("MODRINTH_TOKEN"))
+        minecraftVersions.add(mcVersion)
+        requires("vdjF5PL5") //dt
+        optional("qaO9Dqpu") //dt+
+        requires("ju42L8G7") //dynamic-trees-addon-lib
+        requires("NCKpPR0Z") //ecologics
     }
-}
-
-fun CurseExtension.project(action: CurseProject.() -> Unit) {
-    this.project(closureOf(action))
-}
-
-fun CurseProject.mainArtifact(artifact: Task?, action: CurseArtifact.() -> Unit) {
-    this.mainArtifact(artifact, closureOf(action))
-}
-
-fun CurseArtifact.relations(action: CurseRelation.() -> Unit) {
-    this.relations(closureOf(action))
 }

gradle.properties

@@ -1,20 +1,22 @@
+org.gradle.jvmargs=-Xmx2G
+org.gradle.daemon=true
+org.gradle.parallel=true
+org.gradle.caching=true
+org.gradle.configuration-cache=true
+
+mcVersion=1.21.1
+neoVersion=21.1.248
+neoForge.parchment.mappingsVersion=2024.11.17
 modName=DynamicTreesEcologics
 modId=dtecologics
 modVersion=1.1.1
 group=com.maxhyper.dtecologics
 
-mcVersion=1.20.1
-forgeVersion=47.4.3
-mappingsVersion=2023.09.03
-
-dynamicTreesVersion=1.4.10
-dynamicTreesPlusVersion=1.2.2
-patchouliVersion=1.20.1-84-FORGE
-ccVersion=1.111.0
-suggestionProviderFixVersion=1.0.0
+dynamicTreesVersion=1.7.2
+dynamicTreesPlusVersion=1.3.2
+dynamicTreesAddonLibVersion=0.2.0-BETA03
+ecologicsVersion=2.3.7
 
-curseFileType=release
+versionType=release
 curseProjectId=871323
-
-org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false
+rinthProjectId=2H9XSQjq