feat: port to 1.20.5

nanite · May 9, 2024 · 9bf4cc1 · 9bf4cc1
1 parent a88de45
commit 9bf4cc1
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,3 @@
 # Changelog
 
-Fix mixin
+Port
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.4-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
     id "me.modmuss50.mod-publish-plugin" version "0.4.5"
 }
 
@@ -50,7 +50,7 @@ allprojects {
 
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
-        options.release = 17
+        options.release = 21
     }
 
     java {

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -24,6 +24,6 @@
   ],
   "depends": {
     "fabric": "*",
-    "minecraft": ">=1.20.4"
+    "minecraft": ">=1.20.5"
   }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,30 +1,31 @@
 org.gradle.jvmargs=-Xmx8G
 org.gradle.daemon=false
 
-enabled_platforms=fabric,neoforge,forge
+#enabled_platforms=fabric,neoforge,forge
+enabled_platforms=fabric,neoforge
 
 archives_base_name=flatbedrock
-mod_version=84.0.1
+mod_version=85.0.0
 maven_group=com.sunekaer.mods
 
 curseforge_id=398623
 modrinth_id=ZYLnkiVu
 
 # Dependencies
-minecraft_version=1.20.4
+minecraft_version=1.20.5
 
 # ForgeGradle
 forge_gradle_version=6.0.18
 # NeoForgeGradle
-neoforge_gradle_version=7.0.80
+neoforge_gradle_version=7.0.120
 # Mod loaders
 # NeoForge
-neoforge_version=20.4.80-beta
+neoforge_version=20.5.21-beta
 # Forge
 forge_version=49.0.14
 
-fabric_loader_version=0.15.3
-fabric_api_version=0.91.2+1.20.4
+fabric_loader_version=0.15.11
+fabric_api_version=0.97.8+1.20.5
 
 # Architectury
-architectury_version=11.0.10
+architectury_version=12.0.28
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -38,7 +38,7 @@ processResources {
     duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
     inputs.property "version", project.version
 
-    filesMatching("META-INF/mods.toml") {
+    filesMatching("META-INF/neoforge.mods.toml") {
         expand "version": project.version
     }
 }

diff --git a/...rge/src/main/resources/META-INF/mods.toml → ...ain/resources/META-INF/neoforge.mods.toml b/...rge/src/main/resources/META-INF/mods.toml → ...ain/resources/META-INF/neoforge.mods.toml
@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[1,)"
+loaderVersion="[2,)"
 issueTrackerURL="https://github.com/nanite/Flat-Bedrock/issues"
 license="MIT License"
 
@@ -14,14 +14,14 @@ This mod changes the vanilia bedrock generator to make flat bedrock in the overw
 [[dependencies.flatbedrock]]
 modId="neoforge"
 required=true
-versionRange="[20.4,)"
+versionRange="[20.5,)"
 ordering="NONE"
 side="BOTH"
 
 [[dependencies.flatbedrock]]
 modId="minecraft"
 required=true
-versionRange="[1.20.4,)"
+versionRange="[1.20.5,)"
 ordering="NONE"
 side="BOTH"
 

diff --git a/settings.gradle b/settings.gradle
@@ -11,7 +11,7 @@ pluginManagement {
 
 include("common")
 include("fabric")
-include("forge")
+// include("forge")
 include("neoforge")
 
 rootProject.name = "flatbedrock"