From 3708d497556311bd00fcb90ba449eb358fa48d0e Mon Sep 17 00:00:00 2001 From: micle Date: Sun, 21 Nov 2021 07:48:12 +0000 Subject: [PATCH] Updated mappings (back) to official. --- .../data/ModRecipeProvider.java | 74 +++++++++---------- .../items/RevivingChargeItem.java | 2 +- .../items/StrawChargeItem.java | 2 +- .../totemofreviving/items/StrawTotemItem.java | 26 +++---- .../items/TotemOfRevivingItem.java | 26 +++---- .../network/C2SRequestPlayerRevive.java | 34 ++++----- .../network/C2SRequestTotemCharge.java | 18 ++--- .../network/C2SRequestTotemTarget.java | 14 ++-- 8 files changed, 98 insertions(+), 98 deletions(-) diff --git a/src/main/java/dev/micle/totemofreviving/data/ModRecipeProvider.java b/src/main/java/dev/micle/totemofreviving/data/ModRecipeProvider.java index 74a34d1..68405af 100755 --- a/src/main/java/dev/micle/totemofreviving/data/ModRecipeProvider.java +++ b/src/main/java/dev/micle/totemofreviving/data/ModRecipeProvider.java @@ -12,42 +12,42 @@ public class ModRecipeProvider extends RecipeProvider { } @Override - protected void registerRecipes(Consumer consumer) { - ShapedRecipeBuilder.shapedRecipe(ModItems.TOTEM_OF_REVIVING.get()) - .key('#', Items.TOTEM_OF_UNDYING) - .key('@', Items.DIAMOND) - .patternLine("@@@") - .patternLine("@#@") - .patternLine("@@@") - .addCriterion("has_item", hasItem(Items.TOTEM_OF_UNDYING)) - .build(consumer); - ShapedRecipeBuilder.shapedRecipe(ModItems.REVIVING_CHARGE.get()) - .key('#', Items.TOTEM_OF_UNDYING) - .key('@', Items.DIAMOND_BLOCK) - .key('E', Items.ENDER_PEARL) - .patternLine("@E@") - .patternLine("E#E") - .patternLine("@E@") - .addCriterion("has_item", hasItem(ModItems.TOTEM_OF_REVIVING.get())) - .build(consumer); - ShapedRecipeBuilder.shapedRecipe(ModItems.STRAW_TOTEM.get()) - .key('W', Items.WHEAT) - .key('/', Items.STICK) - .key('S', Items.STRING) - .key('N', Items.IRON_NUGGET) - .patternLine("NSN") - .patternLine("NWN") - .patternLine("N/N") - .addCriterion("has_item", hasItem(Items.WHEAT)) - .build(consumer); - ShapedRecipeBuilder.shapedRecipe(ModItems.STRAW_CHARGE.get()) - .key('W', Items.WHEAT) - .key('E', Items.EMERALD) - .key('I', Items.IRON_INGOT) - .patternLine("IWI") - .patternLine("WEW") - .patternLine("IWI") - .addCriterion("has_item", hasItem(Items.EMERALD)) - .build(consumer); + protected void buildShapelessRecipes(Consumer consumer) { + ShapedRecipeBuilder.shaped(ModItems.TOTEM_OF_REVIVING.get()) + .define('#', Items.TOTEM_OF_UNDYING) + .define('@', Items.DIAMOND) + .pattern("@@@") + .pattern("@#@") + .pattern("@@@") + .unlockedBy("has_item", has(Items.TOTEM_OF_UNDYING)) + .save(consumer); + ShapedRecipeBuilder.shaped(ModItems.REVIVING_CHARGE.get()) + .define('#', Items.TOTEM_OF_UNDYING) + .define('@', Items.DIAMOND_BLOCK) + .define('E', Items.ENDER_PEARL) + .pattern("@E@") + .pattern("E#E") + .pattern("@E@") + .unlockedBy("has_item", has(ModItems.TOTEM_OF_REVIVING.get())) + .save(consumer); + ShapedRecipeBuilder.shaped(ModItems.STRAW_TOTEM.get()) + .define('W', Items.WHEAT) + .define('/', Items.STICK) + .define('S', Items.STRING) + .define('N', Items.IRON_NUGGET) + .pattern("NSN") + .pattern("NWN") + .pattern("N/N") + .unlockedBy("has_item", has(Items.WHEAT)) + .save(consumer); + ShapedRecipeBuilder.shaped(ModItems.STRAW_CHARGE.get()) + .define('W', Items.WHEAT) + .define('E', Items.EMERALD) + .define('I', Items.IRON_INGOT) + .pattern("IWI") + .pattern("WEW") + .pattern("IWI") + .unlockedBy("has_item", has(Items.EMERALD)) + .save(consumer); } } diff --git a/src/main/java/dev/micle/totemofreviving/items/RevivingChargeItem.java b/src/main/java/dev/micle/totemofreviving/items/RevivingChargeItem.java index 8a941b2..784ec44 100755 --- a/src/main/java/dev/micle/totemofreviving/items/RevivingChargeItem.java +++ b/src/main/java/dev/micle/totemofreviving/items/RevivingChargeItem.java @@ -6,6 +6,6 @@ import net.minecraft.item.Rarity; public class RevivingChargeItem extends Item { public RevivingChargeItem() { - super(new Item.Properties().group(ItemGroup.MISC).rarity(Rarity.RARE)); + super(new Item.Properties().tab(ItemGroup.TAB_MISC).rarity(Rarity.RARE)); } } diff --git a/src/main/java/dev/micle/totemofreviving/items/StrawChargeItem.java b/src/main/java/dev/micle/totemofreviving/items/StrawChargeItem.java index f3f9810..9a2da94 100755 --- a/src/main/java/dev/micle/totemofreviving/items/StrawChargeItem.java +++ b/src/main/java/dev/micle/totemofreviving/items/StrawChargeItem.java @@ -6,6 +6,6 @@ import net.minecraft.item.Rarity; public class StrawChargeItem extends Item { public StrawChargeItem() { - super(new Item.Properties().group(ItemGroup.MISC).rarity(Rarity.UNCOMMON)); + super(new Item.Properties().tab(ItemGroup.TAB_MISC).rarity(Rarity.UNCOMMON)); } } diff --git a/src/main/java/dev/micle/totemofreviving/items/StrawTotemItem.java b/src/main/java/dev/micle/totemofreviving/items/StrawTotemItem.java index ce71aae..e60d80b 100755 --- a/src/main/java/dev/micle/totemofreviving/items/StrawTotemItem.java +++ b/src/main/java/dev/micle/totemofreviving/items/StrawTotemItem.java @@ -32,18 +32,18 @@ public class StrawTotemItem extends Item { public static final int STARTING_FAIL_CHANCE = 45; public StrawTotemItem() { - super(new Item.Properties().group(ItemGroup.MISC).maxStackSize(1).rarity(Rarity.UNCOMMON)); + super(new Item.Properties().tab(ItemGroup.TAB_MISC).stacksTo(1).rarity(Rarity.UNCOMMON)); } @Override - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { + super.appendHoverText(stack, world, tooltip, flag); tooltip.add(new StringTextComponent(TextFormatting.GOLD + "Charges: " + TextFormatting.GRAY + stack.getOrCreateTag().getInt(TAG_CHARGE_AMOUNT))); tooltip.add(new StringTextComponent(TextFormatting.GOLD + "Target: " + TextFormatting.GRAY + stack.getOrCreateTag().getString(TAG_TARGET_NAME))); tooltip.add(new StringTextComponent(TextFormatting.GOLD + "Fail Chance: " + TextFormatting.GRAY + stack.getOrCreateTag().getInt(TAG_FAIL_CHANCE))); tooltip.add(new StringTextComponent( TextFormatting.DARK_GRAY + "" + TextFormatting.ITALIC + "\"Feels kinda funky.\"")); tooltip.add(new StringTextComponent("")); - if (InputMappings.isKeyDown(Minecraft.getInstance().getMainWindow().getHandle(), GLFW.GLFW_KEY_LEFT_SHIFT)) { + if (InputMappings.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_KEY_LEFT_SHIFT)) { tooltip.add(new StringTextComponent(TextFormatting.YELLOW + "R-CLICK")); tooltip.add(new StringTextComponent(TextFormatting.GOLD + "When other hand is empty: attempt to revive target.")); tooltip.add(new StringTextComponent(TextFormatting.GOLD + "When other hand has " + TextFormatting.GRAY + "Straw Reviving Charge" + TextFormatting.GOLD + ": charge totem.")); @@ -56,31 +56,31 @@ public class StrawTotemItem extends Item { } @Override - public void onCreated(ItemStack stack, World world, PlayerEntity player) { - super.onCreated(stack, world, player); + public void onCraftedBy(ItemStack stack, World world, PlayerEntity player) { + super.onCraftedBy(stack, world, player); stack.getOrCreateTag().putInt(TAG_CHARGE_AMOUNT, 0); stack.getOrCreateTag().putInt(TAG_FAIL_CHANCE, STARTING_FAIL_CHANCE); } @Override @OnlyIn(Dist.CLIENT) - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - if (world.isRemote) { return super.onItemRightClick(world, player, hand); } + public ActionResult use(World world, PlayerEntity player, Hand hand) { + if (world.isClientSide) { return super.use(world, player, hand); } if (player.isCrouching()) { - TotemOfReviving.INSTANCE.sendToServer(new C2SRequestTotemTarget(player.getUniqueID(), hand)); + TotemOfReviving.INSTANCE.sendToServer(new C2SRequestTotemTarget(player.getUUID(), hand)); } else { Hand item_charge_hand = Hand.MAIN_HAND; if (hand.equals(Hand.MAIN_HAND)) { item_charge_hand = Hand.OFF_HAND; } - Item item_charge = player.getHeldItem(item_charge_hand).getItem(); + Item item_charge = player.getItemInHand(item_charge_hand).getItem(); if (item_charge instanceof StrawChargeItem) { - TotemOfReviving.INSTANCE.sendToServer(new C2SRequestTotemCharge(player.getUniqueID(), hand, item_charge_hand)); + TotemOfReviving.INSTANCE.sendToServer(new C2SRequestTotemCharge(player.getUUID(), hand, item_charge_hand)); } else { - TotemOfReviving.INSTANCE.sendToServer(new C2SRequestPlayerRevive(player.getUniqueID(), hand)); + TotemOfReviving.INSTANCE.sendToServer(new C2SRequestPlayerRevive(player.getUUID(), hand)); } } - return super.onItemRightClick(world, player, hand); + return super.use(world, player, hand); } } diff --git a/src/main/java/dev/micle/totemofreviving/items/TotemOfRevivingItem.java b/src/main/java/dev/micle/totemofreviving/items/TotemOfRevivingItem.java index 37bd83b..f5c64db 100755 --- a/src/main/java/dev/micle/totemofreviving/items/TotemOfRevivingItem.java +++ b/src/main/java/dev/micle/totemofreviving/items/TotemOfRevivingItem.java @@ -31,16 +31,16 @@ public class TotemOfRevivingItem extends Item { public static final String TAG_TARGET_NAME = "target_name"; public TotemOfRevivingItem() { - super(new Item.Properties().group(ItemGroup.MISC).maxStackSize(1).rarity(Rarity.RARE)); + super(new Item.Properties().tab(ItemGroup.TAB_MISC).stacksTo(1).rarity(Rarity.RARE)); } @Override - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { + super.appendHoverText(stack, world, tooltip, flag); tooltip.add(new StringTextComponent(TextFormatting.DARK_AQUA + "Charges: " + TextFormatting.BLUE + stack.getOrCreateTag().getInt(TAG_CHARGE_AMOUNT))); tooltip.add(new StringTextComponent(TextFormatting.DARK_AQUA + "Target: " + TextFormatting.BLUE + stack.getOrCreateTag().getString(TAG_TARGET_NAME))); tooltip.add(new StringTextComponent("")); - if (InputMappings.isKeyDown(Minecraft.getInstance().getMainWindow().getHandle(), GLFW.GLFW_KEY_LEFT_SHIFT)) { + if (InputMappings.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_KEY_LEFT_SHIFT)) { tooltip.add(new StringTextComponent(TextFormatting.AQUA + "R-CLICK")); tooltip.add(new StringTextComponent(TextFormatting.DARK_AQUA + "When other hand is empty: attempt to revive target.")); tooltip.add(new StringTextComponent(TextFormatting.DARK_AQUA + "When other hand has " + TextFormatting.BLUE + "Reviving Charge" + TextFormatting.DARK_AQUA + ": charge totem.")); @@ -53,30 +53,30 @@ public class TotemOfRevivingItem extends Item { } @Override - public void onCreated(ItemStack stack, World world, PlayerEntity player) { - super.onCreated(stack, world, player); + public void onCraftedBy(ItemStack stack, World world, PlayerEntity player) { + super.onCraftedBy(stack, world, player); stack.getOrCreateTag().putInt(TAG_CHARGE_AMOUNT, 0); } @Override @OnlyIn(Dist.CLIENT) - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - if (world.isRemote) { return super.onItemRightClick(world, player, hand); } + public ActionResult use(World world, PlayerEntity player, Hand hand) { + if (world.isClientSide) { return super.use(world, player, hand); } if (player.isCrouching()) { - TotemOfReviving.INSTANCE.sendToServer(new C2SRequestTotemTarget(player.getUniqueID(), hand)); + TotemOfReviving.INSTANCE.sendToServer(new C2SRequestTotemTarget(player.getUUID(), hand)); } else { Hand item_charge_hand = Hand.MAIN_HAND; if (hand.equals(Hand.MAIN_HAND)) { item_charge_hand = Hand.OFF_HAND; } - Item item_charge = player.getHeldItem(item_charge_hand).getItem(); + Item item_charge = player.getItemInHand(item_charge_hand).getItem(); if (item_charge instanceof RevivingChargeItem) { - TotemOfReviving.INSTANCE.sendToServer(new C2SRequestTotemCharge(player.getUniqueID(), hand, item_charge_hand)); + TotemOfReviving.INSTANCE.sendToServer(new C2SRequestTotemCharge(player.getUUID(), hand, item_charge_hand)); } else { - TotemOfReviving.INSTANCE.sendToServer(new C2SRequestPlayerRevive(player.getUniqueID(), hand)); + TotemOfReviving.INSTANCE.sendToServer(new C2SRequestPlayerRevive(player.getUUID(), hand)); } } - return super.onItemRightClick(world, player, hand); + return super.use(world, player, hand); } } diff --git a/src/main/java/dev/micle/totemofreviving/network/C2SRequestPlayerRevive.java b/src/main/java/dev/micle/totemofreviving/network/C2SRequestPlayerRevive.java index 8a752dd..fd38f9b 100755 --- a/src/main/java/dev/micle/totemofreviving/network/C2SRequestPlayerRevive.java +++ b/src/main/java/dev/micle/totemofreviving/network/C2SRequestPlayerRevive.java @@ -30,27 +30,27 @@ public class C2SRequestPlayerRevive { } public static void encode(final C2SRequestPlayerRevive msg, final PacketBuffer packet_buffer) { - packet_buffer.writeUniqueId(msg.player_uuid); - packet_buffer.writeEnumValue(msg.hand); + packet_buffer.writeUUID(msg.player_uuid); + packet_buffer.writeEnum(msg.hand); } public static C2SRequestPlayerRevive decode(final PacketBuffer packet_buffer) { - return new C2SRequestPlayerRevive(packet_buffer.readUniqueId(), packet_buffer.readEnumValue(Hand.class)); + return new C2SRequestPlayerRevive(packet_buffer.readUUID(), packet_buffer.readEnum(Hand.class)); } public static void handle(final C2SRequestPlayerRevive msg, final Supplier context_supplier) { final NetworkEvent.Context context = context_supplier.get(); context.enqueueWork(() -> { - final ServerPlayerEntity sender = TotemOfReviving.players.getPlayerByUUID(msg.player_uuid); + final ServerPlayerEntity sender = TotemOfReviving.players.getPlayer(msg.player_uuid); if (sender == null) { return; } - ItemStack item = sender.getHeldItem(msg.hand); - if (item.getOrCreateTag().getInt(TotemOfRevivingItem.TAG_TARGET_INDEX) > TotemOfReviving.players.getCurrentPlayerCount()-1 || item.getOrCreateTag().getString(TotemOfRevivingItem.TAG_TARGET_NAME).equals("")) { - sender.sendMessage(new StringTextComponent(TextFormatting.RED + "Error getting target! (Try selecting the target again)"), sender.getUniqueID()); + ItemStack item = sender.getItemInHand(msg.hand); + if (item.getOrCreateTag().getInt(TotemOfRevivingItem.TAG_TARGET_INDEX) > TotemOfReviving.players.getPlayerCount()-1 || item.getOrCreateTag().getString(TotemOfRevivingItem.TAG_TARGET_NAME).equals("")) { + sender.sendMessage(new StringTextComponent(TextFormatting.RED + "Error getting target! (Try selecting the target again)"), sender.getUUID()); } else { - ServerPlayerEntity player_to_revive = TotemOfReviving.players.getPlayerByUsername(item.getOrCreateTag().getString(TotemOfRevivingItem.TAG_TARGET_NAME)); - ServerWorld player_to_revive_world = player_to_revive.getServerWorld(); - ServerWorld sender_world = sender.getServerWorld(); + ServerPlayerEntity player_to_revive = TotemOfReviving.players.getPlayerByName(item.getOrCreateTag().getString(TotemOfRevivingItem.TAG_TARGET_NAME)); + ServerWorld player_to_revive_world = player_to_revive.getLevel(); + ServerWorld sender_world = sender.getLevel(); int required_charge = player_to_revive.getStats().getValue(Stats.CUSTOM.get(Stats.DEATHS)); if (player_to_revive.isSpectator()) { if (player_to_revive_world.equals(sender_world)) { @@ -60,24 +60,24 @@ public class C2SRequestPlayerRevive { if (Utils.randomIntRange(0, 100) <= fail_chance) { item.getOrCreateTag().putInt(StrawTotemItem.TAG_CHARGE_AMOUNT, item.getOrCreateTag().getInt(StrawTotemItem.TAG_CHARGE_AMOUNT)-required_charge); item.getOrCreateTag().putInt(StrawTotemItem.TAG_FAIL_CHANCE, fail_chance-(5*required_charge)); - sender.addPotionEffect(new EffectInstance(Effects.POISON, ((fail_chance*10) / 2), 1)); + sender.addEffect(new EffectInstance(Effects.POISON, ((fail_chance*10) / 2), 1)); return; } else { item.getOrCreateTag().putInt(StrawTotemItem.TAG_FAIL_CHANCE, fail_chance-(5*required_charge)); } } - player_to_revive.moveForced(sender.getPosX(), sender.getPosY(), sender.getPosZ()); - player_to_revive.setGameType(GameType.SURVIVAL); + player_to_revive.moveTo(sender.getX(), sender.getY(), sender.getZ()); + player_to_revive.setGameMode(GameType.SURVIVAL); item.getOrCreateTag().putInt(TotemOfRevivingItem.TAG_CHARGE_AMOUNT, item.getOrCreateTag().getInt(TotemOfRevivingItem.TAG_CHARGE_AMOUNT) - required_charge); - sender.sendMessage(new StringTextComponent(TextFormatting.GRAY + "Successfully revived " + TextFormatting.DARK_GRAY + player_to_revive.getDisplayName().getString()), sender.getUniqueID()); + sender.sendMessage(new StringTextComponent(TextFormatting.GRAY + "Successfully revived " + TextFormatting.DARK_GRAY + player_to_revive.getDisplayName().getString()), sender.getUUID()); } else { - sender.sendMessage(new StringTextComponent(TextFormatting.GRAY + "Not enough charge! Required charge is: " + TextFormatting.DARK_GRAY + required_charge), sender.getUniqueID()); + sender.sendMessage(new StringTextComponent(TextFormatting.GRAY + "Not enough charge! Required charge is: " + TextFormatting.DARK_GRAY + required_charge), sender.getUUID()); } } else { - sender.sendMessage(new StringTextComponent(TextFormatting.DARK_GRAY + player_to_revive.getDisplayName().getString() + TextFormatting.GRAY + " is not in this dimension!"), sender.getUniqueID()); + sender.sendMessage(new StringTextComponent(TextFormatting.DARK_GRAY + player_to_revive.getDisplayName().getString() + TextFormatting.GRAY + " is not in this dimension!"), sender.getUUID()); } } else { - sender.sendMessage(new StringTextComponent(TextFormatting.DARK_GRAY + player_to_revive.getDisplayName().getString() + TextFormatting.GRAY + " is not dead!"), sender.getUniqueID()); + sender.sendMessage(new StringTextComponent(TextFormatting.DARK_GRAY + player_to_revive.getDisplayName().getString() + TextFormatting.GRAY + " is not dead!"), sender.getUUID()); } } }); diff --git a/src/main/java/dev/micle/totemofreviving/network/C2SRequestTotemCharge.java b/src/main/java/dev/micle/totemofreviving/network/C2SRequestTotemCharge.java index 53724b2..86d54d5 100755 --- a/src/main/java/dev/micle/totemofreviving/network/C2SRequestTotemCharge.java +++ b/src/main/java/dev/micle/totemofreviving/network/C2SRequestTotemCharge.java @@ -28,31 +28,31 @@ public class C2SRequestTotemCharge { } public static void encode(final C2SRequestTotemCharge msg, final PacketBuffer packet_buffer) { - packet_buffer.writeUniqueId(msg.player_uuid); - packet_buffer.writeEnumValue(msg.hand); - packet_buffer.writeEnumValue(msg.item_charge_hand); + packet_buffer.writeUUID(msg.player_uuid); + packet_buffer.writeEnum(msg.hand); + packet_buffer.writeEnum(msg.item_charge_hand); } public static C2SRequestTotemCharge decode(final PacketBuffer packet_buffer) { - return new C2SRequestTotemCharge(packet_buffer.readUniqueId(), packet_buffer.readEnumValue(Hand.class), packet_buffer.readEnumValue(Hand.class)); + return new C2SRequestTotemCharge(packet_buffer.readUUID(), packet_buffer.readEnum(Hand.class), packet_buffer.readEnum(Hand.class)); } public static void handle(final C2SRequestTotemCharge msg, final Supplier context_supplier) { final NetworkEvent.Context context = context_supplier.get(); context.enqueueWork(() -> { - final ServerPlayerEntity sender = TotemOfReviving.players.getPlayerByUUID(msg.player_uuid); + final ServerPlayerEntity sender = TotemOfReviving.players.getPlayer(msg.player_uuid); if (sender == null) { return; } - ItemStack charge_item = sender.getHeldItem(msg.item_charge_hand); - ItemStack totem_item = sender.getHeldItem(msg.hand); + ItemStack charge_item = sender.getItemInHand(msg.item_charge_hand); + ItemStack totem_item = sender.getItemInHand(msg.hand); charge_item.setCount(charge_item.getCount()-1); totem_item.getOrCreateTag().putInt(TotemOfRevivingItem.TAG_CHARGE_AMOUNT, totem_item.getOrCreateTag().getInt(TotemOfRevivingItem.TAG_CHARGE_AMOUNT)+1); if (totem_item.getOrCreateTag().contains(StrawTotemItem.TAG_FAIL_CHANCE)) { int fail_chance = totem_item.getOrCreateTag().getInt(StrawTotemItem.TAG_FAIL_CHANCE); if (Utils.randomIntRange(0, 100) <= fail_chance) { - sender.setHeldItem(msg.hand, new ItemStack(Items.AIR)); - sender.addPotionEffect(new EffectInstance(Effects.POISON, ((fail_chance*10) / 2), 1)); + sender.setItemInHand(msg.hand, new ItemStack(Items.AIR)); + sender.addEffect(new EffectInstance(Effects.POISON, ((fail_chance*10) / 2), 1)); } else { totem_item.getOrCreateTag().putInt(StrawTotemItem.TAG_FAIL_CHANCE, fail_chance+5); } diff --git a/src/main/java/dev/micle/totemofreviving/network/C2SRequestTotemTarget.java b/src/main/java/dev/micle/totemofreviving/network/C2SRequestTotemTarget.java index c107bec..64a24f3 100755 --- a/src/main/java/dev/micle/totemofreviving/network/C2SRequestTotemTarget.java +++ b/src/main/java/dev/micle/totemofreviving/network/C2SRequestTotemTarget.java @@ -23,29 +23,29 @@ public class C2SRequestTotemTarget { } public static void encode(final C2SRequestTotemTarget msg, final PacketBuffer packet_buffer) { - packet_buffer.writeUniqueId(msg.player_uuid); - packet_buffer.writeEnumValue(msg.hand); + packet_buffer.writeUUID(msg.player_uuid); + packet_buffer.writeEnum(msg.hand); } public static C2SRequestTotemTarget decode(final PacketBuffer packet_buffer) { - return new C2SRequestTotemTarget(packet_buffer.readUniqueId(), packet_buffer.readEnumValue(Hand.class)); + return new C2SRequestTotemTarget(packet_buffer.readUUID(), packet_buffer.readEnum(Hand.class)); } public static void handle(final C2SRequestTotemTarget msg, final Supplier context_supplier) { final NetworkEvent.Context context = context_supplier.get(); context.enqueueWork(() -> { - final ServerPlayerEntity sender = TotemOfReviving.players.getPlayerByUUID(msg.player_uuid); + final ServerPlayerEntity sender = TotemOfReviving.players.getPlayer(msg.player_uuid); if (sender == null) { return; } - ItemStack item = sender.getHeldItem(msg.hand); + ItemStack item = sender.getItemInHand(msg.hand); int current_player_index = item.getOrCreateTag().getInt(TotemOfRevivingItem.TAG_TARGET_INDEX) + 1; - if (current_player_index > TotemOfReviving.players.getCurrentPlayerCount()-1) { + if (current_player_index > TotemOfReviving.players.getPlayerCount()-1) { current_player_index = 0; } item.getOrCreateTag().putInt(TotemOfRevivingItem.TAG_TARGET_INDEX, current_player_index); item.getOrCreateTag().putString(TotemOfRevivingItem.TAG_TARGET_NAME, TotemOfReviving.players.getPlayers().get(current_player_index).getDisplayName().getString()); - sender.sendMessage(new StringTextComponent(TextFormatting.GRAY + "Target: " + TextFormatting.DARK_GRAY + item.getOrCreateTag().getString(TotemOfRevivingItem.TAG_TARGET_NAME)), sender.getUniqueID()); + sender.sendMessage(new StringTextComponent(TextFormatting.GRAY + "Target: " + TextFormatting.DARK_GRAY + item.getOrCreateTag().getString(TotemOfRevivingItem.TAG_TARGET_NAME)), sender.getUUID()); }); context.setPacketHandled(true); }