minecraft-mods/totem_of_reviving
Private
Public Access
1
0
Fork 0
Code Issues Projects Releases 2 Wiki Activity

ReviveTargetPacket & ChangeTargetPacket:

Browse Source 
- Replaces old sendMessage with new sendSystemMessage.
- Replaced old TextComponents with Component.literal.
This commit is contained in:
Micle
2022-11-03 21:30:22 +00:00
parent 514966fc5f
commit 600cd282df
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/dev/micle/totemofreviving/network/client/ChangeTargetPacket.java
View File

@ -4,8 +4,12 @@ import dev.micle.totemofreviving.TotemOfReviving;
import dev.micle.totemofreviving.item.totem.TotemItem; import dev.micle.totemofreviving.item.totem.TotemItem;
import dev.micle.totemofreviving.network.NetworkManager; import dev.micle.totemofreviving.network.NetworkManager;
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import net.minecraft.client.gui.components.ChatComponent;
import net.minecraft.network.FriendlyByteBuf; 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.level.ServerPlayer;
import net.minecraft.server.players.PlayerList; import net.minecraft.server.players.PlayerList;
import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionHand;
@ -47,7 +51,7 @@ public class ChangeTargetPacket {
TotemItem.setTargetName(totemStack, target.getDisplayName().getString()); TotemItem.setTargetName(totemStack, target.getDisplayName().getString());
TotemItem.setTargetDeaths(totemStack, target); 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); context.setPacketHandled(true);
} }

13
src/main/java/dev/micle/totemofreviving/network/client/ReviveTargetPacket.java
View File

@ -2,10 +2,9 @@ package dev.micle.totemofreviving.network.client;
import dev.micle.totemofreviving.TotemOfReviving; import dev.micle.totemofreviving.TotemOfReviving;
import dev.micle.totemofreviving.item.totem.TotemItem; import dev.micle.totemofreviving.item.totem.TotemItem;
import dev.micle.totemofreviving.network.NetworkManager;
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import net.minecraft.network.FriendlyByteBuf; 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.server.level.ServerPlayer;
import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionHand;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
@ -41,23 +40,23 @@ public class ReviveTargetPacket {
target = TotemOfReviving.getProxy().getServer().getPlayerList().getPlayer(TotemItem.getTargetUUID(totemStack)); target = TotemOfReviving.getProxy().getServer().getPlayerList().getPlayer(TotemItem.getTargetUUID(totemStack));
if (target == null) { throw new NullPointerException("Target is null!"); } if (target == null) { throw new NullPointerException("Target is null!"); }
} catch (NullPointerException exception) { } 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; return;
} }
if (!target.isSpectator()) { 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; return;
} }
if (!target.getLevel().equals(sender.getLevel()) && !TotemItem.canReviveAcrossDimensions(totemStack)) { 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; return;
} }
TotemItem.setTargetDeaths(totemStack, target); TotemItem.setTargetDeaths(totemStack, target);
if (!TotemItem.canTotemAffordTarget(totemStack)) { 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; return;
} }
@ -65,7 +64,7 @@ public class ReviveTargetPacket {
target.setGameMode(sender.getLevel().getServer().getDefaultGameType()); target.setGameMode(sender.getLevel().getServer().getDefaultGameType());
TotemItem.setCharge(totemStack, TotemItem.getCharge(totemStack) - TotemItem.getTargetCost(totemStack)); TotemItem.setCharge(totemStack, TotemItem.getCharge(totemStack) - TotemItem.getTargetCost(totemStack));
totemStack.hurtAndBreak(1, sender, e -> e.broadcastBreakEvent(packet.hand)); 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); context.setPacketHandled(true);
} }