From 64ffb277633d2ab2293d4b7d3bc745b359bbb2c5 Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 15 Apr 2020 02:12:57 -0300 Subject: [PATCH] mappings --- gradle.properties | 2 +- .../java/carpet/helpers/EntityPlayerActionPack.java | 3 +-- src/main/java/carpet/logging/Logger.java | 2 +- .../mixins/FishingBobberEntity_extremeMixin.java | 2 +- src/main/java/carpet/script/CarpetExpression.java | 2 +- src/main/java/carpet/utils/Messenger.java | 12 ++++++------ 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/gradle.properties b/gradle.properties index d197e465..0be2d325 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx1G # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html minecraft_version=20w15a - yarn_mappings=20w15a+build.4 + yarn_mappings=20w15a+build.7 loader_version=0.8.2+build.194 # Mod Properties diff --git a/src/main/java/carpet/helpers/EntityPlayerActionPack.java b/src/main/java/carpet/helpers/EntityPlayerActionPack.java index 4e02446c..349c32e9 100644 --- a/src/main/java/carpet/helpers/EntityPlayerActionPack.java +++ b/src/main/java/carpet/helpers/EntityPlayerActionPack.java @@ -344,8 +344,7 @@ public class EntityPlayerActionPack BlockHitResult blockHit = (BlockHitResult) hit; BlockPos pos = blockHit.getBlockPos(); Direction side = blockHit.getSide(); - // rather should be canNotMine - if (player.canMine(player.world, pos, player.interactionManager.getGameMode())) return false; + if (player.isBlockBreakingRestricted(player.world, pos, player.interactionManager.getGameMode())) return false; if (ap.currentBlock != null && player.world.getBlockState(ap.currentBlock).isAir()) { ap.currentBlock = null; diff --git a/src/main/java/carpet/logging/Logger.java b/src/main/java/carpet/logging/Logger.java index 62d46f61..c29d0a4b 100644 --- a/src/main/java/carpet/logging/Logger.java +++ b/src/main/java/carpet/logging/Logger.java @@ -181,7 +181,7 @@ public class Logger public void sendPlayerMessage(ServerPlayerEntity player, BaseText ... messages) { - Arrays.stream(messages).forEach(player::sendMessage); + Arrays.stream(messages).forEach(player::sendSystemMessage); } /** diff --git a/src/main/java/carpet/mixins/FishingBobberEntity_extremeMixin.java b/src/main/java/carpet/mixins/FishingBobberEntity_extremeMixin.java index 514428fb..0fafca63 100644 --- a/src/main/java/carpet/mixins/FishingBobberEntity_extremeMixin.java +++ b/src/main/java/carpet/mixins/FishingBobberEntity_extremeMixin.java @@ -1,7 +1,7 @@ package carpet.mixins; import carpet.utils.RandomTools; -import net.minecraft.entity.FishingBobberEntity; +import net.minecraft.entity.projectile.FishingBobberEntity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index 56f6b2af..2408a469 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/src/main/java/carpet/script/CarpetExpression.java @@ -364,7 +364,7 @@ public class CarpetExpression if ((block_1 instanceof CommandBlock || block_1 instanceof StructureBlock || block_1 instanceof JigsawBlock) && !player.isCreativeLevelTwoOp()) { player.world.updateListeners(blockPos_1, blockState_1, blockState_1, 3); return false; - } else if (player.canMine(player.world, blockPos_1, player.interactionManager.getGameMode())) { + } else if (player.isBlockBreakingRestricted(player.world, blockPos_1, player.interactionManager.getGameMode())) { return false; } else { block_1.onBreak(player.world, blockPos_1, blockState_1, player); diff --git a/src/main/java/carpet/utils/Messenger.java b/src/main/java/carpet/utils/Messenger.java index 3b422262..f553d3a8 100644 --- a/src/main/java/carpet/utils/Messenger.java +++ b/src/main/java/carpet/utils/Messenger.java @@ -228,7 +228,7 @@ public class Messenger } public static void m(PlayerEntity player, Object ... fields) { - player.sendMessage(Messenger.c(fields)); + player.sendSystemMessage(Messenger.c(fields)); } /* @@ -272,7 +272,7 @@ public class Messenger public static void send(PlayerEntity player, Collection lines) { - lines.forEach(player::sendMessage); + lines.forEach(player::sendSystemMessage); } public static void send(ServerCommandSource source, Collection lines) { @@ -284,21 +284,21 @@ public class Messenger { if (server == null) LOG.error("Message not delivered: "+message); - server.sendMessage(new LiteralText(message)); + server.sendSystemMessage(new LiteralText(message)); BaseText txt = c("gi "+message); for (PlayerEntity entityplayer : server.getPlayerManager().getPlayerList()) { - entityplayer.sendMessage(txt); + entityplayer.sendSystemMessage(txt); } } public static void print_server_message(MinecraftServer server, BaseText message) { if (server == null) LOG.error("Message not delivered: "+message.getString()); - server.sendMessage(message); + server.sendSystemMessage(message); for (PlayerEntity entityplayer : server.getPlayerManager().getPlayerList()) { - entityplayer.sendMessage(message); + entityplayer.sendSystemMessage(message); } } }