From 66ba36d6a022132b06830fb0fd6eebad159fdd0d Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Wed, 25 Jan 2023 22:36:52 +0100 Subject: [PATCH] quick fix : 'while' loop replaceable with enhanced 'for' loop --- .../tconstruct/blocks/traps/Landmine.java | 30 +++++++++++-------- .../library/component/TankLayerScan.java | 6 ++-- .../tconstruct/library/crafting/AlloyMix.java | 11 ++----- .../library/crafting/FluidType.java | 17 +++++------ .../library/crafting/ShapelessToolRecipe.java | 7 ++--- .../library/modifier/ItemModifier.java | 9 ++---- .../library/tools/AbilityHelper.java | 7 ++--- .../tconstruct/library/tools/ToolCore.java | 8 ++--- .../mechworks/blocks/BlockLandmine.java | 16 +++------- .../inventory/ContainerLandmine.java | 7 ++--- .../mechworks/landmine/behavior/Behavior.java | 12 ++------ .../landmine/behavior/BehaviorPotion.java | 8 ++--- .../mechworks/logic/LandmineExplodeLogic.java | 4 +-- .../logic/LandmineSpecialStackLogic.java | 5 +--- .../tconstruct/smeltery/TinkerSmeltery.java | 8 ++--- .../tconstruct/smeltery/gui/SmelteryGui.java | 5 ++-- .../tools/entity/LaunchedPotion.java | 13 +++----- 17 files changed, 62 insertions(+), 111 deletions(-) diff --git a/src/main/java/tconstruct/blocks/traps/Landmine.java b/src/main/java/tconstruct/blocks/traps/Landmine.java index 280ca1c3..9418158c 100644 --- a/src/main/java/tconstruct/blocks/traps/Landmine.java +++ b/src/main/java/tconstruct/blocks/traps/Landmine.java @@ -1,18 +1,26 @@ package tconstruct.blocks.traps; -import cpw.mods.fml.relauncher.*; -import java.util.*; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import mantle.blocks.MantleBlock; import mantle.world.WorldHelper; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockFence; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.*; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EnumCreatureType; import net.minecraft.init.Blocks; -import net.minecraft.util.*; -import net.minecraft.world.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; import tconstruct.library.TConstructRegistry; +import java.util.List; +import java.util.Random; + public class Landmine extends MantleBlock { /** The mob type that can trigger this pressure plate. */ private EnumCreatureType triggerMobType; @@ -147,7 +155,7 @@ public class Landmine extends MantleBlock { boolean var5 = world.getBlockMetadata(posX, posY, posZ) == 1; boolean var6 = false; float var7 = 0.125F; - List var8 = null; + List var8 = null; if (this.triggerMobType == EnumCreatureType.creature) { var8 = world.getEntitiesWithinAABBExcludingEntity( @@ -182,12 +190,8 @@ public class Landmine extends MantleBlock { * 1) - var7))); } */ - if (!var8.isEmpty()) { - Iterator var9 = var8.iterator(); - - while (var9.hasNext()) { - Entity var10 = (Entity) var9.next(); - + if (var8 != null && !var8.isEmpty()) { + for (Entity var10 : var8) { if (!var10.doesEntityNotTriggerPressurePlate()) { var6 = true; break; diff --git a/src/main/java/tconstruct/library/component/TankLayerScan.java b/src/main/java/tconstruct/library/component/TankLayerScan.java index 61e2f712..71ffeaa2 100644 --- a/src/main/java/tconstruct/library/component/TankLayerScan.java +++ b/src/main/java/tconstruct/library/component/TankLayerScan.java @@ -381,11 +381,9 @@ public class TankLayerScan extends LogicComponent { /** Do any necessary cleanup here. Remove air blocks, invalidate servants, etc */ public void cleanup() { - Iterator i = blockCoords.iterator(); - while (i.hasNext()) { - CoordTuple coord = (CoordTuple) i.next(); + for (CoordTuple coord : blockCoords) { TileEntity te = world.getTileEntity(coord.x, coord.y, coord.z); - if (te != null && te instanceof IServantLogic) { + if (te instanceof IServantLogic) { ((IServantLogic) te).invalidateMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); } } diff --git a/src/main/java/tconstruct/library/crafting/AlloyMix.java b/src/main/java/tconstruct/library/crafting/AlloyMix.java index 61f01362..458af45f 100644 --- a/src/main/java/tconstruct/library/crafting/AlloyMix.java +++ b/src/main/java/tconstruct/library/crafting/AlloyMix.java @@ -21,11 +21,8 @@ public class AlloyMix { ArrayList copyMix = new ArrayList(mixers); ArrayList effectiveAmount = new ArrayList(); - for (int i = 0; i < liquids.size(); i++) { - FluidStack liquid = liquids.get(i); - Iterator iter = copyMix.iterator(); - while (iter.hasNext()) { - FluidStack mixer = (FluidStack) iter.next(); + for (FluidStack liquid : liquids) { + for (FluidStack mixer : copyMix) { if (mixer.isFluidEqual(liquid)) { // do we actually have enough of that liquid? if (liquid.amount < mixer.amount) break; @@ -46,9 +43,7 @@ public class AlloyMix { for (int i = 0; i < liquids.size(); i++) { FluidStack liquid = liquids.get(i); - Iterator iter = copyMix2.iterator(); - while (iter.hasNext()) { - FluidStack mixer = (FluidStack) iter.next(); + for (FluidStack mixer : copyMix2) { // if (mixer.itemID == liquid.itemID && mixer.itemMeta == // liquid.itemMeta) if (mixer.isFluidEqual(liquid)) { diff --git a/src/main/java/tconstruct/library/crafting/FluidType.java b/src/main/java/tconstruct/library/crafting/FluidType.java index e19913eb..47b9f3cd 100644 --- a/src/main/java/tconstruct/library/crafting/FluidType.java +++ b/src/main/java/tconstruct/library/crafting/FluidType.java @@ -36,20 +36,19 @@ public class FluidType { } public static FluidType getFluidType(Fluid searchedFluid) { - Iterator iter = fluidTypes.entrySet().iterator(); - while (iter.hasNext()) { - Map.Entry pairs = (Map.Entry) iter.next(); - if (((FluidType) pairs.getValue()).fluid.equals(searchedFluid)) return (FluidType) pairs.getValue(); + for (Map.Entry stringFluidTypeEntry : fluidTypes.entrySet()) { + if (stringFluidTypeEntry.getValue().fluid.equals(searchedFluid)) { + return stringFluidTypeEntry.getValue(); + } } return null; } public static int getTemperatureByFluid(Fluid searchedFluid) { - Iterator iter = fluidTypes.entrySet().iterator(); - while (iter.hasNext()) { - Map.Entry pairs = (Map.Entry) iter.next(); - if (((FluidType) pairs.getValue()).fluid.equals(searchedFluid)) - return ((FluidType) pairs.getValue()).baseTemperature; + for (Map.Entry stringFluidTypeEntry : fluidTypes.entrySet()) { + if (stringFluidTypeEntry.getValue().fluid.equals(searchedFluid)) { + return stringFluidTypeEntry.getValue().baseTemperature; + } } return 800; } diff --git a/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java b/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java index b46c1291..6d7a898b 100644 --- a/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java +++ b/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java @@ -22,7 +22,7 @@ public class ShapelessToolRecipe extends ShapelessRecipes { @Override public boolean matches(InventoryCrafting par1InventoryCrafting, World par2World) { - ArrayList arraylist = new ArrayList(this.recipeItems); + ArrayList arraylist = new ArrayList<>(this.recipeItems); for (int i = 0; i < 3; ++i) { for (int j = 0; j < 3; ++j) { @@ -30,11 +30,8 @@ public class ShapelessToolRecipe extends ShapelessRecipes { if (itemstack != null) { boolean flag = false; - Iterator iterator = arraylist.iterator(); - - while (iterator.hasNext()) { - ItemStack itemstack1 = (ItemStack) iterator.next(); + for (ItemStack itemstack1 : arraylist) { // TConstruct.logger.info("Rawr! "+itemstack1.getItemDamage()); if (itemstack.getItem() == itemstack1.getItem()) { if (itemstack.getItem() instanceof ToolCore) { diff --git a/src/main/java/tconstruct/library/modifier/ItemModifier.java b/src/main/java/tconstruct/library/modifier/ItemModifier.java index 0d9969c9..2011a5b8 100644 --- a/src/main/java/tconstruct/library/modifier/ItemModifier.java +++ b/src/main/java/tconstruct/library/modifier/ItemModifier.java @@ -32,21 +32,18 @@ public abstract class ItemModifier { public boolean matches(ItemStack[] recipe, ItemStack input) { if (!canModify(input, recipe)) return false; - ArrayList list = new ArrayList(this.stacks); + ArrayList list = new ArrayList<>(this.stacks); for (int iter = 0; iter < recipe.length; ++iter) { ItemStack craftingStack = recipe[iter]; if (craftingStack != null) { boolean canCraft = false; - Iterator iterate = list.iterator(); - - while (iterate.hasNext()) { - ItemStack removeStack = (ItemStack) iterate.next(); + for (ItemStack removeStack : list) { if (craftingStack.getItem() == removeStack.getItem() && (removeStack.getItemDamage() == Short.MAX_VALUE - || craftingStack.getItemDamage() == removeStack.getItemDamage())) { + || craftingStack.getItemDamage() == removeStack.getItemDamage())) { canCraft = true; list.remove(removeStack); break; diff --git a/src/main/java/tconstruct/library/tools/AbilityHelper.java b/src/main/java/tconstruct/library/tools/AbilityHelper.java index bb15fe91..f26584ee 100644 --- a/src/main/java/tconstruct/library/tools/AbilityHelper.java +++ b/src/main/java/tconstruct/library/tools/AbilityHelper.java @@ -310,7 +310,7 @@ public class AbilityHelper { } if (!(living instanceof EntityPlayer) || player.canAttackPlayer((EntityPlayer) living)) { - List var6 = player.worldObj.getEntitiesWithinAABB( + List var6 = player.worldObj.getEntitiesWithinAABB( EntityWolf.class, AxisAlignedBB.getBoundingBox( player.posX, @@ -320,11 +320,8 @@ public class AbilityHelper { player.posY + 1.0D, player.posZ + 1.0D) .expand(16.0D, 4.0D, 16.0D)); - Iterator var4 = var6.iterator(); - - while (var4.hasNext()) { - EntityWolf var5 = (EntityWolf) var4.next(); + for (EntityWolf var5 : var6) { if (var5.isTamed() && var5.getEntityToAttack() == null && player.getDisplayName().equals(var5.func_152113_b()) diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index 8964b1cc..b1f6eb14 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -439,11 +439,9 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IEq @Override public void getSubItems(Item id, CreativeTabs tab, List list) { - Iterator iter = TConstructRegistry.toolMaterials.entrySet().iterator(); - while (iter.hasNext()) { - Map.Entry pairs = (Map.Entry) iter.next(); - tconstruct.library.tools.ToolMaterial material = (tconstruct.library.tools.ToolMaterial) pairs.getValue(); - buildTool((Integer) pairs.getKey(), ToolBuilder.defaultToolName(material, this), list); + for (Map.Entry integerToolMaterialEntry : TConstructRegistry.toolMaterials.entrySet()) { + tconstruct.library.tools.ToolMaterial material = integerToolMaterialEntry.getValue(); + buildTool(integerToolMaterialEntry.getKey(), ToolBuilder.defaultToolName(material, this), list); } } diff --git a/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java b/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java index b2306195..1f2cb713 100644 --- a/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java +++ b/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java @@ -447,7 +447,7 @@ public class BlockLandmine extends BlockContainer { } if (triggerType != null) { - List list = null; + List list = null; if (triggerType == Sensitivity.everything) { list = par1World.getEntitiesWithinAABBExcludingEntity( @@ -465,11 +465,7 @@ public class BlockLandmine extends BlockContainer { } if (list != null && !list.isEmpty()) { - Iterator iterator = list.iterator(); - - while (iterator.hasNext()) { - Entity entity = (Entity) iterator.next(); - + for (Entity entity : list) { if (!entity.doesEntityNotTriggerPressurePlate()) { return 1; } @@ -543,7 +539,7 @@ public class BlockLandmine extends BlockContainer { } if (triggerType != null) { - List list = null; + List list = null; if (triggerType == Sensitivity.everything) { list = par1World.getEntitiesWithinAABBExcludingEntity( @@ -564,11 +560,7 @@ public class BlockLandmine extends BlockContainer { } if (list != null && !list.isEmpty()) { - Iterator iterator = list.iterator(); - - while (iterator.hasNext()) { - Entity entity = (Entity) iterator.next(); - + for (Entity entity : list) { if (!entity.doesEntityNotTriggerPressurePlate()) { return entity; } diff --git a/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java b/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java index 65052276..029eed25 100644 --- a/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java +++ b/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java @@ -20,7 +20,7 @@ public class ContainerLandmine extends Container { public EntityPlayer entityPlayer; private int field_94536_g; private int field_94535_f = -1; - private final Set field_94537_h = new HashSet(); + private final Set field_94537_h = new HashSet<>(); public ContainerLandmine(EntityPlayer player, TileEntityLandmine te) { this.te = te; @@ -128,11 +128,8 @@ public class ContainerLandmine extends Container { if (!this.field_94537_h.isEmpty()) { itemstack1 = inventoryplayer.getItemStack().copy(); l = inventoryplayer.getItemStack().stackSize; - Iterator iterator = this.field_94537_h.iterator(); - - while (iterator.hasNext()) { - Slot slot1 = (Slot) iterator.next(); + for (Slot slot1 : this.field_94537_h) { if (slot1 != null && func_94527_a(slot1, inventoryplayer.getItemStack(), true) && slot1.isItemValid(inventoryplayer.getItemStack()) diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java b/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java index e3735873..8440b1a9 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java @@ -51,10 +51,8 @@ public abstract class Behavior { // Make sure the part below this comment is executed last(to avoid // conflicts) - Iterator i1 = Block.blockRegistry.iterator(); - while (i1.hasNext()) { - Object ob = i1.next(); - if (ob != null && ob instanceof Block) { + for (Object ob : Block.blockRegistry) { + if (ob instanceof Block) { Block b = (Block) ob; if (b.getMaterial().isOpaque() && b.renderAsNormalBlock() @@ -191,15 +189,11 @@ public abstract class Behavior { } public static final boolean arrayContainsEqualStack(ArrayList stacks, ItemStack item) { - Iterator i1 = stacks.iterator(); - - while (i1.hasNext()) { - ItemStack stack = i1.next(); + for (ItemStack stack : stacks) { if (stack.isItemEqual(item)) { return true; } } - return false; } diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPotion.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPotion.java index 981b8a69..bfddd1cb 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPotion.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPotion.java @@ -46,13 +46,9 @@ public class BehaviorPotion extends Behavior { Items.potionitem.onEaten(par5ItemStack, par1World, (EntityPlayer) triggerer); } else if (triggerer instanceof EntityLivingBase) { if (!par1World.isRemote) { - List list = Items.potionitem.getEffects(par5ItemStack); - + List list = Items.potionitem.getEffects(par5ItemStack); if (list != null) { - Iterator iterator = list.iterator(); - - while (iterator.hasNext()) { - PotionEffect potioneffect = (PotionEffect) iterator.next(); + for (PotionEffect potioneffect : list) { ((EntityLivingBase) triggerer).addPotionEffect(new PotionEffect(potioneffect)); } } diff --git a/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java b/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java index 67296028..5dc9bd60 100644 --- a/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java +++ b/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java @@ -77,9 +77,7 @@ public class LandmineExplodeLogic { new LandmineSpecialStackLogic(worldObj, x, y, z, triggerer, isOffensive, stacks); specialStacks.handleSpecialStacks(); - Iterator i1 = stacks.iterator(); - while (i1.hasNext()) { - ItemStack currentStack = i1.next(); + for (ItemStack currentStack : stacks) { Behavior b = Behavior.getBehaviorFromStack(currentStack); if (b != null) { if (isOffensive || !b.isOffensive(currentStack)) { diff --git a/src/main/java/tconstruct/mechworks/logic/LandmineSpecialStackLogic.java b/src/main/java/tconstruct/mechworks/logic/LandmineSpecialStackLogic.java index ae1788ab..df429c29 100644 --- a/src/main/java/tconstruct/mechworks/logic/LandmineSpecialStackLogic.java +++ b/src/main/java/tconstruct/mechworks/logic/LandmineSpecialStackLogic.java @@ -34,10 +34,7 @@ public class LandmineSpecialStackLogic { } public void handleSpecialStacks() { - Iterator i1 = SpecialStackHandler.handlers.iterator(); - - while (i1.hasNext()) { - SpecialStackHandler h = i1.next(); + for (SpecialStackHandler h : SpecialStackHandler.handlers) { if (isOffensive || !h.isOffensive(stackEffects)) { h.checkStack(worldObj, x, y, z, triggerer, stackEffects); } diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java index c13148cd..5bb98fa4 100644 --- a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java +++ b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java @@ -828,12 +828,10 @@ public class TinkerSmeltery { FluidType.getFluidType("Slime"), FluidType.getFluidType("Obsidian") }); - Iterator iter = FluidType.fluidTypes.entrySet().iterator(); - while (iter.hasNext()) { - Map.Entry pairs = (Map.Entry) iter.next(); - FluidType ft = (FluidType) pairs.getValue(); + for (Map.Entry stringFluidTypeEntry : FluidType.fluidTypes.entrySet()) { + FluidType ft = stringFluidTypeEntry.getValue(); if (exceptions.contains(ft)) continue; - String fluidTypeName = (String) pairs.getKey(); + String fluidTypeName = stringFluidTypeEntry.getKey(); // Nuggets Smeltery.addDictionaryMelting("nugget" + fluidTypeName, ft, -100, TConstruct.nuggetLiquidValue); diff --git a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java index edd4fc4d..a12d7ae2 100644 --- a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java +++ b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java @@ -405,10 +405,9 @@ public class SmelteryGui extends ActiveContainerGui { GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_DEPTH_TEST); int k = 0; - Iterator iterator = par1List.iterator(); - while (iterator.hasNext()) { - String s = (String) iterator.next(); + for (Object o : par1List) { + String s = (String) o; int l = this.fontRendererObj.getStringWidth(s); if (l > k) { diff --git a/src/main/java/tconstruct/tools/entity/LaunchedPotion.java b/src/main/java/tconstruct/tools/entity/LaunchedPotion.java index ca245dec..fba98c6d 100644 --- a/src/main/java/tconstruct/tools/entity/LaunchedPotion.java +++ b/src/main/java/tconstruct/tools/entity/LaunchedPotion.java @@ -84,17 +84,15 @@ public class LaunchedPotion extends EntityThrowable { @Override protected void onImpact(MovingObjectPosition par1MovingObjectPosition) { if (!this.worldObj.isRemote) { - List list = Items.potionitem.getEffects(this.potionDamage); + List list = Items.potionitem.getEffects(this.potionDamage); if (list != null && !list.isEmpty()) { AxisAlignedBB axisalignedbb = this.boundingBox.expand(4.0D, 2.0D, 4.0D); - List list1 = this.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb); + List list1 = this.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb); if (list1 != null && !list1.isEmpty()) { - Iterator iterator = list1.iterator(); - while (iterator.hasNext()) { - EntityLivingBase entityliving = (EntityLivingBase) iterator.next(); + for (EntityLivingBase entityliving : list1) { double d0 = this.getDistanceSqToEntity(entityliving); if (d0 < 16.0D) { @@ -104,10 +102,7 @@ public class LaunchedPotion extends EntityThrowable { d1 = 1.0D; } - Iterator iterator1 = list.iterator(); - - while (iterator1.hasNext()) { - PotionEffect potioneffect = (PotionEffect) iterator1.next(); + for (PotionEffect potioneffect : list) { int i = potioneffect.getPotionID(); if (Potion.potionTypes[i].isInstant()) {