From 42616147aa5a2a4e1fad4c0170e1f267195fee05 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Wed, 4 Jun 2025 17:05:19 +0200 Subject: [PATCH] change while loops to for loops and correct the generic method signature --- .../github/inventory/item/WirelessMagnet.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) 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 062ba193..fb089b18 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java @@ -2,7 +2,6 @@ package com.glodblock.github.inventory.item; import static com.glodblock.github.common.Config.magnetRange; -import java.util.Iterator; import java.util.List; import net.minecraft.entity.item.EntityItem; @@ -34,7 +33,7 @@ public class WirelessMagnet { BlackList } - public static List getEntitiesInRange(Class entityType, World world, int x, int y, int z, int distance) { + private static List getEntitiesInRange(Class entityType, World world, int x, int y, int z, int distance) { return world.getEntitiesWithinAABB( entityType, AxisAlignedBB.getBoundingBox( @@ -54,19 +53,16 @@ public class WirelessMagnet { public static void doMagnet(ItemStack wirelessTerm, World world, EntityPlayer player) { if (wirelessTerm == null || player == null || player.ticksExisted % 5 != 0 || player.isSneaking() || !isConfigured(wirelessTerm)) return; - Iterator iterator = getEntitiesInRange( + final List items = getEntitiesInRange( EntityItem.class, world, (int) player.posX, (int) player.posY, (int) player.posZ, - magnetRange).iterator(); - + magnetRange); final boolean skipPlayerCheck = world.playerEntities.size() < 2; - while (iterator.hasNext()) { - EntityItem itemToGet = (EntityItem) iterator.next(); - + for (EntityItem itemToGet : items) { if (!skipPlayerCheck) { EntityPlayer closestPlayer = world.getClosestPlayerToEntity(itemToGet, magnetRange); if (closestPlayer == null || closestPlayer != player) continue; @@ -88,16 +84,15 @@ public class WirelessMagnet { } // xp - iterator = getEntitiesInRange( + final List xpOrbs = getEntitiesInRange( EntityXPOrb.class, world, (int) player.posX, (int) player.posY, (int) player.posZ, - magnetRange).iterator(); - while (iterator.hasNext()) { - EntityXPOrb xpToGet = (EntityXPOrb) iterator.next(); + magnetRange); + for (EntityXPOrb xpToGet : xpOrbs) { if (xpToGet.field_70532_c == 0 && xpToGet.isEntityAlive()) { if (!skipPlayerCheck) { EntityPlayer closestPlayer = world.getClosestPlayerToEntity(xpToGet, magnetRange);