From c6783e573c37f2b24f1a19c4275da70472cfb8a6 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 20 Oct 2016 23:18:49 -0700 Subject: [PATCH] Use Collections.addAll --- src/main/java/binnie/core/AbstractMod.java | 13 ++++--------- src/main/java/binnie/core/machines/MachineUtil.java | 9 +++------ .../java/binnie/core/machines/ManagerMachine.java | 4 +--- .../craftgui/botany/WindowBotanistDatabase.java | 5 ++--- .../craftgui/controls/button/ControlEnumButton.java | 5 ++--- .../dictionary/ControlBreweryProgress.java | 6 +++--- .../binnie/extrabees/genetics/ExtraBeeMutation.java | 5 ++--- .../binnie/extrabees/genetics/ExtraBeesFlowers.java | 4 +--- .../java/binnie/extrabees/worldgen/HiveDrop.java | 5 ++--- .../java/binnie/extratrees/block/WoodManager.java | 13 ++++--------- .../java/binnie/extratrees/core/ModuleCore.java | 9 +++------ .../java/binnie/genetics/gui/AnalystPageFruit.java | 9 +++------ 12 files changed, 30 insertions(+), 57 deletions(-) diff --git a/src/main/java/binnie/core/AbstractMod.java b/src/main/java/binnie/core/AbstractMod.java index 0f2bb916..7697b19c 100644 --- a/src/main/java/binnie/core/AbstractMod.java +++ b/src/main/java/binnie/core/AbstractMod.java @@ -15,6 +15,7 @@ import net.minecraftforge.fml.relauncher.Side; import java.lang.reflect.Field; import java.util.ArrayList; +import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; @@ -72,18 +73,12 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { for (final IInitializable module : this.modules) { module.preInit(); } - for (final Field field : this.getClass().getFields()) { - this.fields.add(field); - } + Collections.addAll(this.fields, this.getClass().getFields()); for (final Class cls : this.getClass().getClasses()) { - for (final Field field2 : this.getClass().getFields()) { - this.fields.add(field2); - } + Collections.addAll(this.fields, this.getClass().getFields()); } for (final IInitializable module : this.modules) { - for (final Field field3 : module.getClass().getFields()) { - this.fields.add(field3); - } + Collections.addAll(this.fields, module.getClass().getFields()); } for (final Field field4 : this.fields) { try { diff --git a/src/main/java/binnie/core/machines/MachineUtil.java b/src/main/java/binnie/core/machines/MachineUtil.java index 3080e207..4880f914 100644 --- a/src/main/java/binnie/core/machines/MachineUtil.java +++ b/src/main/java/binnie/core/machines/MachineUtil.java @@ -13,6 +13,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidTank; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Random; @@ -123,13 +124,9 @@ public class MachineUtil { public boolean hasIngredients(final int[] recipe, final int[] inventory) { final ItemStackSet requiredStacks = new ItemStackSet(); - for (final ItemStack stack : this.getStacks(recipe)) { - requiredStacks.add(stack); - } + Collections.addAll(requiredStacks, this.getStacks(recipe)); final ItemStackSet inventoryStacks = new ItemStackSet(); - for (final ItemStack stack2 : this.getStacks(inventory)) { - inventoryStacks.add(stack2); - } + Collections.addAll(inventoryStacks, this.getStacks(inventory)); requiredStacks.removeAll(inventoryStacks); return requiredStacks.isEmpty(); } diff --git a/src/main/java/binnie/core/machines/ManagerMachine.java b/src/main/java/binnie/core/machines/ManagerMachine.java index bab6305b..f6bb0bc7 100644 --- a/src/main/java/binnie/core/machines/ManagerMachine.java +++ b/src/main/java/binnie/core/machines/ManagerMachine.java @@ -47,9 +47,7 @@ public class ManagerMachine extends ManagerBase { } final Set> interfaces = new HashSet<>(); for (Class currentClass = component; currentClass != null; currentClass = null) { - for (final Class clss : currentClass.getInterfaces()) { - interfaces.add(clss); - } + Collections.addAll(interfaces, currentClass.getInterfaces()); currentClass = currentClass.getSuperclass(); if (currentClass == Object.class) { } diff --git a/src/main/java/binnie/craftgui/botany/WindowBotanistDatabase.java b/src/main/java/binnie/craftgui/botany/WindowBotanistDatabase.java index d5caed44..899d9b78 100644 --- a/src/main/java/binnie/craftgui/botany/WindowBotanistDatabase.java +++ b/src/main/java/binnie/craftgui/botany/WindowBotanistDatabase.java @@ -16,6 +16,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.relauncher.Side; import java.util.ArrayList; +import java.util.Collections; import java.util.List; public class WindowBotanistDatabase extends WindowAbstractDatabase { @@ -48,9 +49,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase { } }; final List colors = new ArrayList<>(); - for (final IFlowerColour c : EnumFlowerColor.values()) { - colors.add(c); - } + Collections.addAll(colors, EnumFlowerColor.values()); this.listBox.setOptions(colors); } }); diff --git a/src/main/java/binnie/craftgui/controls/button/ControlEnumButton.java b/src/main/java/binnie/craftgui/controls/button/ControlEnumButton.java index fb574cfe..4ed737c7 100644 --- a/src/main/java/binnie/craftgui/controls/button/ControlEnumButton.java +++ b/src/main/java/binnie/craftgui/controls/button/ControlEnumButton.java @@ -6,6 +6,7 @@ import binnie.craftgui.events.EventMouse; import binnie.craftgui.events.EventValueChanged; import java.util.ArrayList; +import java.util.Collections; import java.util.List; public class ControlEnumButton extends ControlButton implements IControlValue { @@ -41,9 +42,7 @@ public class ControlEnumButton extends ControlButton implements IControlValue public ControlEnumButton(final IWidget parent, final float x, final float y, final float width, final float height, final T[] values) { super(parent, x, y, width, height, ""); this.enumConstants = new ArrayList<>(); - for (final T value : values) { - this.enumConstants.add(value); - } + Collections.addAll(this.enumConstants, values); if (values.length > 0) { this.currentSelection = values[0]; } diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlBreweryProgress.java b/src/main/java/binnie/craftgui/extratrees/dictionary/ControlBreweryProgress.java index 13095587..505bfd01 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlBreweryProgress.java +++ b/src/main/java/binnie/craftgui/extratrees/dictionary/ControlBreweryProgress.java @@ -17,6 +17,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; +import java.util.Collections; + public class ControlBreweryProgress extends ControlProgressBase { static Texture Brewery; static Texture BreweryOverlay; @@ -47,9 +49,7 @@ public class ControlBreweryProgress extends ControlProgressBase { this.renderFluid(binnie.extratrees.machines.Brewery.getOutput(logic.currentCrafting), new IPoint(17.0f, 22.0f)); GL11.glDisable(3089); final ItemStackSet stacks = new ItemStackSet(); - for (final ItemStack stack : logic.currentCrafting.inputs) { - stacks.add(stack); - } + Collections.addAll(stacks, logic.currentCrafting.inputs); stacks.add(logic.currentCrafting.ingr); int x = 1; int y = 6; diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java b/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java index f46faeb3..8bf506bf 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java @@ -12,6 +12,7 @@ import net.minecraftforge.common.BiomeDictionary; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; public class ExtraBeeMutation implements IBeeMutation { @@ -270,9 +271,7 @@ public class ExtraBeeMutation implements IBeeMutation { public Collection getSpecialConditions() { final List conditions = new ArrayList<>(); if (this.req != null) { - for (final String s : this.req.tooltip()) { - conditions.add(s); - } + Collections.addAll(conditions, this.req.tooltip()); } return conditions; } diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java index 29a63780..d8ba258a 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java @@ -210,9 +210,7 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo public ItemStack[] affectProducts(World world, IIndividual individual, BlockPos pos, ItemStack[] products) { if (this == ExtraBeesFlowers.Mystical) { final List prods = new ArrayList<>(); - for (final ItemStack stack : products) { - prods.add(stack); - } + Collections.addAll(prods, products); for (int k = 0; k < 50; ++k) { final int tX = 7; final int tY = 7; diff --git a/src/main/java/binnie/extrabees/worldgen/HiveDrop.java b/src/main/java/binnie/extrabees/worldgen/HiveDrop.java index fdbd9546..8fa16b90 100644 --- a/src/main/java/binnie/extrabees/worldgen/HiveDrop.java +++ b/src/main/java/binnie/extrabees/worldgen/HiveDrop.java @@ -11,6 +11,7 @@ import net.minecraft.world.IBlockAccess; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; public class HiveDrop implements IHiveDrop { private IAllele[] template; @@ -28,9 +29,7 @@ public class HiveDrop implements IHiveDrop { } this.template = template; this.chance = chance; - for (final ItemStack stack : bonus) { - this.additional.add(stack); - } + Collections.addAll(this.additional, bonus); } @Override diff --git a/src/main/java/binnie/extratrees/block/WoodManager.java b/src/main/java/binnie/extratrees/block/WoodManager.java index 977586aa..e91060c7 100644 --- a/src/main/java/binnie/extratrees/block/WoodManager.java +++ b/src/main/java/binnie/extratrees/block/WoodManager.java @@ -11,6 +11,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import java.util.ArrayList; +import java.util.Collections; import java.util.List; public class WoodManager { @@ -92,20 +93,14 @@ public class WoodManager { public static List getAllPlankTypes() { final List list = new ArrayList<>(); - for (final IPlankType type : PlankType.ExtraTreePlanks.values()) { - list.add(type); - } - for (final IPlankType type : PlankType.ForestryPlanks.values()) { - list.add(type); - } + Collections.addAll(list, PlankType.ExtraTreePlanks.values()); + Collections.addAll(list, PlankType.ForestryPlanks.values()); for (final IPlankType type : PlankType.ExtraBiomesPlank.values()) { if (type.getStack() != null) { list.add(type); } } - for (final IPlankType type : PlankType.VanillaPlanks.values()) { - list.add(type); - } + Collections.addAll(list, PlankType.VanillaPlanks.values()); return list; } diff --git a/src/main/java/binnie/extratrees/core/ModuleCore.java b/src/main/java/binnie/extratrees/core/ModuleCore.java index 4d546e7d..b333ed12 100644 --- a/src/main/java/binnie/extratrees/core/ModuleCore.java +++ b/src/main/java/binnie/extratrees/core/ModuleCore.java @@ -16,6 +16,7 @@ import forestry.api.arboriculture.IWoodType; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; +import java.util.Collections; import java.util.LinkedList; import java.util.Queue; @@ -42,13 +43,9 @@ public class ModuleCore implements IInitializable { speciesQueue.add(s); } final Queue logQueue = new LinkedList<>(); - for (final IWoodType wood : EnumExtraTreeLog.values()) { - logQueue.add(wood); - } + Collections.addAll(logQueue, EnumExtraTreeLog.values()); final Queue plankQueue = new LinkedList<>(); - for (final IDesignMaterial wood2 : PlankType.ExtraTreePlanks.values()) { - plankQueue.add(wood2); - } + Collections.addAll(plankQueue, PlankType.ExtraTreePlanks.values()); final Queue fruitQueue = new LinkedList<>(); for (final ExtraTreeFruitGene wood3 : ExtraTreeFruitGene.values()) { fruitQueue.add(wood3); diff --git a/src/main/java/binnie/genetics/gui/AnalystPageFruit.java b/src/main/java/binnie/genetics/gui/AnalystPageFruit.java index 22f1ae8c..be11bcb1 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageFruit.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageFruit.java @@ -19,6 +19,7 @@ import net.minecraft.item.ItemStack; import java.lang.reflect.Field; import java.util.Collection; +import java.util.Collections; public class AnalystPageFruit extends AnalystPageProduce { public AnalystPageFruit(final IWidget parent, final IArea area, final ITree ind) { @@ -44,9 +45,7 @@ public class AnalystPageFruit extends AnalystPageProduce { final FruitProviderPod pod = (FruitProviderPod) ind.getGenome().getFruitProvider(); final Field f = FruitProviderPod.class.getDeclaredField("drop"); f.setAccessible(true); - for (final ItemStack stack2 : (ItemStack[]) f.get(pod)) { - products.add(stack2); - } + Collections.addAll(products, (ItemStack[]) f.get(pod)); } } catch (Exception e) { e.printStackTrace(); @@ -115,9 +114,7 @@ public class AnalystPageFruit extends AnalystPageProduce { final FruitProviderPod pod2 = (FruitProviderPod) ((IAlleleFruit) a).getProvider(); final Field field = FruitProviderPod.class.getDeclaredField("drop"); field.setAccessible(true); - for (final ItemStack stack4 : (ItemStack[]) field.get(pod2)) { - stacks.add(stack4); - } + Collections.addAll(stacks, (ItemStack[]) field.get(pod2)); } } catch (Exception ex) { }