feat: toolchain update

Author: MichaelHillcox

build.gradle

@@ -9,25 +9,23 @@ tasks.named('wrapper', Wrapper).configure {
     distributionType = Wrapper.DistributionType.BIN
 }
 
-apply from: 'https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/changelog.gradle'
+apply from: 'https://raw.githubusercontent.com/FTBTeam/mods-meta/v1/gradle/maven.gradle'
+apply from: 'https://raw.githubusercontent.com/FTBTeam/mods-meta/v1/gradle/publishing-2.gradle'
+apply from: 'https://raw.githubusercontent.com/FTBTeam/mods-meta/v1/gradle/utils.gradle'
+apply from: 'https://raw.githubusercontent.com/FTBTeam/mods-meta/v1/gradle/changelog.gradle'
 
 allprojects {
     apply plugin: 'idea'
     apply plugin: 'java-library'
     apply plugin: 'maven-publish'
 
-    apply from: "https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/git-md-changelog.gradle"
-
-    version = project.mod_version
+    version = createModVersion(project)
     group = project.maven_group
 
     base {
-        archivesName = "${project.archives_base_name}-${project.name}"
+        archivesName = project.archives_base_name
     }
 
-    // needs to be done AFTER version is set
-    apply from: "https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/publishing.gradle"
-
     tasks.withType(JavaCompile).configureEach {
         options.encoding = 'UTF-8'
         options.release = 25
@@ -40,20 +38,6 @@ allprojects {
     java {
         withSourcesJar()
     }
-
-    publishing {
-        repositories {
-            if (ftbPublishing.ftbToken) {
-                maven {
-                    url ftbPublishing.ftbURL
-                    credentials {
-                        username = ftbPublishing.ftbUser
-                        password = ftbPublishing.ftbToken
-                    }
-                }
-            }
-        }
-    }
 }
 
 subprojects {
@@ -70,6 +54,7 @@ subprojects {
     repositories {
         mavenCentral()
         mavenLocal()
+        commonMavenRepos(repositories)
 
         maven {
             url "https://maven.fabricmc.net/"
@@ -79,54 +64,26 @@ subprojects {
             }
         }
 
-        maven {
-            url "https://www.cursemaven.com"
-            content {
-                includeGroup "curse.maven"
-            }
-        }
-
         maven {
             name "ModMaven (JEI)"
             url "https://modmaven.dev/"
             content {
                 includeGroup "mezz.jei"
             }
         }
-
-        maven {
-            // Emi
-            name = "TerraformersMC"
-            url = "https://maven.terraformersmc.com/"
-        }
     }
 
     processResources {
         exclude '.cache'
 
         inputs.property "version", project.version
 
-        // TODO: Fabric is working on resolving this: https://github.com/FabricMC/fabric-loader/pull/1101
-        def fixedMcVersion = project.minecraft_version
-        if (fixedMcVersion.contains("-") && project.name == "fabric") {
-            def hyphenParts = fixedMcVersion.split("-")
-            fixedMcVersion = ""
-            for (int i = 0; i < hyphenParts.size(); i++) {
-                if (i < 2) {
-                    fixedMcVersion = fixedMcVersion + (i > 0 ? "-" : "") + hyphenParts[i]
-                } else {
-                    fixedMcVersion = fixedMcVersion + "." + hyphenParts[i]
-                }
-            }
-        }
-
         filesMatching(["META-INF/neoforge.mods.toml", "fabric.mod.json"]) {
             expand "version": project.version,
                     "neoforgeversionrange": project.neoforge_version_range,
                     "neoforgeloaderversion": project.neoforge_loader_version,
                     "minecraft_version_range_maven": minecraft_version_range_maven,
                     "minecraft_version_range_semver": minecraft_version_range_semver,
-                    "mcversion": fixedMcVersion,
                     "fabricapiversionrange": project.fabric_api_version_range
         }
     }
@@ -139,19 +96,18 @@ idea {
     }
 }
 
+createMavenPublishingBlock(project)
+
 publishMods {
     dryRun = providers.environmentVariable("CURSEFORGE_KEY").getOrNull() == null
     changelog = createChangelog(project)
     version = mod_version
-
-    // TODO: Migrate to something else
-    def tag = providers.environmentVariable("TAG").getOrElse("release")
-    type = tag.endsWith("-beta") ? BETA : (tag.endsWith("-alpha") ? ALPHA : STABLE)
+    type = createReleaseType(project)
 
     def createOptions = (String projectName) -> {
         publishOptions {
             file = project.provider { project(":$projectName").tasks.jar }.flatMap { it.archiveFile }
-            displayName = "[${projectName.toUpperCase()}][${minecraft_version}] ${readable_name} ${mod_version}"
+            displayName = "${readable_name} ${projectName.capitalize()} ${mod_version}"
             modLoaders.add(projectName.toLowerCase())
         }
     }
@@ -161,7 +117,9 @@ publishMods {
 
     def curseForgeOptions = curseforgeOptions {
         accessToken = providers.environmentVariable("CURSEFORGE_KEY")
-        minecraftVersions.add("${minecraft_version}")
+        supported_minecraft_versions.split(",").each {
+            minecraftVersions.add(it.trim())
+        }
         javaVersions.add(JavaVersion.VERSION_25)
     }
 
@@ -170,13 +128,11 @@ publishMods {
         projectId = curseforge_id_fabric
         requires('fabric-api')
         optional('jei')
-        optional('roughly-enough-items')
     }
 
     curseforge("curseforgeNeoForge") {
         from(curseForgeOptions, neoForgeOptions)
         projectId = curseforge_id_forge
         optional('jei')
-        optional('roughly-enough-items')
     }
 }

common/build.gradle

@@ -16,33 +16,15 @@ dependencies {
     compileOnly group: 'net.fabricmc', name: 'sponge-mixin', version: '0.17.0+mixin.0.8.7'
     compileOnly "io.github.llamalad7:mixinextras-fabric:0.5.0"
 
-//    modCompileOnly("me.shedaniel:RoughlyEnoughItems-api:${rootProject.rei_version}") {
-//    }
-
-//    modCompileOnly("me.shedaniel:RoughlyEnoughItems-default-plugin:${rootProject.rei_version}") {
-//    }
-
-    compileOnly("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")
     compileOnly("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")
 
     api("de.marhali:json5-java:${json5_version}")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.0'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-//    modCompileOnly "dev.emi:emi-xplat-intermediary:${emi_version}+1.21.1:api"
 }
 
 test {
     useJUnitPlatform()
 }
-
-publishing {
-    publications {
-        mavenCommon(MavenPublication) {
-            artifactId = "${rootProject.archives_base_name}"
-            version ftbPublishing.mavenVersion
-            from components.java
-        }
-    }
-}

common/gradle.properties

@@ -37,13 +37,3 @@ dependencies {
 
     include(api("de.marhali:json5-java:${json5_version}"))
 }
-
-publishing {
-    publications {
-        mavenFabric(MavenPublication) {
-            artifactId = "${rootProject.archives_base_name}-${project.name}"
-            version ftbPublishing.mavenVersion
-            from components.java
-        }
-    }
-}

fabric/build.gradle

@@ -1,17 +1,22 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
+
 # Mod
 mod_id=ftblibrary
 readable_name=FTB Library
-mod_version=26.1.1.1
+mod_version=1
 mod_author=FTB Team
+
 # Maven
 archives_base_name=ftb-library
 maven_group=dev.ftb.mods
+
 # MC
 minecraft_version=26.1.1
+supported_minecraft_versions=26.1,26.1.1,26.1.2
 minecraft_version_range_maven=[26.1,27)
 minecraft_version_range_semver=>=26.1.0
+
 # Deps
 neoforge_version=26.1.1.10-beta
 neoforge_version_range=[26.1.0.0-beta,27)
@@ -21,11 +26,8 @@ fabric_loader_version=0.18.6
 fabric_api_version=0.145.4+26.1.1
 fabric_api_version_range=>=0.145.0+26.1.1
 
-# There are too many of these now
-#rei_version=20.0.811
 jei_version=29.4.0.23
-#emi_version=1.1.20
-# mod_menu_version=1.14.6+
+
 json5_version=3.0.0
 
 curseforge_id_forge=404465

gradle.properties

@@ -64,13 +64,3 @@ jar {
         ])
     }
 }
-
-publishing {
-    publications {
-        mavenForge(MavenPublication) {
-            artifactId = "${rootProject.archives_base_name}-${project.name}"
-            version ftbPublishing.mavenVersion
-            from components.java
-        }
-    }
-}