From fbaad8bf93e4f66da74884271e34086165d30169 Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Tue, 23 Sep 2014 19:41:24 -0700 Subject: [PATCH] Some tree farm optimizations. --- lang | 2 +- .../farming/gadgets/StructureLogicFarm.java | 3 ++- .../forestry/farming/gadgets/TileFarmPlain.java | 4 ++-- .../forestry/farming/logic/FarmLogicArboreal.java | 15 +++++---------- .../forestry/farming/logic/FarmLogicCocoa.java | 15 +++++---------- .../forestry/farming/logic/FarmLogicOrchard.java | 15 +++++---------- .../forestry/farming/logic/FarmLogicRubber.java | 15 +++++---------- 7 files changed, 25 insertions(+), 44 deletions(-) diff --git a/lang b/lang index 6577b87e0..a96c1f92b 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 6577b87e0739355c7bed48e2280b5c6290b5acfb +Subproject commit a96c1f92b21206f0ffd6a0e69fb4b6050c551c7f diff --git a/src/main/java/forestry/farming/gadgets/StructureLogicFarm.java b/src/main/java/forestry/farming/gadgets/StructureLogicFarm.java index d0aeee426..88036724b 100755 --- a/src/main/java/forestry/farming/gadgets/StructureLogicFarm.java +++ b/src/main/java/forestry/farming/gadgets/StructureLogicFarm.java @@ -23,6 +23,7 @@ import forestry.core.gadgets.StructureLogic; import forestry.core.utils.Schemata; import forestry.core.utils.Schemata.EnumStructureBlock; import forestry.core.utils.Vect; +import java.util.Set; public class StructureLogicFarm extends StructureLogic { @@ -65,7 +66,7 @@ public class StructureLogicFarm extends StructureLogic { "FFFFFFF", "FAAAAAF", "FAAAAAF", "FBBBBBF", "FAAAAAF", "FFFFFFF", "FFFFFFF", "FFFFFFF", "FFFFFFF", "FFFFFFF", "FFFFFFF", "FFFFFFF").setOffsets(-3, -3, -3); - public static HashSet bricks = new HashSet(); + public static final Set bricks = new HashSet(); static { bricks.add(Blocks.brick_block); bricks.add(Blocks.stonebrick); diff --git a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java index 58667c8e3..d1572b5aa 100755 --- a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java +++ b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java @@ -335,7 +335,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable ForgeDirection direction = entry.getKey(); for (FarmTarget target : entry.getValue()) { - int yOffset = 0; + int yOffset; for (yOffset = 2; yOffset > -3; yOffset--) { Vect position = new Vect(target.getStart().x, target.getStart().y + yOffset, target.getStart().z); if (StructureLogicFarm.bricks.contains(worldObj.getBlock(position.x, position.y, position.z))) @@ -343,7 +343,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable } target.setYOffset(yOffset + 1); - int extent = 0; + int extent; // Determine extent limit int limit = allowedExtent; if (target.getLimit() > 0) diff --git a/src/main/java/forestry/farming/logic/FarmLogicArboreal.java b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java index 22cd4b002..5678bb5f9 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicArboreal.java +++ b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java @@ -39,6 +39,8 @@ import forestry.core.config.ForestryBlock; import forestry.core.render.SpriteSheet; import forestry.core.utils.StackUtils; import forestry.core.utils.Vect; +import java.util.HashSet; +import java.util.Set; public class FarmLogicArboreal extends FarmLogicHomogenous { @@ -141,7 +143,7 @@ public class FarmLogicArboreal extends FarmLogicHomogenous { World world = getWorld(); - ArrayList seen = new ArrayList(); + Set seen = new HashSet(); Stack crops = new Stack(); // Determine what type we want to harvest. @@ -175,7 +177,7 @@ public class FarmLogicArboreal extends FarmLogicHomogenous { protected int yOffset = 0; - private ArrayList processHarvestBlock(IFarmable germling, Stack crops, Collection seen, Vect start, Vect position) { + private ArrayList processHarvestBlock(IFarmable germling, Stack crops, Set seen, Vect start, Vect position) { World world = getWorld(); @@ -194,14 +196,7 @@ public class FarmLogicArboreal extends FarmLogicHomogenous { continue; // See whether the given position has already been processed - boolean skip = false; - for (Vect prcs : seen) - if (candidate.equals(prcs)) { - skip = true; - break; - } - - if (skip) + if (seen.contains(candidate)) continue; ICrop crop = germling.getCropAt(world, candidate.x, candidate.y, candidate.z); diff --git a/src/main/java/forestry/farming/logic/FarmLogicCocoa.java b/src/main/java/forestry/farming/logic/FarmLogicCocoa.java index 58227df3d..8cfec943f 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicCocoa.java +++ b/src/main/java/forestry/farming/logic/FarmLogicCocoa.java @@ -31,6 +31,8 @@ import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; import forestry.core.utils.Vect; +import java.util.HashSet; +import java.util.Set; public class FarmLogicCocoa extends FarmLogic { @@ -147,7 +149,7 @@ public class FarmLogicCocoa extends FarmLogic { private Collection getHarvestBlocks(Vect position) { - ArrayList seen = new ArrayList(); + Set seen = new HashSet(); Stack crops = new Stack(); // Determine what type we want to harvest. @@ -177,7 +179,7 @@ public class FarmLogicCocoa extends FarmLogic { return crops; } - private ArrayList processHarvestBlock(Stack crops, Collection seen, Vect start, Vect position) { + private ArrayList processHarvestBlock(Stack crops, Set seen, Vect start, Vect position) { World world = getWorld(); @@ -196,14 +198,7 @@ public class FarmLogicCocoa extends FarmLogic { continue; // See whether the given position has already been processed - boolean skip = false; - for (Vect prcs : seen) - if (candidate.equals(prcs)) { - skip = true; - break; - } - - if (skip) + if (seen.contains(candidate)) continue; ICrop crop = cocoa.getCropAt(world, candidate.x, candidate.y, candidate.z); diff --git a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java index 0d5eea98d..3aa2f21bc 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java +++ b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java @@ -31,6 +31,8 @@ import forestry.api.farming.IFarmHousing; import forestry.api.genetics.IFruitBearer; import forestry.core.config.ForestryItem; import forestry.core.utils.Vect; +import java.util.HashSet; +import java.util.Set; public class FarmLogicOrchard extends FarmLogic { @@ -106,7 +108,7 @@ public class FarmLogicOrchard extends FarmLogic { private Collection getHarvestBlocks(Vect position) { - ArrayList seen = new ArrayList(); + Set seen = new HashSet(); Stack crops = new Stack(); // Determine what type we want to harvest. @@ -129,7 +131,7 @@ public class FarmLogicOrchard extends FarmLogic { return crops; } - private ArrayList processHarvestBlock(Stack crops, Collection seen, Vect start, Vect position) { + private ArrayList processHarvestBlock(Stack crops, Set seen, Vect start, Vect position) { World world = getWorld(); ArrayList candidates = new ArrayList(); @@ -147,14 +149,7 @@ public class FarmLogicOrchard extends FarmLogic { continue; // See whether the given position has already been processed - boolean skip = false; - for (Vect prcs : seen) - if (candidate.equals(prcs)) { - skip = true; - break; - } - - if (skip) + if (seen.contains(candidate)) continue; IFruitBearer bearer = getFruitBlock(candidate); diff --git a/src/main/java/forestry/farming/logic/FarmLogicRubber.java b/src/main/java/forestry/farming/logic/FarmLogicRubber.java index 1c5e4d269..7dcc81f01 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicRubber.java +++ b/src/main/java/forestry/farming/logic/FarmLogicRubber.java @@ -32,6 +32,8 @@ import forestry.core.proxy.Proxies; import forestry.core.utils.StackUtils; import forestry.core.utils.Vect; import forestry.plugins.PluginIC2; +import java.util.HashSet; +import java.util.Set; public class FarmLogicRubber extends FarmLogic { @@ -115,7 +117,7 @@ public class FarmLogicRubber extends FarmLogic { private Collection getHarvestBlocks(Vect position) { - ArrayList seen = new ArrayList(); + Set seen = new HashSet(); Stack crops = new Stack(); // Determine what type we want to harvest. @@ -140,7 +142,7 @@ public class FarmLogicRubber extends FarmLogic { return crops; } - private ArrayList processHarvestBlock(Stack crops, Collection seen, Vect position) { + private ArrayList processHarvestBlock(Stack crops, Set seen, Vect position) { World world = getWorld(); ArrayList candidates = new ArrayList(); @@ -152,14 +154,7 @@ public class FarmLogicRubber extends FarmLogic { continue; // See whether the given position has already been processed - boolean skip = false; - for (Vect prcs : seen) - if (candidate.equals(prcs)) { - skip = true; - break; - } - - if (skip) + if (seen.contains(candidate)) continue; Block block = getBlock(candidate);