From 83940f50b3eb4c5e8f372eea3a643c69deaea94d Mon Sep 17 00:00:00 2001 From: gnembon <41132274+gnembon@users.noreply.github.com> Date: Wed, 4 Oct 2023 23:24:08 +0200 Subject: [PATCH] lol stupid mojang 23w40a --- gradle.properties | 4 ++-- .../carpet/mixins/SaplingBlock_desertShrubsMixin.java | 2 +- .../mixins/ServerPlayerGameMode_scarpetEventsMixin.java | 8 ++++---- src/main/java/carpet/utils/Messenger.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index e0cdfdb6..beaec5e9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,10 +3,10 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check https://fabricmc.net/develop/ - minecraft_version=1.20.2 + minecraft_version=23w40a loader_version=0.14.22 jsr305_version=3.0.2 - fabric_version=0.88.2+1.20.2 + fabric_version=0.89.3+1.20.2 # Mod Properties mod_version = 1.4.119 diff --git a/src/main/java/carpet/mixins/SaplingBlock_desertShrubsMixin.java b/src/main/java/carpet/mixins/SaplingBlock_desertShrubsMixin.java index b6ba5cc6..140829c9 100644 --- a/src/main/java/carpet/mixins/SaplingBlock_desertShrubsMixin.java +++ b/src/main/java/carpet/mixins/SaplingBlock_desertShrubsMixin.java @@ -23,7 +23,7 @@ import net.minecraft.world.level.block.state.BlockState; public abstract class SaplingBlock_desertShrubsMixin { @Inject(method = "advanceTree", at = @At(value = "INVOKE", shift = At.Shift.BEFORE, - target = "Lnet/minecraft/world/level/block/grower/AbstractTreeGrower;growTree(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/chunk/ChunkGenerator;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/util/RandomSource;)Z"), + target = "Lnet/minecraft/world/level/block/grower/TreeGrower;growTree(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/chunk/ChunkGenerator;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/util/RandomSource;)Z"), cancellable = true) private void onGenerate(ServerLevel level, BlockPos pos, BlockState blockState, RandomSource random, CallbackInfo ci) { diff --git a/src/main/java/carpet/mixins/ServerPlayerGameMode_scarpetEventsMixin.java b/src/main/java/carpet/mixins/ServerPlayerGameMode_scarpetEventsMixin.java index 163d34ce..ed3beb6d 100644 --- a/src/main/java/carpet/mixins/ServerPlayerGameMode_scarpetEventsMixin.java +++ b/src/main/java/carpet/mixins/ServerPlayerGameMode_scarpetEventsMixin.java @@ -40,13 +40,13 @@ public class ServerPlayerGameMode_scarpetEventsMixin implements ServerPlayerInte @Inject(method = "destroyBlock", locals = LocalCapture.CAPTURE_FAILHARD, cancellable = true, at = @At( value = "INVOKE", - target = "Lnet/minecraft/world/level/block/Block;playerWillDestroy(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/entity/player/Player;)V", + target = "Lnet/minecraft/server/level/ServerLevel;removeBlock(Lnet/minecraft/core/BlockPos;Z)Z", shift = At.Shift.BEFORE )) - private void onBlockBroken(BlockPos blockPos_1, CallbackInfoReturnable cir, BlockState blockState_1, BlockEntity be, Block b) + private void onBlockBroken(final BlockPos blockPos, final CallbackInfoReturnable cir, final BlockEntity blockEntity, final Block block, final BlockState blockState) { - if(PLAYER_BREAK_BLOCK.onBlockBroken(player, blockPos_1, blockState_1)) { - this.level.sendBlockUpdated(blockPos_1, blockState_1, blockState_1, 3); + if(PLAYER_BREAK_BLOCK.onBlockBroken(player, blockPos, blockState)) { + this.level.sendBlockUpdated(blockPos, blockState, blockState, 3); cir.setReturnValue(false); cir.cancel(); } diff --git a/src/main/java/carpet/utils/Messenger.java b/src/main/java/carpet/utils/Messenger.java index 067fadda..1823157f 100644 --- a/src/main/java/carpet/utils/Messenger.java +++ b/src/main/java/carpet/utils/Messenger.java @@ -55,7 +55,7 @@ public class Messenger BLACK ('k', (s, f) -> s.withColor(ChatFormatting.BLACK)), COLOR ('#', (s, f) -> { - TextColor color = TextColor.parseColor("#"+f); + TextColor color = TextColor.parseColor("#"+f).getOrThrow(false, LOG::warn); return color == null ? s : s.withColor(color); }, s -> { Matcher m = colorExtract.matcher(s);