Add 1.21.4 support for Fabric & NeoForge (#781)

* Snapshot version * 1.21.4 Fabric/NeoForge support
RakambdaOrg · Dec 3, 2024 · 138e935 · 138e935
1 parent 2b205f1
commit 138e935
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 15 deletions.
diff --git a/.github/workflows/gradle_publish.yml b/.github/workflows/gradle_publish.yml
@@ -20,3 +20,5 @@ jobs:
       key-pass: ${{ secrets.KEYSTORE_FORGE_MODS_KEY_PASS }}
       curseforge-token: ${{ secrets.CURSEFORGE_API_KEY }}
       modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+
+
diff --git a/.gitignore b/.gitignore
@@ -18,4 +18,8 @@ bin/
 .project
 
 # minecraft
+fabric/run
+forge/run
+neoforge/run
 run/
+runs/
diff --git a/datapack/pack.mcmeta b/datapack/pack.mcmeta
@@ -1,6 +1,6 @@
 {
   "pack" : {
-    "pack_format" : 55,
+    "pack_format" : 61,
     "description" : {
       "text" : "Add FallingTree enchantments"
     }

diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.daemon=false
 modId=fallingtree
 modName=FallingTree
 includeFabric=true
-includeForge=true
+includeForge=false
 includeNeoForge=true
 # Repository
 repoUser=Rakambda

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,19 +7,19 @@ gson-version = "2.11.0"
 log4j2-version = "2.24.1"
 
 # Minecraft / Loaders
-minecraftVersion = "1.21.3"
-fabric-loader-version = "0.16.7"
-fabric-api-version = "0.106.1+1.21.3"
+minecraftVersion = "1.21.4"
+fabric-loader-version = "0.16.9"
+fabric-api-version = "0.110.5+1.21.4"
 forge-version = "1.21.3-53.0.4"
-neoforge-version = "21.3.0-beta"
+neoforge-version = "21.4.0-beta"
 
 # Mod dependencies
 modmenu-version = "12.0.0-beta.1"
 clothConfigVersion = "16.0.141"
 
-fabric-loom-version = "1.8+"
+fabric-loom-version = "1.9+"
 forge-plugin-version = "[6.0.24,6.2)"
-neoforge-plugin-version = "7.0+"
+neoforge-plugin-version = "7.0.171"
 curse-version = "1.4.0"
 modrinth-version = "2.8.7"
 names-version = "0.51.0"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -26,11 +26,11 @@ runs {
         systemProperty "forge.enabledGameTestNamespaces", "fallingtree"
     }
 
-    data {
-//        taskName "runFTNeoForgeData"
-        workingDirectory.set(project.file("./run/data"))
-        programArguments.addAll '--mod', 'fallingtree', '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
-    }
+//    datagen {
+////        taskName "runFTNeoForgeData"
+//        workingDirectory.set(project.file("./run/data"))
+//        programArguments '--mod', 'fallingtree', '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
+//    }
 }
 
 minecraft {

diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -17,7 +17,7 @@ file="META-INF/neoforge.accesstransformer.cfg"
 [[dependencies.fallingtree]]
 modId="neoforge"
 type="required"
-versionRange="[21.3,)"
+versionRange="[21.4,)"
 ordering="NONE"
 side="BOTH"
 [[dependencies.fallingtree]]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,3 +20,5 @@ jobs:
		key-pass: ${{ secrets.KEYSTORE_FORGE_MODS_KEY_PASS }}
		curseforge-token: ${{ secrets.CURSEFORGE_API_KEY }}
		modrinth-token: ${{ secrets.MODRINTH_TOKEN }}