From 600cd282dfc18f694fd15001d472baf85540f332 Mon Sep 17 00:00:00 2001 From: Micle Date: Thu, 3 Nov 2022 21:30:22 +0000 Subject: [PATCH] ReviveTargetPacket & ChangeTargetPacket: - Replaces old sendMessage with new sendSystemMessage. - Replaced old TextComponents with Component.literal. --- .../network/client/ChangeTargetPacket.java | 8 ++++++-- .../network/client/ReviveTargetPacket.java | 13 ++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/java/dev/micle/totemofreviving/network/client/ChangeTargetPacket.java b/src/main/java/dev/micle/totemofreviving/network/client/ChangeTargetPacket.java index cf26a6d..4785e9d 100644 --- a/src/main/java/dev/micle/totemofreviving/network/client/ChangeTargetPacket.java +++ b/src/main/java/dev/micle/totemofreviving/network/client/ChangeTargetPacket.java @@ -4,8 +4,12 @@ import dev.micle.totemofreviving.TotemOfReviving; import dev.micle.totemofreviving.item.totem.TotemItem; import dev.micle.totemofreviving.network.NetworkManager; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.components.ChatComponent; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.chat.TextComponent; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.network.chat.OutgoingPlayerChatMessage; +import net.minecraft.network.chat.PlayerChatMessage; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.players.PlayerList; import net.minecraft.world.InteractionHand; @@ -47,7 +51,7 @@ public class ChangeTargetPacket { TotemItem.setTargetName(totemStack, target.getDisplayName().getString()); TotemItem.setTargetDeaths(totemStack, target); - sender.sendMessage(new TextComponent(ChatFormatting.WHITE + "Now targetting " + ChatFormatting.GRAY + target.getDisplayName().getString() + "."), sender.getUUID()); + sender.sendSystemMessage(Component.literal(ChatFormatting.WHITE + "Now targetting " + ChatFormatting.GRAY + target.getDisplayName().getString() + ".")); }); context.setPacketHandled(true); } diff --git a/src/main/java/dev/micle/totemofreviving/network/client/ReviveTargetPacket.java b/src/main/java/dev/micle/totemofreviving/network/client/ReviveTargetPacket.java index da69a3c..82daa58 100644 --- a/src/main/java/dev/micle/totemofreviving/network/client/ReviveTargetPacket.java +++ b/src/main/java/dev/micle/totemofreviving/network/client/ReviveTargetPacket.java @@ -2,10 +2,9 @@ package dev.micle.totemofreviving.network.client; import dev.micle.totemofreviving.TotemOfReviving; import dev.micle.totemofreviving.item.totem.TotemItem; -import dev.micle.totemofreviving.network.NetworkManager; import net.minecraft.ChatFormatting; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.chat.TextComponent; +import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.item.ItemStack; @@ -41,23 +40,23 @@ public class ReviveTargetPacket { target = TotemOfReviving.getProxy().getServer().getPlayerList().getPlayer(TotemItem.getTargetUUID(totemStack)); if (target == null) { throw new NullPointerException("Target is null!"); } } catch (NullPointerException exception) { - sender.sendMessage(new TextComponent(ChatFormatting.WHITE + "Unable to find player!"), sender.getUUID()); + sender.sendSystemMessage(Component.literal(ChatFormatting.WHITE + "Unable to find player!")); return; } if (!target.isSpectator()) { - sender.sendMessage(new TextComponent(ChatFormatting.GRAY + target.getDisplayName().getString() + ChatFormatting.WHITE + " is not dead!"), sender.getUUID()); + sender.sendSystemMessage(Component.literal(ChatFormatting.GRAY + target.getDisplayName().getString() + ChatFormatting.WHITE + " is not dead!")); return; } if (!target.getLevel().equals(sender.getLevel()) && !TotemItem.canReviveAcrossDimensions(totemStack)) { - sender.sendMessage(new TextComponent(ChatFormatting.GRAY + target.getDisplayName().getString() + ChatFormatting.WHITE + " is in a different dimension!"), sender.getUUID()); + sender.sendSystemMessage(Component.literal(ChatFormatting.GRAY + target.getDisplayName().getString() + ChatFormatting.WHITE + " is in a different dimension!")); return; } TotemItem.setTargetDeaths(totemStack, target); if (!TotemItem.canTotemAffordTarget(totemStack)) { - sender.sendMessage(new TextComponent(ChatFormatting.WHITE + "Not enough charge!"), sender.getUUID()); + sender.sendSystemMessage(Component.literal(ChatFormatting.WHITE + "Not enough charge!")); return; } @@ -65,7 +64,7 @@ public class ReviveTargetPacket { target.setGameMode(sender.getLevel().getServer().getDefaultGameType()); TotemItem.setCharge(totemStack, TotemItem.getCharge(totemStack) - TotemItem.getTargetCost(totemStack)); totemStack.hurtAndBreak(1, sender, e -> e.broadcastBreakEvent(packet.hand)); - sender.sendMessage(new TextComponent(ChatFormatting.WHITE + "Successfully revived " + ChatFormatting.GRAY + target.getDisplayName().getString() + "!"), sender.getUUID()); + sender.sendSystemMessage(Component.literal(ChatFormatting.WHITE + "Successfully revived " + ChatFormatting.GRAY + target.getDisplayName().getString() + "!")); }); context.setPacketHandled(true); }