Update to 1.19

CaffeineMC · Jun 14, 2022 · 22b22ad · 22b22ad
1 parent 6a62651
commit 22b22ad
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 65 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '0.10-SNAPSHOT'
+    id 'fabric-loom' version '0.12-SNAPSHOT'
 }
 
 sourceCompatibility = JavaVersion.VERSION_17

diff --git a/gradle.properties b/gradle.properties
@@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=1.18.1
-yarn_mappings=1.18.1+build.5
-loader_version=0.12.12
+minecraft_version=1.19
+yarn_mappings=1.19+build.1
+loader_version=0.14.6
 
 # Mod Properties
 mod_version=0.8.0

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-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/net/caffeinemc/phosphor/mixin/chunk/MixinChunkStatus.java b/src/main/java/net/caffeinemc/phosphor/mixin/chunk/MixinChunkStatus.java
@@ -36,18 +36,18 @@ private static ChunkStatus register(String id, ChunkStatus previous, int taskMar
         ),
         at = @At(
             value = "INVOKE",
-            target = "Lnet/minecraft/world/chunk/ChunkStatus;register(Ljava/lang/String;Lnet/minecraft/world/chunk/ChunkStatus;ILjava/util/EnumSet;Lnet/minecraft/world/chunk/ChunkStatus$ChunkType;Lnet/minecraft/world/chunk/ChunkStatus$GenerationTask;)Lnet/minecraft/world/chunk/ChunkStatus;",
+            target = "Lnet/minecraft/world/chunk/ChunkStatus;register(Ljava/lang/String;Lnet/minecraft/world/chunk/ChunkStatus;ILjava/util/EnumSet;Lnet/minecraft/world/chunk/ChunkStatus$ChunkType;Lnet/minecraft/world/chunk/ChunkStatus$GenerationTask;Lnet/minecraft/world/chunk/ChunkStatus$LoadTask;)Lnet/minecraft/world/chunk/ChunkStatus;",
             ordinal = 0
         )
     )
-    private static ChunkStatus injectLightmapSetup(final String id, final ChunkStatus previous, final int taskMargin, final EnumSet<Heightmap.Type> heightMapTypes, final ChunkStatus.ChunkType chunkType, final ChunkStatus.GenerationTask task) {
+    private static ChunkStatus injectLightmapSetup(final String id, final ChunkStatus previous, final int taskMargin, final EnumSet<Heightmap.Type> heightMapTypes, final ChunkStatus.ChunkType chunkType, final ChunkStatus.GenerationTask task, final ChunkStatus.LoadTask loadTask) {
         return register(id, previous, taskMargin, heightMapTypes, chunkType,
             (status, executor, world, generator, structureManager, lightingProvider, function, surroundingChunks, chunk, force) ->
                 task.doWork(status, executor, world, generator, structureManager, lightingProvider, function, surroundingChunks, chunk, force).thenCompose(
                     either -> getPreLightFuture(lightingProvider, either)
                 ),
             (status, world, structureManager, lightingProvider, function, chunk) ->
-                STATUS_BUMP_LOAD_TASK.doWork(status, world, structureManager, lightingProvider, function, chunk).thenCompose(
+                loadTask.doWork(status, world, structureManager, lightingProvider, function, chunk).thenCompose(
                     either -> getPreLightFuture(lightingProvider, either)
                 )
             );

diff --git a/src/main/java/net/caffeinemc/phosphor/mixin/world/MixinChunkSerializer.java b/src/main/java/net/caffeinemc/phosphor/mixin/world/MixinChunkSerializer.java
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -22,7 +22,7 @@
   "accessWidener": "phosphor.accesswidener",
   "depends": {
     "fabricloader": ">=0.8.0",
-    "minecraft": "1.18.x"
+    "minecraft": "1.19.x"
   },
   "breaks": {
     "starlight": "*"

diff --git a/src/main/resources/phosphor.mixins.json b/src/main/resources/phosphor.mixins.json
@@ -21,8 +21,7 @@
         "chunk.light.MixinServerLightingProvider",
         "chunk.MixinProtoChunk",
         "world.ThreadedAnvilChunkStorageAccess",
-        "chunk.MixinChunkStatus",
-        "world.MixinChunkSerializer"
+        "chunk.MixinChunkStatus"
     ],
     "injectors": {
         "defaultRequire": 1