Merge pull request #443 from OKTW-Network/1.21.3

1.21.3
OKTW-Network · Nov 26, 2024 · af0c856 · af0c856
2 parents c6c614f + 986f553
commit af0c856
Show file tree

Hide file tree

Showing 50 changed files with 286 additions and 1,327 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,15 +4,15 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     //    "maven-publish"
-    kotlin("jvm") version "2.0.10"
-    id("fabric-loom") version "1.7-SNAPSHOT"
+    kotlin("jvm") version "2.0.21"
+    id("fabric-loom") version "1.8-SNAPSHOT"
 }
 
 val version = "0.0.1"
 val group = "one.oktw"
 
-val fabricVersion = "0.102.1+1.21.1"
-val galaxyLibVersion = "7376fcdf"
+val fabricVersion = "0.108.0+1.21.3"
+val galaxyLibVersion = "c328418"
 
 repositories {
     mavenCentral()
@@ -42,9 +42,9 @@ loom {
 
 dependencies {
     // Core
-    minecraft(group = "com.mojang", name = "minecraft", version = "1.21.1")
-    mappings(group = "net.fabricmc", name = "yarn", version = "1.21.1+build.3", classifier = "v2")
-    modImplementation(group = "net.fabricmc", name = "fabric-loader", version = "0.15.11")
+    minecraft(group = "com.mojang", name = "minecraft", version = "1.21.3")
+    mappings(group = "net.fabricmc", name = "yarn", version = "1.21.3+build.2", classifier = "v2")
+    modImplementation(group = "net.fabricmc", name = "fabric-loader", version = "0.16.9")
 
     // fabric api
     modImplementation(group = "net.fabricmc.fabric-api", name = "fabric-api", version = fabricVersion) {

diff --git a/docker b/docker
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,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/src/main/java/one/oktw/galaxy/mixin/accessor/SerializingRegionBasedStorageAccessor.java b/src/main/java/one/oktw/galaxy/mixin/accessor/SerializingRegionBasedStorageAccessor.java
diff --git a/src/main/java/one/oktw/galaxy/mixin/interfaces/CustomRecipeManager.java b/src/main/java/one/oktw/galaxy/mixin/interfaces/CustomRecipeManager.java
diff --git a/src/main/java/one/oktw/galaxy/mixin/recipe/MixinCustomRecipe_CraftingResultSlot.java b/src/main/java/one/oktw/galaxy/mixin/recipe/MixinCustomRecipe_CraftingResultSlot.java
diff --git a/src/main/java/one/oktw/galaxy/mixin/recipe/MixinCustomRecipe_RecipeManager.java b/src/main/java/one/oktw/galaxy/mixin/recipe/MixinCustomRecipe_RecipeManager.java
diff --git a/...ain/java/one/oktw/galaxy/mixin/tweak/MixinAsyncChunk_ChunkPosDistanceLevelPropagator.java b/...ain/java/one/oktw/galaxy/mixin/tweak/MixinAsyncChunk_ChunkPosDistanceLevelPropagator.java
diff --git a/src/main/java/one/oktw/galaxy/mixin/tweak/MixinAsyncChunk_RegionBasedStorage.java b/src/main/java/one/oktw/galaxy/mixin/tweak/MixinAsyncChunk_RegionBasedStorage.java