Update Gradle and port 1.21.4

build.gradle.kts

@@ -3,7 +3,8 @@ import net.fabricmc.loom.api.LoomGradleExtensionAPI
 plugins {
     java
     id("architectury-plugin") version "3.4-SNAPSHOT"
-    id("dev.architectury.loom") version "1.6-SNAPSHOT" apply false
+    id("dev.architectury.loom") version "1.7-SNAPSHOT" apply false
+    id("com.gradleup.shadow") version "8.3.5" apply false
 }
 
 val minecraftVersion: String by extra
@@ -15,6 +16,7 @@ architectury {
 
 subprojects {
     apply(plugin = "dev.architectury.loom")
+    apply(plugin = "com.gradleup.shadow")
 
     base {
         archivesName.set("timestacker-" + project.name)
@@ -39,9 +41,13 @@ allprojects {
 
     tasks.withType<JavaCompile> {
         options.encoding = "UTF-8"
+        options.release.set(21)
     }
 
     java {
         withSourcesJar()
+
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 }

common/build.gradle.kts

@@ -1,14 +1,9 @@
 val fabricLoaderVersion: String by extra
 
-dependencies {
-    modImplementation("net.fabricmc:fabric-loader:$fabricLoaderVersion")
-}
-
-loom {
-    @Suppress("UnstableApiUsage")
-    mixin.defaultRefmapName.set("timestacker-common.refmap.json")
+architectury {
+    common("fabric", "neoforge")
 }
 
-architectury {
-    common("fabric", /*"forge",*/ "neoforge")
+dependencies {
+    modImplementation("net.fabricmc:fabric-loader:$fabricLoaderVersion")
 }

fabric/build.gradle.kts

@@ -1,12 +1,5 @@
-@file:Suppress("DEPRECATION", "HasPlatformType")
-
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import net.fabricmc.loom.task.RemapJarTask
-import org.gradle.api.component.AdhocComponentWithVariants
-
-plugins {
-    id("com.github.johnrengelman.shadow") version "7.1.2"
-}
 
 architectury {
     platformSetupLoomIde()
@@ -18,8 +11,8 @@ val fabricLoaderVersion: String by extra
 val fabricMinecraftVersionRange: String by extra
 val modVersion: String by extra
 
-val common by configurations.creating
-val shadowCommon by configurations.creating
+val common: Configuration by configurations.creating
+val shadowCommon: Configuration by configurations.creating
 
 configurations["compileClasspath"].extendsFrom(common)
 configurations["runtimeClasspath"].extendsFrom(common)
@@ -49,23 +42,5 @@ tasks.withType<ShadowJar> {
 
 tasks.withType<RemapJarTask> {
     val shadowTask = tasks.shadowJar.get()
-    input.set(shadowTask.archiveFile)
-    dependsOn(shadowTask)
-    archiveClassifier.set("")
-}
-
-tasks.jar {
-    archiveClassifier.set("dev")
-}
-
-tasks.sourcesJar {
-    val commonSources = project(":common").tasks.sourcesJar.get()
-    dependsOn(commonSources)
-    from(commonSources.archiveFile.map { zipTree(it) })
-}
-
-components.getByName<AdhocComponentWithVariants>("java").apply {
-    withVariantsFromConfiguration(project.configurations["shadowRuntimeElements"]) {
-        skip()
-    }
+    inputFile.set(shadowTask.archiveFile)
 }

gradle.properties

@@ -5,13 +5,13 @@ org.gradle.daemon=false
 modVersion=1.2.1
 
 # Minecraft
-minecraftVersion=1.21.3
+minecraftVersion=1.21.4
 
 # Fabric Properties
-fabricLoaderVersion=0.16.7
+fabricLoaderVersion=0.16.9
 yarnMappings=2
 
 # NeoForge Properties
-neoforgeVersion=21.3.0-beta
+neoforgeVersion=21.4.39-beta
 neoforgeLoaderRange=[21,)
-neoforgeMinecraftVersionRange=[1.21.2,1.21.3]
+neoforgeMinecraftVersionRange=[1.21.4]

gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

neoforge/build.gradle.kts

@@ -1,12 +1,6 @@
-@file:Suppress("DEPRECATION", "UnstableApiUsage")
-
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import net.fabricmc.loom.task.RemapJarTask
 
-plugins {
-    id("com.github.johnrengelman.shadow") version "7.1.2"
-}
-
 val minecraftVersion: String by extra
 val neoforgeVersion: String by extra
 val neoforgeLoaderRange: String by extra
@@ -17,8 +11,8 @@ architectury {
     neoForge()
 }
 
-val common by configurations.creating
-val shadowCommon by configurations.creating
+val common: Configuration by configurations.creating
+val shadowCommon: Configuration by configurations.creating
 
 configurations["compileClasspath"].extendsFrom(common)
 configurations["runtimeClasspath"].extendsFrom(common)
@@ -45,31 +39,11 @@ tasks.withType<ProcessResources> {
 }
 
 tasks.withType<ShadowJar> {
-    exclude("fabric.mod.json")
-
     configurations = listOf(shadowCommon)
     archiveClassifier.set("dev-shadow")
 }
 
 tasks.withType<RemapJarTask> {
     val shadowTask = tasks.shadowJar.get()
-    input.set(shadowTask.archiveFile)
-    dependsOn(shadowTask)
-    archiveClassifier.set("")
-}
-
-tasks.jar {
-    archiveClassifier.set("dev")
-}
-
-tasks.sourcesJar {
-    val commonSources = project(":common").tasks.sourcesJar.get()
-    dependsOn(commonSources)
-    from(commonSources.archiveFile.map { zipTree(it) })
-}
-
-components.getByName<AdhocComponentWithVariants>("java").apply {
-    withVariantsFromConfiguration(project.configurations["shadowRuntimeElements"]) {
-        skip()
-    }
+    inputFile.set(shadowTask.archiveFile)
 }

settings.gradle.kts

@@ -1,9 +1,9 @@
 pluginManagement {
     repositories {
-        maven(url = "https://maven.fabricmc.net/")
-        maven(url = "https://maven.architectury.dev/")
-        maven(url = "https://maven.minecraftforge.net/")
         gradlePluginPortal()
+        maven(url = "https://maven.neoforged.net/")
+        maven(url = "https://maven.architectury.dev/")
+        maven(url = "https://maven.fabricmc.net/")
     }
 }