Merge remote-tracking branch 'refs/remotes/origin/v14' into v15

# Conflicts: # fabric/build.gradle # gradle.properties # neoforge/build.gradle
shedaniel · Aug 13, 2024 · 1e05ed0 · 1e05ed0
2 parents bebc783 + 136aab6
commit 1e05ed0
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 13 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.6-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.7-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

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

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -35,9 +35,10 @@ dependencies {
     modLocalRuntime("me.shedaniel.cloth:basic-math:0.6.1")
     forgeDependencies(shadowCommon("me.shedaniel.cloth:basic-math:0.6.1"))
 
-    forgeDependencies("cpw.mods:securejarhandler:0.9.48")
     modLocalRuntime("blue.endless:jankson:${rootProject.jankson_version}")
-    modLocalRuntime("com.moandjiezana.toml:toml4j:${rootProject.toml4j_version}")
+    modLocalRuntime("com.moandjiezana.toml:toml4j:${rootProject.toml4j_version}") {
+        exclude(module: "gson")
+    }
     modLocalRuntime("org.yaml:snakeyaml:${rootProject.snakeyaml_version}")
     forgeDependencies(shadowCommon("blue.endless:jankson:${rootProject.jankson_version}"))
     forgeDependencies(shadowCommon("com.moandjiezana.toml:toml4j:${rootProject.toml4j_version}") {
@@ -49,6 +50,10 @@ dependencies {
     shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive false }
 }
 
+configurations.configureEach {
+    resolutionStrategy.force("net.sf.jopt-simple:jopt-simple:5.0.4")
+}
+
 processResources {
     filesMatching("META-INF/mods.toml") {
         expand "version": project.version
@@ -100,7 +105,7 @@ unifiedPublishing {
     project {
         displayName = "[MinecraftForge $rootProject.supported_version] v$project.version"
         releaseType = "release"
-        gameVersions = ["1.20.3", "1.20.4"]
+        gameVersions = ["1.21"]
         gameLoaders = ["forge"]
 
         mainPublication remapJar

diff --git a/gradle.properties b/gradle.properties
@@ -13,12 +13,12 @@ jankson_version=1.2.0
 toml4j_version=0.7.2
 snakeyaml_version=1.27
 
-fabric_loader_version=0.15.11
-fabric_api_version=0.100.1+1.21
-mod_menu_version=11.0.0-beta.1
+fabric_loader_version=0.16.0
+fabric_api_version=0.102.0+1.21
+mod_menu_version=11.0.0
 
-forge_version=49.0.3
-neoforge_version=21.0.114-beta
+forge_version=51.0.33
+neoforge_version=21.0.167
 neoforge_pr=
 
 curseforge_id=348521

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
diff --git a/settings.gradle b/settings.gradle
@@ -2,9 +2,9 @@ pluginManagement {
     repositories {
         maven { url "https://maven.fabricmc.net/" }
         maven { url "https://maven.architectury.dev/" }
+        gradlePluginPortal()
         maven { url "https://files.minecraftforge.net/maven/" }
         maven { url "https://jitpack.io" }
-        gradlePluginPortal()
     }
 }
 
@@ -14,7 +14,7 @@ if (JavaVersion.current().ordinal() + 1 < 21) {
 
 include("common")
 include("fabric")
-//include("forge")
+include("forge")
 include("neoforge")
 
 rootProject.name = 'cloth-config'