diff --git a/gradle.properties b/gradle.properties index 4d53cfdc..830dfffc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ kotlin.code.style=official org.gradle.jvmargs=-Xmx1G # Mod Properties -modVersion = 1.2.8 +modVersion = 1.2.9 mavenGroup = com.github.quiltservertools modId = ledger modName = Ledger diff --git a/libs.versions.toml b/libs.versions.toml index 3d0bc8f2..1d404bef 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -1,9 +1,9 @@ [versions] -minecraft = "1.20" -yarn-mappings = "1.20+build.1" -fabric-loader = "0.14.21" +minecraft = "1.20.2" +yarn-mappings = "1.20.2+build.1" +fabric-loader = "0.14.22" -fabric-api = "0.83.0+1.20" +fabric-api = "0.89.1+1.20.2" # Kotlin kotlin = "1.9.4" @@ -11,7 +11,7 @@ kotlin = "1.9.4" fabric-kotlin = "1.9.4+kotlin.1.8.21" fabric-permissions = "0.2-SNAPSHOT" -translations = "2.0.0-beta.2+1.19.4-pre2" +translations = "2.1.0+1.20.2-rc2" 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 index 778449f9..52c1e085 100644 --- 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/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Lnet/minecraft/item/ItemStack;", + 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;", shift = At.Shift.AFTER ) ) private void logFluidPickup(BlockPointer pointer, ItemStack stack, CallbackInfoReturnable cir, @Local ItemStack itemStack, @Local BlockPos pos, @Local BlockState blockState) { - var world = pointer.getWorld(); + var world = pointer.world(); 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 index 4143895f..e7cd9485 100644 --- 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/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Lnet/minecraft/item/ItemStack;")) + 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;")) private static void logWaterDrainSource(BlockPos actorBlockPos, World world, BlockPos pos, CallbackInfoReturnable 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 index 06996d3a..96d04cdd 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -32,7 +32,7 @@ "fabricloader": "*", "fabric": ">=${fabricApi}", "fabric-language-kotlin": ">=${fabricKotlin}", - "minecraft": ">=1.20" + "minecraft": ">=1.20.2" }, "breaks": { "cardboard": "*"