diff --git a/src/main/java/forestry/apiculture/FlowerProviderVanilla.java b/src/main/java/forestry/apiculture/FlowerProviderVanilla.java index 90888b743..1698c85a4 100755 --- a/src/main/java/forestry/apiculture/FlowerProviderVanilla.java +++ b/src/main/java/forestry/apiculture/FlowerProviderVanilla.java @@ -106,7 +106,7 @@ public class FlowerProviderVanilla implements IFlowerProvider { @Override public ItemStack[] getItemStacks() { - return FlowerManager.plainFlowers.toArray(new ItemStack[0]); + return FlowerManager.plainFlowers.toArray(new ItemStack[FlowerManager.plainFlowers.size()]); } } diff --git a/src/main/java/forestry/apiculture/genetics/AIAvoidPlayers.java b/src/main/java/forestry/apiculture/genetics/AIAvoidPlayers.java index ad3dd3379..ae6433ab1 100755 --- a/src/main/java/forestry/apiculture/genetics/AIAvoidPlayers.java +++ b/src/main/java/forestry/apiculture/genetics/AIAvoidPlayers.java @@ -62,7 +62,7 @@ public class AIAvoidPlayers extends EntityAIBase { return false; pathing = pathNavigator.getPathToXYZ(randomTarget.xCoord, randomTarget.yCoord, randomTarget.zCoord); - return pathing == null ? false : pathing.isDestinationSame(randomTarget); + return pathing != null && pathing.isDestinationSame(randomTarget); } @Override diff --git a/src/main/java/forestry/apiculture/genetics/AlleleBeeSpecies.java b/src/main/java/forestry/apiculture/genetics/AlleleBeeSpecies.java index 27a740986..d8178791f 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleBeeSpecies.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleBeeSpecies.java @@ -10,20 +10,9 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Locale; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; - +import com.mojang.authlib.GameProfile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - -import com.mojang.authlib.GameProfile; - import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; @@ -40,6 +29,15 @@ import forestry.core.config.Defaults; import forestry.core.genetics.AlleleSpecies; import forestry.core.render.TextureManager; import forestry.core.utils.StackUtils; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Locale; public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies, IIconProvider { @@ -148,8 +146,7 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies @Override public ItemStack[] getResearchBounty(World world, GameProfile researcher, IIndividual individual, int bountyLevel) { ArrayList bounty = new ArrayList(); - for(ItemStack stack : super.getResearchBounty(world, researcher, individual, bountyLevel)) - bounty.add(stack); + Collections.addAll(bounty, super.getResearchBounty(world, researcher, individual, bountyLevel)); if(bountyLevel > 10) { for(ItemStack stack : specialty.keySet()) { @@ -159,7 +156,7 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies for(ItemStack stack : products.keySet()) { bounty.add(StackUtils.copyWithRandomSize(stack, (int)((float)bountyLevel / 2), world.rand)); } - return bounty.toArray(StackUtils.EMPTY_STACK_ARRAY); + return bounty.toArray(new ItemStack[bounty.size()]); } /* OTHER */ @@ -211,7 +208,7 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies if(EnumBeeType.values()[i] == EnumBeeType.NONE) continue; - icons[i][0] = TextureManager.getInstance().registerTex(register, "bees/" + iconType + "/" + EnumBeeType.values()[i].toString().toLowerCase(Locale.ENGLISH) + ".outline");; + icons[i][0] = TextureManager.getInstance().registerTex(register, "bees/" + iconType + "/" + EnumBeeType.values()[i].toString().toLowerCase(Locale.ENGLISH) + ".outline"); icons[i][1] = (EnumBeeType.values()[i] != EnumBeeType.LARVAE) ? body1 : TextureManager.getInstance().registerTex(register, "bees/" + iconType + "/" + EnumBeeType.values()[i].toString().toLowerCase(Locale.ENGLISH) + ".body"); icons[i][2] = TextureManager.getInstance().registerTex(register, "bees/" + iconType + "/" + EnumBeeType.values()[i].toString().toLowerCase(Locale.ENGLISH) + ".body2"); diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index 6c5b14643..cdfb5d460 100755 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -414,12 +414,13 @@ public class Bee extends IndividualLiving implements IBee { } - return products.toArray(new ItemStack[0]); + return products.toArray(new ItemStack[products.size()]); } @Override public ItemStack[] getSpecialtyList() { - return genome.getPrimary().getSpecialty().keySet().toArray(new ItemStack[0]); + Set specialties = genome.getPrimary().getSpecialty().keySet(); + return specialties.toArray(new ItemStack[specialties.size()]); } @Override @@ -460,7 +461,7 @@ public class Bee extends IndividualLiving implements IBee { // We are done if the we are not jubilant. if (!primary.isJubilant(genome, housing) || !secondary.isJubilant(genome, housing)) - return products.toArray(StackUtils.EMPTY_STACK_ARRAY); + return products.toArray(new ItemStack[products.size()]); // / Specialty products for (Map.Entry entry : primary.getSpecialty().entrySet()) @@ -468,7 +469,7 @@ public class Bee extends IndividualLiving implements IBee { products.add(entry.getKey().copy()); return genome.getFlowerProvider().affectProducts(housing.getWorld(), this, housing.getXCoord(), housing.getYCoord(), housing.getZCoord(), - products.toArray(StackUtils.EMPTY_STACK_ARRAY)); + products.toArray(new ItemStack[products.size()])); } /* REPRODUCTION */ @@ -512,7 +513,7 @@ public class Bee extends IndividualLiving implements IBee { } if (bees.size() > 0) - return bees.toArray(new IBee[0]); + return bees.toArray(new IBee[bees.size()]); else return null; } diff --git a/src/main/java/forestry/apiculture/genetics/HiveDrop.java b/src/main/java/forestry/apiculture/genetics/HiveDrop.java index ef296b9f7..d33fe0712 100755 --- a/src/main/java/forestry/apiculture/genetics/HiveDrop.java +++ b/src/main/java/forestry/apiculture/genetics/HiveDrop.java @@ -10,16 +10,16 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import java.util.ArrayList; - -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IHiveDrop; import forestry.api.genetics.IAllele; import forestry.plugins.PluginApiculture; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import java.util.ArrayList; +import java.util.Collections; public class HiveDrop implements IHiveDrop { @@ -32,8 +32,7 @@ public class HiveDrop implements IHiveDrop { this.template = template; this.chance = chance; - for (ItemStack stack : bonus) - this.additional.add(stack); + Collections.addAll(this.additional, bonus); } public HiveDrop setIgnobleShare(float share) { diff --git a/src/main/java/forestry/apiculture/gui/ContainerAlvearySwarmer.java b/src/main/java/forestry/apiculture/gui/ContainerAlvearySwarmer.java index 35b59afc6..bd1f62461 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerAlvearySwarmer.java +++ b/src/main/java/forestry/apiculture/gui/ContainerAlvearySwarmer.java @@ -10,13 +10,15 @@ ******************************************************************************/ package forestry.apiculture.gui; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; - import forestry.api.apiculture.BeeManager; import forestry.apiculture.gadgets.TileAlvearySwarmer; import forestry.core.gui.ContainerForestry; import forestry.core.gui.slots.SlotCustom; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +import java.util.Set; public class ContainerAlvearySwarmer extends ContainerForestry { @@ -39,6 +41,7 @@ public class ContainerAlvearySwarmer extends ContainerForestry { } private Object[] getInducerItems() { - return BeeManager.inducers.keySet().toArray(new Object[0]); + Set inducers = BeeManager.inducers.keySet(); + return inducers.toArray(new Object[inducers.size()]); } } diff --git a/src/main/java/forestry/arboriculture/CommandTreekeepingMode.java b/src/main/java/forestry/arboriculture/CommandTreekeepingMode.java index e2bcaf51a..ccb51a941 100755 --- a/src/main/java/forestry/arboriculture/CommandTreekeepingMode.java +++ b/src/main/java/forestry/arboriculture/CommandTreekeepingMode.java @@ -209,7 +209,6 @@ public class CommandTreekeepingMode extends CommandMC { help += mode.getName(); } sendChatMessage(sender, "Available modes: " + help); - return; } private void listModeInfo(ICommandSender sender, String[] arguments) { diff --git a/src/main/java/forestry/arboriculture/FruitProviderRandom.java b/src/main/java/forestry/arboriculture/FruitProviderRandom.java index e06a4df69..c9194eae2 100755 --- a/src/main/java/forestry/arboriculture/FruitProviderRandom.java +++ b/src/main/java/forestry/arboriculture/FruitProviderRandom.java @@ -10,17 +10,17 @@ ******************************************************************************/ package forestry.arboriculture; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.genetics.IFruitFamily; +import forestry.plugins.PluginArboriculture; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import forestry.api.arboriculture.ITreeGenome; -import forestry.api.genetics.IFruitFamily; -import forestry.plugins.PluginArboriculture; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; /** * Simple fruit provider which drops from any leaf block according to yield and either marks all leave blocks as fruit leaves or none. @@ -55,12 +55,13 @@ public class FruitProviderRandom extends FruitProviderNone { if (world.rand.nextFloat() <= genome.getYield() * modeYieldMod * entry.getValue()) product.add(entry.getKey().copy()); - return product.toArray(new ItemStack[0]); + return product.toArray(new ItemStack[product.size()]); } @Override public ItemStack[] getProducts() { - return products.keySet().toArray(new ItemStack[0]); + Set products = this.products.keySet(); + return products.toArray(new ItemStack[products.size()]); } @Override diff --git a/src/main/java/forestry/arboriculture/FruitProviderRipening.java b/src/main/java/forestry/arboriculture/FruitProviderRipening.java index f3a0432a0..3d7c83320 100755 --- a/src/main/java/forestry/arboriculture/FruitProviderRipening.java +++ b/src/main/java/forestry/arboriculture/FruitProviderRipening.java @@ -10,17 +10,17 @@ ******************************************************************************/ package forestry.arboriculture; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.genetics.IFruitFamily; +import forestry.plugins.PluginArboriculture; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import forestry.api.arboriculture.ITreeGenome; -import forestry.api.genetics.IFruitFamily; -import forestry.plugins.PluginArboriculture; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; public class FruitProviderRipening extends FruitProviderNone { @@ -73,12 +73,13 @@ public class FruitProviderRipening extends FruitProviderNone { if (world.rand.nextFloat() <= genome.getYield() * entry.getValue() * modeYieldMod * 5.0f * stage) product.add(entry.getKey().copy()); - return product.toArray(new ItemStack[0]); + return product.toArray(new ItemStack[product.size()]); } @Override public ItemStack[] getProducts() { - return products.keySet().toArray(new ItemStack[0]); + Set products = this.products.keySet(); + return products.toArray(new ItemStack[products.size()]); } @Override diff --git a/src/main/java/forestry/arboriculture/WorldGenHelper.java b/src/main/java/forestry/arboriculture/WorldGenHelper.java index 4da891ee6..0e3f725bc 100755 --- a/src/main/java/forestry/arboriculture/WorldGenHelper.java +++ b/src/main/java/forestry/arboriculture/WorldGenHelper.java @@ -10,14 +10,14 @@ ******************************************************************************/ package forestry.arboriculture; -import java.util.ArrayList; - -import net.minecraft.world.gen.feature.WorldGenerator; - import forestry.api.arboriculture.ITree; import forestry.api.genetics.IIndividual; import forestry.api.world.IWorldGenInterface; import forestry.plugins.PluginArboriculture; +import net.minecraft.world.gen.feature.WorldGenerator; + +import java.util.ArrayList; +import java.util.Collections; public class WorldGenHelper implements IWorldGenInterface { @@ -28,10 +28,9 @@ public class WorldGenHelper implements IWorldGenInterface { ArrayList> generators = new ArrayList>(); for (IIndividual tree : PluginArboriculture.treeInterface.getIndividualTemplates()) if (tree.getIdent().equals(ident)) - for (Class generator : ((ITree)tree).getGenome().getPrimary().getGeneratorClasses()) - generators.add(generator); + Collections.addAll(generators, ((ITree) tree).getGenome().getPrimary().getGeneratorClasses()); - return generators.toArray(new Class[0]); + return generators.toArray(new Class[generators.size()]); } } diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockArbFence.java b/src/main/java/forestry/arboriculture/gadgets/BlockArbFence.java index 0dc63586a..ade3bccf6 100755 --- a/src/main/java/forestry/arboriculture/gadgets/BlockArbFence.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockArbFence.java @@ -10,8 +10,12 @@ ******************************************************************************/ package forestry.arboriculture.gadgets; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; +import forestry.arboriculture.IWoodTyped; +import forestry.arboriculture.WoodType; +import forestry.plugins.PluginArboriculture; import net.minecraft.block.Block; import net.minecraft.block.BlockFence; import net.minecraft.block.material.Material; @@ -22,16 +26,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; -import forestry.api.core.Tabs; -import forestry.arboriculture.IWoodTyped; -import forestry.arboriculture.WoodType; -import forestry.plugins.PluginArboriculture; +import java.util.List; public class BlockArbFence extends BlockFence implements IWoodTyped { @@ -72,7 +69,7 @@ public class BlockArbFence extends BlockFence implements IWoodTyped { public boolean canConnectFenceTo(IBlockAccess world, int x, int y, int z) { if (!isFence(world, x, y, z)) { Block block = world.getBlock(x, y, z); - return block != null && block.getMaterial().isOpaque() && block.renderAsNormalBlock() ? block.getMaterial() != Material.gourd : false; + return block != null && block.getMaterial().isOpaque() && block.renderAsNormalBlock() && block.getMaterial() != Material.gourd; } else return true; } diff --git a/src/main/java/forestry/arboriculture/gadgets/ForestryBlockLeaves.java b/src/main/java/forestry/arboriculture/gadgets/ForestryBlockLeaves.java index b6804ddd1..652a3b447 100644 --- a/src/main/java/forestry/arboriculture/gadgets/ForestryBlockLeaves.java +++ b/src/main/java/forestry/arboriculture/gadgets/ForestryBlockLeaves.java @@ -10,10 +10,20 @@ ******************************************************************************/ package forestry.arboriculture.gadgets; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.arboriculture.EnumGermlingType; +import forestry.api.arboriculture.IToolGrafter; +import forestry.api.arboriculture.ITree; +import forestry.api.core.IToolScoop; +import forestry.api.core.Tabs; +import forestry.api.lepidopterology.EnumFlutterType; +import forestry.api.lepidopterology.IButterfly; +import forestry.core.proxy.Proxies; +import forestry.core.render.TextureManager; +import forestry.core.utils.StackUtils; +import forestry.plugins.PluginArboriculture; +import forestry.plugins.PluginLepidopterology; import net.minecraft.block.BlockNewLeaf; import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.renderer.texture.IIconRegister; @@ -28,24 +38,12 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; -import forestry.api.arboriculture.EnumGermlingType; -import forestry.api.arboriculture.IToolGrafter; -import forestry.api.arboriculture.ITree; -import forestry.api.core.IToolScoop; -import forestry.api.core.Tabs; -import forestry.api.lepidopterology.EnumFlutterType; -import forestry.api.lepidopterology.IButterfly; -import forestry.core.proxy.Proxies; -import forestry.core.render.TextureManager; -import forestry.core.utils.StackUtils; -import forestry.plugins.PluginArboriculture; -import forestry.plugins.PluginLepidopterology; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Random; public class ForestryBlockLeaves extends BlockNewLeaf implements ITileEntityProvider { @@ -149,8 +147,7 @@ public class ForestryBlockLeaves extends BlockNewLeaf implements ITileEntityProv // Add fruits if (tile.hasFruit()) - for (ItemStack stack : tile.getTree().produceStacks(world, x, y, z, tile.getRipeningTime())) - prod.add(stack); + Collections.addAll(prod, tile.getTree().produceStacks(world, x, y, z, tile.getRipeningTime())); return prod; } diff --git a/src/main/java/forestry/arboriculture/genetics/Tree.java b/src/main/java/forestry/arboriculture/genetics/Tree.java index 351169bab..993d6150a 100755 --- a/src/main/java/forestry/arboriculture/genetics/Tree.java +++ b/src/main/java/forestry/arboriculture/genetics/Tree.java @@ -311,7 +311,7 @@ public class Tree extends Individual implements ITree, ITreeGenData, IPlantable else prod.add(createOffspring(world, x, y, z)); - return prod.toArray(new ITree[0]); + return prod.toArray(new ITree[prod.size()]); } private ITree createOffspring(World world, int x, int y, int z) { diff --git a/src/main/java/forestry/core/circuits/CircuitBoard.java b/src/main/java/forestry/core/circuits/CircuitBoard.java index d72ba6ebe..744bffaff 100755 --- a/src/main/java/forestry/core/circuits/CircuitBoard.java +++ b/src/main/java/forestry/core/circuits/CircuitBoard.java @@ -10,17 +10,16 @@ ******************************************************************************/ package forestry.core.circuits; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; - import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuit; import forestry.api.circuits.ICircuitBoard; import forestry.api.circuits.ICircuitLayout; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; + +import java.util.ArrayList; +import java.util.List; public class CircuitBoard implements ICircuitBoard { @@ -80,7 +79,7 @@ public class CircuitBoard implements ICircuitBoard { readcircuits.add(ChipsetManager.circuitRegistry.getFromLegacyMap(nbttagcompound1.getInteger("I"))); } - circuits = readcircuits.toArray(new ICircuit[0]); + circuits = readcircuits.toArray(new ICircuit[readcircuits.size()]); return; } @@ -93,7 +92,7 @@ public class CircuitBoard implements ICircuitBoard { readcircuits.add(ChipsetManager.circuitRegistry.getCircuit(nbttagcompound1.getString("I"))); } - circuits = readcircuits.toArray(new ICircuit[0]); + circuits = readcircuits.toArray(new ICircuit[readcircuits.size()]); return; } diff --git a/src/main/java/forestry/core/circuits/ItemSolderingIron.java b/src/main/java/forestry/core/circuits/ItemSolderingIron.java index 8235b75f1..f10347eb5 100755 --- a/src/main/java/forestry/core/circuits/ItemSolderingIron.java +++ b/src/main/java/forestry/core/circuits/ItemSolderingIron.java @@ -199,7 +199,7 @@ public class ItemSolderingIron extends ItemForestry implements ISolderingIron { } circuits = getCircuits(type, true); - inventoryStacks[finishedSlot] = ItemCircuitBoard.createCircuitboard(type, layout, circuits.toArray(new ICircuit[0])); + inventoryStacks[finishedSlot] = ItemCircuitBoard.createCircuitboard(type, layout, circuits.toArray(new ICircuit[circuits.size()])); inventoryStacks[blankSlot] = null; } diff --git a/src/main/java/forestry/core/config/Configuration.java b/src/main/java/forestry/core/config/Configuration.java index 6c75a13bf..156063505 100755 --- a/src/main/java/forestry/core/config/Configuration.java +++ b/src/main/java/forestry/core/config/Configuration.java @@ -10,6 +10,9 @@ ******************************************************************************/ package forestry.core.config; +import forestry.core.proxy.Proxies; +import net.minecraftforge.common.config.Configuration.UnicodeInputStreamReader; + import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; @@ -22,10 +25,6 @@ import java.util.Locale; import java.util.Map; import java.util.TreeMap; -import net.minecraftforge.common.config.Configuration.UnicodeInputStreamReader; - -import forestry.core.proxy.Proxies; - public class Configuration { private String newLine; @@ -47,7 +46,7 @@ public class Configuration { return existing; // Create new property since none exists yet. - Property property = new Property(key, new Boolean(defaultVal).toString()); + Property property = new Property(key, Boolean.toString(defaultVal)); categorized.get(category).add(property); return property; } @@ -59,7 +58,7 @@ public class Configuration { return existing; // Create new property since none exists yet. - Property property = new Property(key, new Integer(defaultVal).toString()); + Property property = new Property(key, Integer.toString(defaultVal)); categorized.get(category).add(property); return property; } @@ -71,7 +70,7 @@ public class Configuration { return existing; // Create new property since none exists yet. - Property property = new Property(key, new Float(defaultVal).toString()); + Property property = new Property(key, Float.toString(defaultVal)); categorized.get(category).add(property); return property; } @@ -91,12 +90,12 @@ public class Configuration { public void set(String key, String category, boolean val) { Property existing = getExisting(key, category); if (existing != null) { - existing.Value = new Boolean(val).toString(); + existing.Value = Boolean.toString(val); return; } // Create new property since none exists yet. - Property property = new Property(key, new Boolean(val).toString()); + Property property = new Property(key, Boolean.toString(val)); categorized.get(category).add(property); } @@ -117,12 +116,12 @@ public class Configuration { public void set(String key, String category, int val) { Property existing = getExisting(key, category); if (existing != null) { - existing.Value = new Integer(val).toString(); + existing.Value = Integer.toString(val); return; } // Create new property since none exists yet. - Property property = new Property(key, new Integer(val).toString()); + Property property = new Property(key, Integer.toString(val)); categorized.get(category).add(property); } @@ -130,12 +129,12 @@ public class Configuration { public void set(String key, String category, float val) { Property existing = getExisting(key, category); if (existing != null) { - existing.Value = new Float(val).toString(); + existing.Value = Float.toString(val); return; } // Create new property since none exists yet. - Property property = new Property(key, new Float(val).toString()); + Property property = new Property(key, Float.toString(val)); categorized.get(category).add(property); } diff --git a/src/main/java/forestry/core/config/Version.java b/src/main/java/forestry/core/config/Version.java index d61390919..b9696cb74 100755 --- a/src/main/java/forestry/core/config/Version.java +++ b/src/main/java/forestry/core/config/Version.java @@ -199,7 +199,7 @@ public class Version { changelog.add(line); } - return changelog.toArray(new String[0]); + return changelog.toArray(new String[changelog.size()]); } catch (Exception ex) { // ex.printStackTrace(); diff --git a/src/main/java/forestry/core/gadgets/BlockSoil.java b/src/main/java/forestry/core/gadgets/BlockSoil.java index e7cf3721e..08d67af41 100755 --- a/src/main/java/forestry/core/gadgets/BlockSoil.java +++ b/src/main/java/forestry/core/gadgets/BlockSoil.java @@ -42,14 +42,11 @@ import forestry.core.render.TextureManager; /** * Humus, bog earth, peat - * - * @author - * */ public class BlockSoil extends Block implements IItemTyped { public enum SoilType { - HUMUS, BOG_EARTH, PEAT; + HUMUS, BOG_EARTH, PEAT } private static final int degradeDelimiter = 3; @@ -164,7 +161,7 @@ public class BlockSoil extends Block implements IItemTyped { // Repackage in format TTGG meta = (grade << 2 | type); - if (grade >= this.degradeDelimiter) + if (grade >= degradeDelimiter) world.setBlock(i, j, k, Blocks.sand, 0, Defaults.FLAG_BLOCK_SYNCH); else world.setBlockMetadataWithNotify(i, j, k, meta, Defaults.FLAG_BLOCK_SYNCH); diff --git a/src/main/java/forestry/core/gadgets/BlockStainedGlass.java b/src/main/java/forestry/core/gadgets/BlockStainedGlass.java index e22b3e646..e169b5f27 100755 --- a/src/main/java/forestry/core/gadgets/BlockStainedGlass.java +++ b/src/main/java/forestry/core/gadgets/BlockStainedGlass.java @@ -73,7 +73,7 @@ public class BlockStainedGlass extends BlockBreakable { @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int meta) { Block block = world.getBlock(x, y, z); - return block == this ? false : super.shouldSideBeRendered(world, x, y, z, meta); + return block != this && super.shouldSideBeRendered(world, x, y, z, meta); } @Override diff --git a/src/main/java/forestry/core/gadgets/Engine.java b/src/main/java/forestry/core/gadgets/Engine.java index 3d5c750e2..2d298ac10 100755 --- a/src/main/java/forestry/core/gadgets/Engine.java +++ b/src/main/java/forestry/core/gadgets/Engine.java @@ -120,7 +120,6 @@ public abstract class Engine extends TileBase implements IEnergyHandler { } } else if (this.isActive) stagePiston = 1; - return; } @Override diff --git a/src/main/java/forestry/core/gadgets/MachineDefinition.java b/src/main/java/forestry/core/gadgets/MachineDefinition.java index 99c2c7609..99a644b1f 100755 --- a/src/main/java/forestry/core/gadgets/MachineDefinition.java +++ b/src/main/java/forestry/core/gadgets/MachineDefinition.java @@ -10,10 +10,12 @@ ******************************************************************************/ package forestry.core.gadgets; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; - +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.core.interfaces.IBlockRenderer; +import forestry.core.proxy.Proxies; +import forestry.core.render.TextureManager; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -26,16 +28,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; -import forestry.core.interfaces.IBlockRenderer; -import forestry.core.proxy.Proxies; -import forestry.core.render.TextureManager; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; /** * This will replace the whole {@link Gadget}-nonsense at some point, using the proper Forge hook. Will hopefully sort out any issues with interfaces. @@ -148,11 +145,9 @@ public class MachineDefinition { public MachineDefinition setFaces(int... faces) { if (faces.length > 6) - for (int i = 0; i < faces.length; i++) - faceMap[i] = faces[i]; + System.arraycopy(faces, 0, faceMap, 0, faces.length); else { - for (int i = 0; i < 6; i++) - faceMap[i] = faces[i]; + System.arraycopy(faces, 0, faceMap, 0, 6); faceMap[6] = faces[0]; faceMap[7] = faces[1]; } diff --git a/src/main/java/forestry/core/gadgets/TileMachine.java b/src/main/java/forestry/core/gadgets/TileMachine.java index 17f25de92..54d250006 100755 --- a/src/main/java/forestry/core/gadgets/TileMachine.java +++ b/src/main/java/forestry/core/gadgets/TileMachine.java @@ -126,8 +126,7 @@ public abstract class TileMachine extends TileForestry implements ISpecialInvent super.readFromNBT(nbttagcompound); - int kind = nbttagcompound.getInteger("Kind"); - oldkind = kind; + oldkind = nbttagcompound.getInteger("Kind"); olddata = nbttagcompound; } @@ -360,10 +359,7 @@ public abstract class TileMachine extends TileForestry implements ISpecialInvent // INETWORKEDTILE IMPLEMENTATION @Override public PacketPayload getPacketPayload() { - - PacketPayload payload = null; - - return payload; + return null; } @Override diff --git a/src/main/java/forestry/core/genetics/AlleleSpecies.java b/src/main/java/forestry/core/genetics/AlleleSpecies.java index 9f375e30e..a387ecc31 100755 --- a/src/main/java/forestry/core/genetics/AlleleSpecies.java +++ b/src/main/java/forestry/core/genetics/AlleleSpecies.java @@ -10,17 +10,9 @@ ******************************************************************************/ package forestry.core.genetics; -import java.util.Collection; -import java.util.Map; - -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - +import com.mojang.authlib.GameProfile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - -import com.mojang.authlib.GameProfile; - import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.IIconProvider; @@ -32,6 +24,11 @@ import forestry.api.genetics.IMutation; import forestry.core.config.ForestryItem; import forestry.core.utils.StackUtils; import forestry.core.utils.StringUtil; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import java.util.Collection; +import java.util.Map; public abstract class AlleleSpecies extends Allele implements IAlleleSpecies { @@ -95,7 +92,7 @@ public abstract class AlleleSpecies extends Allele implements IAlleleSpecies { if (world.rand.nextFloat() < ((float) 10 / bountyLevel)) { Collection combinations = getRoot().getCombinations(this); if (combinations.size() > 0) { - IMutation[] candidates = combinations.toArray(new IMutation[0]); + IMutation[] candidates = combinations.toArray(new IMutation[combinations.size()]); research = AlleleManager.alleleRegistry.getMutationNoteStack(researcher, candidates[world.rand.nextInt(candidates.length)]); } } diff --git a/src/main/java/forestry/core/genetics/Classification.java b/src/main/java/forestry/core/genetics/Classification.java index a1f43ac7a..ed0d8a594 100755 --- a/src/main/java/forestry/core/genetics/Classification.java +++ b/src/main/java/forestry/core/genetics/Classification.java @@ -73,7 +73,7 @@ public class Classification implements IClassification { @Override public IClassification[] getMemberGroups() { - return groups.toArray(new IClassification[0]); + return groups.toArray(new IClassification[groups.size()]); } @Override @@ -84,7 +84,7 @@ public class Classification implements IClassification { @Override public IAlleleSpecies[] getMemberSpecies() { - return members.toArray(new IAlleleSpecies[0]); + return members.toArray(new IAlleleSpecies[members.size()]); } @Override diff --git a/src/main/java/forestry/core/inventory/InvTools.java b/src/main/java/forestry/core/inventory/InvTools.java index 550e8672d..b4b973c1c 100755 --- a/src/main/java/forestry/core/inventory/InvTools.java +++ b/src/main/java/forestry/core/inventory/InvTools.java @@ -708,7 +708,7 @@ public abstract class InvTools { if (stack != null) list.add(stack); } - return list.toArray(new ItemStack[0]); + return list.toArray(new ItemStack[list.size()]); } /** diff --git a/src/main/java/forestry/core/inventory/InventorySorter.java b/src/main/java/forestry/core/inventory/InventorySorter.java index 78f30bf3e..b20aabb8c 100755 --- a/src/main/java/forestry/core/inventory/InventorySorter.java +++ b/src/main/java/forestry/core/inventory/InventorySorter.java @@ -25,5 +25,5 @@ public enum InventorySorter implements Comparator { return inv2.getSizeInventory() - inv1.getSizeInventory(); } - }; + } } diff --git a/src/main/java/forestry/core/network/PacketFXSignal.java b/src/main/java/forestry/core/network/PacketFXSignal.java index d79b34c80..a41f76e5b 100755 --- a/src/main/java/forestry/core/network/PacketFXSignal.java +++ b/src/main/java/forestry/core/network/PacketFXSignal.java @@ -24,7 +24,7 @@ public class PacketFXSignal extends ForestryPacket { public static enum VisualFXType { NONE, BLOCK_DESTROY, SAPLING_PLACE - }; + } public static enum SoundFXType { NONE(""), BLOCK_DESTROY(""), BLOCK_PLACE(""), LEAF("step.grass"), LOG("dig.wood"), DIRT("dig.gravel"); @@ -36,7 +36,7 @@ public class PacketFXSignal extends ForestryPacket { private SoundFXType(String soundFile) { this.soundFile = soundFile; } - }; + } private VisualFXType visualFX; private SoundFXType soundFX; diff --git a/src/main/java/forestry/core/render/RenderAnalyzer.java b/src/main/java/forestry/core/render/RenderAnalyzer.java index e84bb776d..bd41cdc8d 100755 --- a/src/main/java/forestry/core/render/RenderAnalyzer.java +++ b/src/main/java/forestry/core/render/RenderAnalyzer.java @@ -43,7 +43,7 @@ public class RenderAnalyzer extends TileEntitySpecialRenderer implements IBlockR @Override public boolean shouldSpreadItems() { return false; - }; + } }; customRenderItem.setRenderManager(RenderManager.instance); } diff --git a/src/main/java/forestry/core/render/RenderEscritoire.java b/src/main/java/forestry/core/render/RenderEscritoire.java index d67ec49d0..cbb170a54 100755 --- a/src/main/java/forestry/core/render/RenderEscritoire.java +++ b/src/main/java/forestry/core/render/RenderEscritoire.java @@ -46,7 +46,7 @@ public class RenderEscritoire extends TileEntitySpecialRenderer implements IBloc @Override public boolean shouldSpreadItems() { return false; - }; + } }; customRenderItem.setRenderManager(RenderManager.instance); diff --git a/src/main/java/forestry/core/render/RenderMachine.java b/src/main/java/forestry/core/render/RenderMachine.java index 088a67321..04f78a275 100755 --- a/src/main/java/forestry/core/render/RenderMachine.java +++ b/src/main/java/forestry/core/render/RenderMachine.java @@ -40,7 +40,8 @@ public class RenderMachine extends TileEntitySpecialRenderer implements IBlockRe BASE, TANK_R_EMPTY, TANK_R_LOW, TANK_R_MEDIUM, TANK_R_HIGH, TANK_R_MAXIMUM, TANK_P_EMPTY, TANK_P_LOW, TANK_P_MEDIUM, TANK_P_HIGH, TANK_P_MAXIMUM - }; + } + private ResourceLocation[] textures; public RenderMachine() { diff --git a/src/main/java/forestry/core/render/RenderMill.java b/src/main/java/forestry/core/render/RenderMill.java index 978fea1f9..d4ce46d9d 100755 --- a/src/main/java/forestry/core/render/RenderMill.java +++ b/src/main/java/forestry/core/render/RenderMill.java @@ -30,7 +30,8 @@ public class RenderMill extends TileEntitySpecialRenderer implements IBlockRende private final ModelBase model = new ModelBase() { }; - private static enum Textures { PEDESTAL, EXTENSION, BLADE_1, BLADE_2, CHARGE }; + private static enum Textures { PEDESTAL, EXTENSION, BLADE_1, BLADE_2, CHARGE } + private ResourceLocation[] textures; private final ModelRenderer pedestal; diff --git a/src/main/java/forestry/core/utils/BlockUtil.java b/src/main/java/forestry/core/utils/BlockUtil.java index 6de8a50f9..8a059de58 100644 --- a/src/main/java/forestry/core/utils/BlockUtil.java +++ b/src/main/java/forestry/core/utils/BlockUtil.java @@ -100,7 +100,7 @@ public class BlockUtil { } } - return possiblePipes.toArray(new ForgeDirection[0]); + return possiblePipes.toArray(new ForgeDirection[possiblePipes.size()]); } diff --git a/src/main/java/forestry/core/utils/LiquidHelper.java b/src/main/java/forestry/core/utils/LiquidHelper.java index e6419cf13..ac019db20 100755 --- a/src/main/java/forestry/core/utils/LiquidHelper.java +++ b/src/main/java/forestry/core/utils/LiquidHelper.java @@ -77,8 +77,7 @@ public class LiquidHelper { } public static Fluid getFluid(String ident) { - Fluid fluid = FluidRegistry.getFluid(ident); - return fluid; + return FluidRegistry.getFluid(ident); } public static Fluid getOrCreateLiquid(String ident) { diff --git a/src/main/java/forestry/core/utils/RecipeUtil.java b/src/main/java/forestry/core/utils/RecipeUtil.java index 2242e3ac7..f223be14a 100755 --- a/src/main/java/forestry/core/utils/RecipeUtil.java +++ b/src/main/java/forestry/core/utils/RecipeUtil.java @@ -10,12 +10,11 @@ ******************************************************************************/ package forestry.core.utils; -import net.minecraft.item.ItemStack; - import forestry.api.recipes.RecipeManagers; import forestry.core.config.Defaults; import forestry.core.interfaces.IDescriptiveRecipe; import forestry.core.proxy.Proxies; +import net.minecraft.item.ItemStack; public class RecipeUtil { @@ -62,9 +61,7 @@ public class RecipeUtil { Object[] result = new Object[10]; for (int y = 0; y < height; y++) { - for (int x = 0; x < width; x++) { - result[y * 3 + x] = ingredients[y * width + x]; - } + System.arraycopy(ingredients, y * width, result, y * 3, width); } result[9] = output; diff --git a/src/main/java/forestry/core/utils/StackUtils.java b/src/main/java/forestry/core/utils/StackUtils.java index fda13c15c..14ea1fbaf 100755 --- a/src/main/java/forestry/core/utils/StackUtils.java +++ b/src/main/java/forestry/core/utils/StackUtils.java @@ -35,7 +35,6 @@ import forestry.core.gadgets.TileForestry; public class StackUtils { public static final ItemStack[] EMPTY_STACK_ARRAY = new ItemStack[0]; - public static final ArrayList EMPTY_STACK_LIST = new ArrayList(); /** * Compares item id, damage and NBT. Accepts wildcard damage. @@ -176,7 +175,6 @@ public class StackUtils { ItemStack temp = giver.splitStack(receptor.getMaxStackSize() - receptor.stackSize); receptor.stackSize += temp.stackSize; temp.stackSize = 0; - return; } public static boolean freeSpaceInStack(ItemStack stack, int maxSize) { @@ -244,7 +242,7 @@ public class StackUtils { } - return condensed.toArray(EMPTY_STACK_ARRAY); + return condensed.toArray(new ItemStack[condensed.size()]); } /** diff --git a/src/main/java/forestry/energy/EnergyManager.java b/src/main/java/forestry/energy/EnergyManager.java index dba54ed10..ea6171f6a 100644 --- a/src/main/java/forestry/energy/EnergyManager.java +++ b/src/main/java/forestry/energy/EnergyManager.java @@ -10,7 +10,7 @@ import net.minecraftforge.common.util.ForgeDirection; public class EnergyManager implements IEnergyHandler { private enum EnergyTransferMode { - EXTRACT, RECEIVE, BOTH; + EXTRACT, RECEIVE, BOTH } private int energyPerWork; diff --git a/src/main/java/forestry/energy/render/RenderEngine.java b/src/main/java/forestry/energy/render/RenderEngine.java index 7ccee2047..910709249 100755 --- a/src/main/java/forestry/energy/render/RenderEngine.java +++ b/src/main/java/forestry/energy/render/RenderEngine.java @@ -39,7 +39,8 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IBlockRen private static enum Textures { BASE, PISTON, EXTENSION, TRUNK_HIGHEST, TRUNK_HIGHER, TRUNK_HIGH, TRUNK_MEDIUM, TRUNK_LOW - }; + } + private ResourceLocation[] textures; private static final float[] angleMap = new float[6]; diff --git a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java index ab6ba7901..f3b7ef02b 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java +++ b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java @@ -39,6 +39,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.LinkedList; import java.util.Map; +import java.util.Set; import java.util.Stack; public class MachineCentrifuge extends TilePowered implements ISidedInventory, ISpecialInventory { @@ -124,8 +125,10 @@ public class MachineCentrifuge extends TilePowered implements ISidedInventory, I public Map getRecipes() { HashMap recipeList = new HashMap(); - for (Recipe recipe : recipes) - recipeList.put(new Object[] { recipe.resource }, recipe.products.keySet().toArray(StackUtils.EMPTY_STACK_ARRAY)); + for (Recipe recipe : recipes) { + Set productsKeys = recipe.products.keySet(); + recipeList.put(new Object[]{recipe.resource}, productsKeys.toArray(new ItemStack[productsKeys.size()])); + } return recipeList; } diff --git a/src/main/java/forestry/farming/gadgets/BlockMushroom.java b/src/main/java/forestry/farming/gadgets/BlockMushroom.java index 09067f3f9..b61eff722 100755 --- a/src/main/java/forestry/farming/gadgets/BlockMushroom.java +++ b/src/main/java/forestry/farming/gadgets/BlockMushroom.java @@ -36,7 +36,7 @@ import forestry.farming.worldgen.WorldGenBigMushroom; public class BlockMushroom extends BlockSapling implements IItemTyped { public enum MushroomType { - BROWN, RED; + BROWN, RED } private final WorldGenerator[] generators; diff --git a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java index 18d42071f..ac7acb6c1 100755 --- a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java +++ b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java @@ -279,7 +279,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable int size = potential.size() * 3; if (size > allowedExtent) allowedExtent = size; - targets.put(direction, potential.toArray(new FarmTarget[0])); + targets.put(direction, potential.toArray(new FarmTarget[potential.size()])); } // Fill out the corners @@ -327,7 +327,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable targ.add(corner); } - cache.put(entry.getKey(), targ.toArray(new FarmTarget[0])); + cache.put(entry.getKey(), targ.toArray(new FarmTarget[targ.size()])); } targets = cache; diff --git a/src/main/java/forestry/farming/gadgets/TileHatch.java b/src/main/java/forestry/farming/gadgets/TileHatch.java index 0d15c3b0e..e52b7eecf 100755 --- a/src/main/java/forestry/farming/gadgets/TileHatch.java +++ b/src/main/java/forestry/farming/gadgets/TileHatch.java @@ -28,6 +28,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.LinkedList; public class TileHatch extends TileFarm implements ISidedInventory { @@ -59,9 +60,7 @@ public class TileHatch extends TileFarm implements ISidedInventory { ArrayList pipes = new ArrayList(); ForgeDirection[] tmp = BlockUtil.getPipeDirections(worldObj, Coords(), ForgeDirection.UP); - for (int i = 0; i < tmp.length; ++i) { - pipes.add(tmp[i]); - } + Collections.addAll(pipes, tmp); if (pipes.size() > 0) dumpToPipe(pipes); diff --git a/src/main/java/forestry/farming/logic/FarmLogicGourd.java b/src/main/java/forestry/farming/logic/FarmLogicGourd.java index 69f258ec5..8fcb2d31a 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicGourd.java +++ b/src/main/java/forestry/farming/logic/FarmLogicGourd.java @@ -35,7 +35,8 @@ public class FarmLogicGourd extends FarmLogic { public FarmLogicGourd(IFarmHousing housing) { super(housing); - seeds = Farmables.farmables.get("farmGourd").toArray(new IFarmable[0]); + Collection farmables = Farmables.farmables.get("farmGourd"); + seeds = farmables.toArray(new IFarmable[farmables.size()]); } @Override diff --git a/src/main/java/forestry/farming/logic/FarmLogicPoale.java b/src/main/java/forestry/farming/logic/FarmLogicPoale.java index 7ad25c78f..c4546de0f 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicPoale.java +++ b/src/main/java/forestry/farming/logic/FarmLogicPoale.java @@ -37,7 +37,8 @@ public class FarmLogicPoale extends FarmLogic { public FarmLogicPoale(IFarmHousing housing) { super(housing); - germlings = Farmables.farmables.get("farmPoales").toArray(new IFarmable[0]); + Collection farmables = Farmables.farmables.get("farmPoales"); + germlings = farmables.toArray(new IFarmable[farmables.size()]); } @Override diff --git a/src/main/java/forestry/farming/logic/FarmLogicSucculent.java b/src/main/java/forestry/farming/logic/FarmLogicSucculent.java index 07c040240..e87c7da8b 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicSucculent.java +++ b/src/main/java/forestry/farming/logic/FarmLogicSucculent.java @@ -37,7 +37,8 @@ public class FarmLogicSucculent extends FarmLogic { public FarmLogicSucculent(IFarmHousing housing) { super(housing); - germlings = Farmables.farmables.get("farmSucculentes").toArray(new IFarmable[0]); + Collection farmables = Farmables.farmables.get("farmSucculentes"); + germlings = farmables.toArray(new IFarmable[farmables.size()]); } @Override diff --git a/src/main/java/forestry/food/items/ItemInfuser.java b/src/main/java/forestry/food/items/ItemInfuser.java index 0cfed0b87..c83921a57 100755 --- a/src/main/java/forestry/food/items/ItemInfuser.java +++ b/src/main/java/forestry/food/items/ItemInfuser.java @@ -149,7 +149,7 @@ public class ItemInfuser extends ItemForestry { matches.add(mixture); } - return matches.toArray(new Mixture[0]); + return matches.toArray(new Mixture[matches.size()]); } @Override @@ -166,7 +166,7 @@ public class ItemInfuser extends ItemForestry { required.addAll(Arrays.asList(mixture.getIngredients())); } - return required.toArray(new ItemStack[0]); + return required.toArray(new ItemStack[required.size()]); } @Override @@ -187,7 +187,7 @@ public class ItemInfuser extends ItemForestry { ItemStack seasoned = base.copy(); seasoned.setItemDamage(meta); - ((ItemBeverage) base.getItem()).beverages[meta].saveEffects(seasoned, effects.toArray(new IBeverageEffect[0])); + ((ItemBeverage) base.getItem()).beverages[meta].saveEffects(seasoned, effects.toArray(new IBeverageEffect[effects.size()])); return seasoned; } } diff --git a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java index 78250b3f3..4d1627593 100755 --- a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java +++ b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java @@ -274,7 +274,7 @@ public class Butterfly extends IndividualLiving implements IButterfly { if (creature.worldObj.rand.nextFloat() < entry.getValue() * metabolism) drop.add(entry.getKey().copy()); - return drop.toArray(StackUtils.EMPTY_STACK_ARRAY); + return drop.toArray(new ItemStack[drop.size()]); } @Override @@ -286,7 +286,7 @@ public class Butterfly extends IndividualLiving implements IButterfly { if (nursery.getWorld().rand.nextFloat() < entry.getValue() * metabolism) drop.add(entry.getKey().copy()); - return drop.toArray(StackUtils.EMPTY_STACK_ARRAY); + return drop.toArray(new ItemStack[drop.size()]); } } diff --git a/src/main/java/forestry/mail/TradeStation.java b/src/main/java/forestry/mail/TradeStation.java index 34df89666..4325a891e 100755 --- a/src/main/java/forestry/mail/TradeStation.java +++ b/src/main/java/forestry/mail/TradeStation.java @@ -481,7 +481,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, ISide surplus.add(stack); } - return surplus.toArray(new ItemStack[0]); + return surplus.toArray(new ItemStack[surplus.size()]); } /* IINVENTORY */ diff --git a/src/main/java/forestry/plugins/PluginManager.java b/src/main/java/forestry/plugins/PluginManager.java index 987fa8bab..4417e227d 100755 --- a/src/main/java/forestry/plugins/PluginManager.java +++ b/src/main/java/forestry/plugins/PluginManager.java @@ -59,7 +59,7 @@ public class PluginManager { public enum Stage { - SETUP, PRE_INIT, INIT, POST_INIT, INIT_DISABLED, FINISHED; + SETUP, PRE_INIT, INIT, POST_INIT, INIT_DISABLED, FINISHED } public enum Module {