Revert "Update to 1.20.2 (QuiltServerTools#228)"

This reverts commit eb00277.
sasha0552 · Apr 8, 2024 · 222b3bc · 222b3bc
1 parent 4c4a4ce
commit 222b3bc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/libs.versions.toml b/libs.versions.toml
@@ -1,17 +1,17 @@
 [versions]
-minecraft = "1.20.2"
-yarn-mappings = "1.20.2+build.1"
-fabric-loader = "0.14.22"
+minecraft = "1.20"
+yarn-mappings = "1.20+build.1"
+fabric-loader = "0.14.21"
 
-fabric-api = "0.89.1+1.20.2"
+fabric-api = "0.83.0+1.20"
 
 # Kotlin
 kotlin = "1.9.4"
 # Also modrinth version in gradle.properties
 fabric-kotlin = "1.9.4+kotlin.1.8.21"
 
 fabric-permissions = "0.2-SNAPSHOT"
-translations = "2.1.0+1.20.2-rc2"
+translations = "2.0.0-beta.2+1.19.4-pre2"
 
 exposed = "0.38.2"
 sqlite-jdbc = "3.36.0.3"

diff --git a/src/main/java/com/github/quiltservertools/ledger/mixin/BucketDispenserBehaviorMixin.java b/src/main/java/com/github/quiltservertools/ledger/mixin/BucketDispenserBehaviorMixin.java
@@ -22,12 +22,12 @@ public abstract class BucketDispenserBehaviorMixin extends ItemDispenserBehavior
             method = "dispenseSilently(Lnet/minecraft/util/math/BlockPointer;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/item/ItemStack;",
             at = @At(
                     value = "INVOKE",
-                    target = "Lnet/minecraft/block/FluidDrainable;tryDrainFluid(Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Lnet/minecraft/item/ItemStack;",
+                    target = "Lnet/minecraft/block/FluidDrainable;tryDrainFluid(Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Lnet/minecraft/item/ItemStack;",
                     shift = At.Shift.AFTER
             )
     )
     private void logFluidPickup(BlockPointer pointer, ItemStack stack, CallbackInfoReturnable<ItemStack> cir, @Local ItemStack itemStack, @Local BlockPos pos, @Local BlockState blockState) {
-        var world = pointer.world();
+        var world = pointer.getWorld();
         if (!itemStack.isEmpty()) {
             if (blockState.isLiquid() || blockState.isOf(Blocks.POWDER_SNOW)) {
                 BlockBreakCallback.EVENT.invoker().breakBlock(world, pos, blockState, world.getBlockEntity(pos), Sources.REDSTONE);

diff --git a/src/main/java/com/github/quiltservertools/ledger/mixin/blocks/SpongeBlockMixin.java b/src/main/java/com/github/quiltservertools/ledger/mixin/blocks/SpongeBlockMixin.java
@@ -26,7 +26,7 @@ private static void logWaterDrainNonSource(BlockPos actorBlockPos, World world,
     }
 
     @Inject(method = "method_49829", at = @At(value = "INVOKE",
-            target = "Lnet/minecraft/block/FluidDrainable;tryDrainFluid(Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Lnet/minecraft/item/ItemStack;"))
+            target = "Lnet/minecraft/block/FluidDrainable;tryDrainFluid(Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Lnet/minecraft/item/ItemStack;"))
     private static void logWaterDrainSource(BlockPos actorBlockPos, World world, BlockPos pos, CallbackInfoReturnable<Boolean> cir) {
         BlockBreakCallback.EVENT.invoker().breakBlock(world, pos, world.getBlockState(pos), null, Sources.SPONGE);
     }

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -37,4 +37,4 @@
     "breaks": {
         "cardboard": "*"
     }
-}
+}