feat: update to minecraft 1.21 (#346)

* wip: update to 1.21 most stuff is still broken * chore: continue porting to 1.21 * chore: even more porting work (still not done) * chore: porting continues data component edition (also simplify level -> celestialbody system) * feat: it loads to the title screen * chore: run datagen * fix: hack around datagen registry restrictions * feat: most things work now * update tag conventions * fix network recipe serialization * synchronize dynamic registries * feat: all tests pass, moon no longer crashes * chore: update to 1.21.1 and optimize imports * also add a missing license header * chore: use an alternative maven builds should work now
TeamGalacticraft · Aug 24, 2024 · 0a7f714 · 0a7f714
1 parent e23e129
commit 0a7f714
Show file tree

Hide file tree

Showing 2,489 changed files with 26,914 additions and 27,991 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,12 +12,12 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Validate Gradle wrapper
-        uses: gradle/actions/wrapper-validation@v3
+        uses: gradle/actions/wrapper-validation@v4
 
-      - name: Setup JDK 17
+      - name: Setup JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
 
       - name: Cache Gradle

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -15,12 +15,12 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Validate Gradle wrapper
-        uses: gradle/actions/wrapper-validation@v3
+        uses: gradle/actions/wrapper-validation@v4
 
-      - name: Setup JDK 17
+      - name: Setup JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
 
       - name: Restore Gradle cache

diff --git a/.github/workflows/crowdin_push.yml b/.github/workflows/crowdin_push.yml
@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Crowdin Push
-        uses: crowdin/github-action@v1
+        uses: crowdin/github-action@v2
         with:
           upload_sources: true
           upload_translations: false

diff --git a/.github/workflows/crowdin_sync.yml b/.github/workflows/crowdin_sync.yml
@@ -10,7 +10,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Crowdin Sync
-        uses: crowdin/github-action@v1
+        uses: crowdin/github-action@v2
         with:
           upload_sources: false
           upload_translations: false

diff --git a/.github/workflows/pr_check.yml b/.github/workflows/pr_check.yml
@@ -12,12 +12,12 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Validate Gradle wrapper
-        uses: gradle/actions/wrapper-validation@v3
+        uses: gradle/actions/wrapper-validation@v4
 
-      - name: Setup JDK 17
+      - name: Setup JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
 
       - name: Cache Gradle

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ The classic Minecraft space mod, rewritten from the ground up for modern version
 Here we answer a few common questions we get regarding the release of the mod.\
 More information can be found in the `#faq` channel in [our Discord](https://discord.gg/n3QqhMYyFK).
 
-**When will Galacticraft 5 for 1.20+ be released?**\
+**When will Galacticraft 5 for 1.21+ be released?**\
 There is currently no ETA for a release.
 Keep an eye out on [our Discord server](https://discord.gg/n3QqhMYyFK) for an alpha release announcement.
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -52,15 +52,15 @@ val objVersion               = project.property("obj.version").toString()
 plugins {
     java
     `maven-publish`
-    id("fabric-loom") version("1.6-SNAPSHOT")
+    id("fabric-loom") version("1.7-SNAPSHOT")
     id("org.cadixdev.licenser") version("0.6.1")
     id("org.ajoberstar.grgit") version("5.2.2")
-    id("dev.galacticraft.mojarn") version("0.1.2")
+    id("dev.galacticraft.mojarn") version("0.4.0+10")
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 
     withSourcesJar()
     withJavadocJar()
@@ -134,7 +134,14 @@ loom {
         }
 
         afterEvaluate {
-            val mixinJarFile = configurations.compileClasspath.get().files { it.group == "net.fabricmc" && it.name == "sponge-mixin" }.first()
+            val mixinJarFile = configurations.runtimeClasspath.get().incoming.artifactView {
+                componentFilter {
+                    it is ModuleComponentIdentifier
+                            && it.group == "net.fabricmc"
+                            && it.module == "sponge-mixin"
+                }
+            }.files.first()
+
             configureEach {
                 vmArg("-javaagent:$mixinJarFile")
 
@@ -147,12 +154,8 @@ loom {
 
 repositories {
     mavenLocal()
-    maven("https://maven.galacticraft.net/repository/maven-releases/") {
-        content {
-            includeGroup("dev.galacticraft")
-        }
-    }
-    maven("https://maven.galacticraft.net/repository/maven-snapshots/") {
+    maven("https://repo.terradevelopment.net/repository/maven-releases/") {
+        // https://maven.galacticraft.net/repository/maven-releases
         content {
             includeGroup("dev.galacticraft")
         }
@@ -240,8 +243,8 @@ dependencies {
     }
 
     multicompat(group = "mezz.jei",
-            api = "jei-$minecraftVersion-common-api",
-            extra = "jei-$minecraftVersion-fabric-api",
+            api = "jei-1.21-common-api",
+            extra = "jei-1.21-fabric-api",
 //            runtime = "jei-$minecraftVersion-fabric", // we already have REI at runtime
             version = jeiVersion) {
         exclude(group = "net.fabricmc.fabric-api")
@@ -266,21 +269,13 @@ tasks.processResources {
     }
 }
 
-tasks.processTestResources {
-    inputs.property("version", project.version)
-
-    filesMatching("fabric.mod.json") {
-        expand("version" to project.version)
-    }
-}
-
 tasks.javadoc {
     options.encoding = "UTF-8"
 }
 
 tasks.withType(JavaCompile::class) {
     options.encoding = "UTF-8"
-    options.release.set(17)
+    options.release.set(21)
 }
 
 tasks.jar {

diff --git a/gradle.properties b/gradle.properties
@@ -2,8 +2,8 @@
 org.gradle.jvmargs=-Xmx2G
 
 # Fabric Info
-minecraft.version=1.20.4
-loader.version=0.15.7
+minecraft.version=1.21.1
+loader.version=0.15.11
 yarn.build=3
 
 # Mod Info
@@ -12,14 +12,14 @@ mod.group=dev.galacticraft
 mod.name=Galacticraft
 
 # Dependencies
-fabric.version=0.97.1+1.20.4
-cloth.config.version=13.0.121
-modmenu.version=9.0.0
-rei.version=14.0.688
-jei.version=17.3.0.49
-dynamicdimensions.version=0.6.0+8
-machinelib.version=0.4.2+48
-badpackets.version=0.6.1
-wthit.version=10.4.0
+fabric.version=0.102.1+1.21.1
+cloth.config.version=15.0.130
+modmenu.version=11.0.1
+rei.version=16.0.754
+jei.version=19.8.2.99
+dynamicdimensions.version=0.8.0+24
+machinelib.version=0.7.0+74
+badpackets.version=0.8.1
+wthit.version=12.3.0
 obj.version=0.4.0
-architectury.version=11.1.17
+architectury.version=13.0.6
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,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionSha256Sum=5b9c5eb3f9fc2c94abaea57d90bd78747ca117ddbbf96c859d3741181a12bf2a
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/gradlew.bat b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,5 +1,11 @@
 pluginManagement {
     repositories {
+        mavenLocal {
+            content {
+                includeGroup("dev.galacticraft")
+                includeGroup("dev.galacticraft.mojarn")
+            }
+        }
         maven("https://maven.fabricmc.net/") {
             name = "Fabric"
             content {
@@ -8,7 +14,8 @@ pluginManagement {
                 includeGroup("fabric-loom")
             }
         }
-        maven("https://maven.galacticraft.net/repository/maven-releases/") {
+        maven("https://repo.terradevelopment.net/repository/maven-releases/") {
+            // https://maven.galacticraft.net/repository/maven-releases
             content {
                 includeGroup("dev.galacticraft")
                 includeGroup("dev.galacticraft.mojarn")

diff --git a/src/main/generated/README.md b/src/main/generated/README.md
@@ -3,7 +3,8 @@
 
 
 ### Adding more resources
-Resources that cannot be generated (e.g. music, textures, languages, etc.) should be put into [src/main/resources](../resources).
+Resources that cannot be generated (e.g., music, textures, translations)
+should be put into [src/main/resources](../resources).
 
 To generate additional resources, see the `dev.galacticraft.mod.data` package.
 

diff --git a/src/main/generated/assets/galacticraft/blockstates/moon_berry_bush.json b/src/main/generated/assets/galacticraft/blockstates/moon_berry_bush.json
diff --git a/src/main/generated/assets/galacticraft/lang/en_us.json b/src/main/generated/assets/galacticraft/lang/en_us.json
@@ -1,4 +1,5 @@
 {
+  "banner_pattern.galacticraft.rocket": "Rocket",
   "biome.galacticraft.basaltic_mare": "Basaltic Mare",
   "biome.galacticraft.comet_tundra": "Comet Tundra",
   "biome.galacticraft.lunar_highlands": "Lunar Highlands",
@@ -175,7 +176,6 @@
   "block.galacticraft.moon_basalt_slab": "Moon Basalt Slab",
   "block.galacticraft.moon_basalt_stairs": "Moon Basalt Stairs",
   "block.galacticraft.moon_basalt_wall": "Moon Basalt Wall",
-  "block.galacticraft.moon_berry_bush": "Moon Berry Bush",
   "block.galacticraft.moon_cheese_block": "Moon Cheese Wheel",
   "block.galacticraft.moon_cheese_block.description": "Cheese Blocks are created from the cheeses of the Moon, place-able and edible.",
   "block.galacticraft.moon_copper_ore": "Moon Copper Ore",

diff --git a/src/main/generated/assets/galacticraft/models/block/moon_berry_bush_stage0.json b/src/main/generated/assets/galacticraft/models/block/moon_berry_bush_stage0.json
diff --git a/src/main/generated/assets/galacticraft/models/block/moon_berry_bush_stage1.json b/src/main/generated/assets/galacticraft/models/block/moon_berry_bush_stage1.json
diff --git a/src/main/generated/assets/galacticraft/models/block/moon_berry_bush_stage2.json b/src/main/generated/assets/galacticraft/models/block/moon_berry_bush_stage2.json
diff --git a/src/main/generated/assets/galacticraft/models/block/moon_berry_bush_stage3.json b/src/main/generated/assets/galacticraft/models/block/moon_berry_bush_stage3.json
diff --git a/src/main/generated/assets/galacticraft/models/item/moon_berries.json b/src/main/generated/assets/galacticraft/models/item/moon_berries.json
diff --git a/src/main/generated/data/c/tags/block/clusters.json b/src/main/generated/data/c/tags/block/clusters.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "galacticraft:olivine_cluster"
+  ]
+}
diff --git a/src/main/generated/data/c/tags/block/ores.json b/src/main/generated/data/c/tags/block/ores.json
@@ -0,0 +1,19 @@
+{
+  "values": [
+    "galacticraft:silicon_ore",
+    "galacticraft:deepslate_silicon_ore",
+    "galacticraft:moon_copper_ore",
+    "galacticraft:lunaslate_copper_ore",
+    "galacticraft:olivine_basalt",
+    "galacticraft:rich_olivine_basalt",
+    "galacticraft:tin_ore",
+    "galacticraft:deepslate_tin_ore",
+    "galacticraft:moon_tin_ore",
+    "galacticraft:lunaslate_tin_ore",
+    "galacticraft:aluminum_ore",
+    "galacticraft:deepslate_aluminum_ore",
+    "galacticraft:desh_ore",
+    "galacticraft:ilmenite_ore",
+    "galacticraft:galena_ore"
+  ]
+}
diff --git a/src/main/generated/data/c/tags/blocks/clusters.json b/src/main/generated/data/c/tags/blocks/clusters.json