From 1591a73c38ec474b301f59f83b38b53a56cd1e56 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Wed, 4 Jun 2025 17:15:54 +0200 Subject: [PATCH] teleport items on the clientside as well --- .../item/ItemWirelessUltraTerminal.java | 4 +- .../github/inventory/item/WirelessMagnet.java | 53 ++++++++++--------- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java index 828a8b5b..c6001b01 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java @@ -274,9 +274,9 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal @Override public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int slot, boolean p_77663_5_) { - if (Platform.isServer() && entityIn instanceof EntityPlayer player) { + if (entityIn instanceof EntityPlayer player) { if (WirelessMagnet.getMode(stack) != WirelessMagnet.Mode.Off) { - WirelessMagnet.doMagnet(stack, player.worldObj, player); + WirelessMagnet.doMagnet(stack, player); } } } diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java index 17aca745..692feca1 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java @@ -52,9 +52,10 @@ public class WirelessMagnet { return data.hasKey(modeKey); } - public static void doMagnet(ItemStack wirelessTerm, World world, EntityPlayer player) { - if (wirelessTerm == null || player == null || player.ticksExisted % 5 != 0 || player.isSneaking() || !isConfigured(wirelessTerm)) return; + public static void doMagnet(ItemStack wirelessTerm, EntityPlayer player) { + if (player.ticksExisted % 5 != 0 || player.isSneaking() || !isConfigured(wirelessTerm)) return; + World world = player.worldObj; final List items = getEntitiesInRange( EntityItem.class, world, @@ -95,31 +96,33 @@ public class WirelessMagnet { 0.5F * ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 2F)); } - // xp - final List xpOrbs = getEntitiesInRange( - EntityXPOrb.class, - world, - (int) player.posX, - (int) player.posY, - (int) player.posZ, - magnetRange); + if (!world.isRemote) { + // xp + final List xpOrbs = getEntitiesInRange( + EntityXPOrb.class, + world, + (int) player.posX, + (int) player.posY, + (int) player.posZ, + magnetRange); - for (EntityXPOrb xpToGet : xpOrbs) { - if (xpToGet.field_70532_c == 0 && xpToGet.isEntityAlive()) { - if (!skipPlayerCheck) { - EntityPlayer closestPlayer = world.getClosestPlayerToEntity(xpToGet, magnetRange); - if (closestPlayer == null || closestPlayer != player) continue; + for (EntityXPOrb xpToGet : xpOrbs) { + if (xpToGet.field_70532_c == 0 && xpToGet.isEntityAlive()) { + if (!skipPlayerCheck) { + EntityPlayer closestPlayer = world.getClosestPlayerToEntity(xpToGet, magnetRange); + if (closestPlayer == null || closestPlayer != player) continue; + } + + if (MinecraftForge.EVENT_BUS.post(new PlayerPickupXpEvent(player, xpToGet))) continue; + world.playSoundAtEntity( + player, + "random.orb", + 0.1F, + 0.5F * ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.8F)); + player.onItemPickup(xpToGet, 1); + player.addExperience(xpToGet.xpValue); + xpToGet.setDead(); } - - if (MinecraftForge.EVENT_BUS.post(new PlayerPickupXpEvent(player, xpToGet))) continue; - world.playSoundAtEntity( - player, - "random.orb", - 0.1F, - 0.5F * ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.8F)); - player.onItemPickup(xpToGet, 1); - player.addExperience(xpToGet.xpValue); - xpToGet.setDead(); } } }