icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lol stupid mojang 23w40a

Browse Source
This commit is contained in:
gnembon committed 2023-10-04 23:24:08 +02:00
1 parent b0dafd6e3f
commit 83940f50b3
4 files changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gradle.properties
+2 -2
View File
@@ -3,10 +3,10 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties # Fabric Properties
# check https://fabricmc.net/develop/ # check https://fabricmc.net/develop/
minecraft_version=1.20.2 minecraft_version=23w40a
loader_version=0.14.22 loader_version=0.14.22
jsr305_version=3.0.2 jsr305_version=3.0.2
fabric_version=0.88.2+1.20.2 fabric_version=0.89.3+1.20.2
# Mod Properties # Mod Properties
mod_version = 1.4.119 mod_version = 1.4.119
src/main/java/carpet/mixins/SaplingBlock_desertShrubsMixin.java
+1 -1
View File
@@ -23,7 +23,7 @@ import net.minecraft.world.level.block.state.BlockState;
public abstract class SaplingBlock_desertShrubsMixin public abstract class SaplingBlock_desertShrubsMixin
{ {
@Inject(method = "advanceTree", at = @At(value = "INVOKE", shift = At.Shift.BEFORE, @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) cancellable = true)
private void onGenerate(ServerLevel level, BlockPos pos, BlockState blockState, RandomSource random, CallbackInfo ci) private void onGenerate(ServerLevel level, BlockPos pos, BlockState blockState, RandomSource random, CallbackInfo ci)
{ {
src/main/java/carpet/mixins/ServerPlayerGameMode_scarpetEventsMixin.java
+4 -4
View File
@@ -40,13 +40,13 @@ public class ServerPlayerGameMode_scarpetEventsMixin implements ServerPlayerInte
@Inject(method = "destroyBlock", locals = LocalCapture.CAPTURE_FAILHARD, cancellable = true, at = @At( @Inject(method = "destroyBlock", locals = LocalCapture.CAPTURE_FAILHARD, cancellable = true, at = @At(
value = "INVOKE", 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 shift = At.Shift.BEFORE
)) ))
private void onBlockBroken(BlockPos blockPos_1, CallbackInfoReturnable<Boolean> cir, BlockState blockState_1, BlockEntity be, Block b) private void onBlockBroken(final BlockPos blockPos, final CallbackInfoReturnable<Boolean> cir, final BlockEntity blockEntity, final Block block, final BlockState blockState)
{ {
if(PLAYER_BREAK_BLOCK.onBlockBroken(player, blockPos_1, blockState_1)) { if(PLAYER_BREAK_BLOCK.onBlockBroken(player, blockPos, blockState)) {
this.level.sendBlockUpdated(blockPos_1, blockState_1, blockState_1, 3); this.level.sendBlockUpdated(blockPos, blockState, blockState, 3);
cir.setReturnValue(false); cir.setReturnValue(false);
cir.cancel(); cir.cancel();
} }
src/main/java/carpet/utils/Messenger.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class Messenger
BLACK ('k', (s, f) -> s.withColor(ChatFormatting.BLACK)), BLACK ('k', (s, f) -> s.withColor(ChatFormatting.BLACK)),
COLOR ('#', (s, f) -> { COLOR ('#', (s, f) -> {
TextColor color = TextColor.parseColor("#"+f); TextColor color = TextColor.parseColor("#"+f).getOrThrow(false, LOG::warn);
return color == null ? s : s.withColor(color); return color == null ? s : s.withColor(color);
}, s -> { }, s -> {
Matcher m = colorExtract.matcher(s); Matcher m = colorExtract.matcher(s);