Merge remote-tracking branch 'origin/v16' into v17

# Conflicts: # fabric/build.gradle # gradle.properties # neoforge/build.gradle
shedaniel · Dec 13, 2024 · 202254f · 202254f
2 parents 3a3c849 + 28d2a9a
commit 202254f
Show file tree

Hide file tree

Showing 9 changed files with 253 additions and 156 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.9-SNAPSHOT" apply false
     id "me.shedaniel.unified-publishing" version "0.1.+" apply false
     id "maven-publish"
     id "org.cadixdev.licenser" version "0.6.1" apply false
@@ -38,11 +38,14 @@ allprojects {
     def runNumber = (System.getenv("GITHUB_RUN_NUMBER") == null ? "9999" : System.getenv("GITHUB_RUN_NUMBER"))
 
     version = rootProject.base_version + "." + runNumber
-    archivesBaseName = rootProject.archives_base_name
+
+    base {
+        archivesName = rootProject.archives_base_name
+    }
 
     group = rootProject.maven_group
 
-    tasks.withType(JavaCompile) {
+    tasks.withType(JavaCompile).configureEach {
         options.encoding = "UTF-8"
 
         // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too

diff --git a/common/build.gradle b/common/build.gradle
@@ -31,7 +31,7 @@ dependencies {
 }
 
 architectury {
-    common("fabric", "neoforge"/*, "forge", "neoforge"*/)
+    common("fabric", "forge", "neoforge")
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -105,7 +105,7 @@ unifiedPublishing {
     project {
         displayName = "[MinecraftForge $rootProject.supported_version] v$project.version"
         releaseType = "release"
-        gameVersions = ["1.21"]
+        gameVersions = ["1.21.2", "1.21.3"]
         gameLoaders = ["forge"]
 
         mainPublication remapJar

diff --git a/gradle.properties b/gradle.properties
@@ -17,8 +17,8 @@ fabric_loader_version=0.16.9
 fabric_api_version=0.111.0+1.21.4
 mod_menu_version=13.0.0-beta.1
 
-forge_version=51.0.33
-neoforge_version=21.4.9-beta
+forge_version=54.0.6
+neoforge_version=21.4.19-beta
 neoforge_pr=
 
 curseforge_id=348521

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Sun Dec 30 21:50:18 HKT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip