From ad8c90f5f221ea48c756b6680e4b81a871a8d89b Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 23 Sep 2014 13:16:31 -0700 Subject: [PATCH] Fix #220. More robust world object for FarmLogic --- .../java/forestry/farming/logic/FarmLogic.java | 17 ++++++++++------- .../farming/logic/FarmLogicArboreal.java | 10 +++++++--- .../forestry/farming/logic/FarmLogicCocoa.java | 13 +++++++------ .../forestry/farming/logic/FarmLogicCrops.java | 7 ++++--- .../forestry/farming/logic/FarmLogicGourd.java | 4 ++-- .../farming/logic/FarmLogicHomogenous.java | 3 ++- .../farming/logic/FarmLogicInfernal.java | 6 ++++-- .../farming/logic/FarmLogicOrchard.java | 8 ++++---- .../forestry/farming/logic/FarmLogicPeat.java | 4 ++-- .../forestry/farming/logic/FarmLogicPoale.java | 4 ++-- .../forestry/farming/logic/FarmLogicRubber.java | 6 +++--- .../farming/logic/FarmLogicSucculent.java | 4 ++-- .../farming/logic/FarmLogicWatered.java | 7 +++++-- 13 files changed, 54 insertions(+), 39 deletions(-) diff --git a/src/main/java/forestry/farming/logic/FarmLogic.java b/src/main/java/forestry/farming/logic/FarmLogic.java index 5b9546bfb..4bc824604 100755 --- a/src/main/java/forestry/farming/logic/FarmLogic.java +++ b/src/main/java/forestry/farming/logic/FarmLogic.java @@ -26,7 +26,6 @@ import forestry.core.utils.Vect; public abstract class FarmLogic implements IFarmLogic { - World world; IFarmHousing housing; boolean isManual; @@ -40,30 +39,34 @@ public abstract class FarmLogic implements IFarmLogic { return this; } + protected World getWorld() { + return housing.getWorld(); + } + @Override public ResourceLocation getSpriteSheet() { return SpriteSheet.ITEMS.getLocation(); } protected final boolean isAirBlock(Vect position) { - return world.isAirBlock(position.x, position.y, position.z); + return getWorld().isAirBlock(position.x, position.y, position.z); } protected final boolean isWaterBlock(Vect position) { - return world.getBlock(position.x, position.y, position.z) == Blocks.water; + return getWorld().getBlock(position.x, position.y, position.z) == Blocks.water; } protected final boolean isWoodBlock(Vect position) { Block block = getBlock(position); - return block.isWood(world, position.x, position.y, position.z); + return block.isWood(getWorld(), position.x, position.y, position.z); } protected final Block getBlock(Vect position) { - return world.getBlock(position.x, position.y, position.z); + return getWorld().getBlock(position.x, position.y, position.z); } protected final int getBlockMeta(Vect position) { - return world.getBlockMetadata(position.x, position.y, position.z); + return getWorld().getBlockMetadata(position.x, position.y, position.z); } protected final ItemStack getAsItemStack(Vect position) { @@ -75,7 +78,7 @@ public abstract class FarmLogic implements IFarmLogic { } protected final void setBlock(Vect position, Block block, int meta) { - world.setBlock(position.x, position.y, position.z, block, meta, Defaults.FLAG_BLOCK_SYNCH); + getWorld().setBlock(position.x, position.y, position.z, block, meta, Defaults.FLAG_BLOCK_SYNCH); } } diff --git a/src/main/java/forestry/farming/logic/FarmLogicArboreal.java b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java index 610b508b7..22cd4b002 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicArboreal.java +++ b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java @@ -27,6 +27,7 @@ import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import forestry.api.farming.Farmables; @@ -92,7 +93,7 @@ public class FarmLogicArboreal extends FarmLogicHomogenous { Vect max = coords.add(offset).add(area); AxisAlignedBB harvestBox = AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z); - List list = housing.getWorld().getEntitiesWithinAABB(Entity.class, harvestBox); + List list = getWorld().getEntitiesWithinAABB(Entity.class, harvestBox); int i; for (i = 0; i < list.size(); i++) { @@ -118,8 +119,6 @@ public class FarmLogicArboreal extends FarmLogicHomogenous { @Override public Collection harvest(int x, int y, int z, ForgeDirection direction, int extent) { - world = housing.getWorld(); - Collection crops = null; Vect start = new Vect(x, y, z); @@ -140,6 +139,8 @@ public class FarmLogicArboreal extends FarmLogicHomogenous { private Collection getHarvestBlocks(Vect position) { + World world = getWorld(); + ArrayList seen = new ArrayList(); Stack crops = new Stack(); @@ -176,6 +177,8 @@ public class FarmLogicArboreal extends FarmLogicHomogenous { private ArrayList processHarvestBlock(IFarmable germling, Stack crops, Collection seen, Vect start, Vect position) { + World world = getWorld(); + ArrayList candidates = new ArrayList(); // Get additional candidates to return @@ -238,6 +241,7 @@ public class FarmLogicArboreal extends FarmLogicHomogenous { private boolean plantSapling(Vect position) { + World world = getWorld(); for (IFarmable candidate : germlings) if (housing.plantGermling(candidate, world, position.x, position.y, position.z)) return true; diff --git a/src/main/java/forestry/farming/logic/FarmLogicCocoa.java b/src/main/java/forestry/farming/logic/FarmLogicCocoa.java index b59541378..58227df3d 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicCocoa.java +++ b/src/main/java/forestry/farming/logic/FarmLogicCocoa.java @@ -24,6 +24,7 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import forestry.api.farming.ICrop; @@ -80,8 +81,6 @@ public class FarmLogicCocoa extends FarmLogic { @Override public boolean cultivate(int x, int y, int z, ForgeDirection direction, int extent) { - world = housing.getWorld(); - Vect start = new Vect(x, y, z); if (!lastExtentsCultivation.containsKey(start)) lastExtentsCultivation.put(start, 0); @@ -104,8 +103,6 @@ public class FarmLogicCocoa extends FarmLogic { @Override public Collection harvest(int x, int y, int z, ForgeDirection direction, int extent) { - world = housing.getWorld(); - Collection crops = null; Vect start = new Vect(x, y, z); @@ -126,6 +123,8 @@ public class FarmLogicCocoa extends FarmLogic { private boolean tryPlantingCocoa(Vect position) { + World world = getWorld(); + Vect current = position; while (isWoodBlock(current) && BlockLog.func_150165_c(getBlockMeta(current)) == 3) { @@ -155,8 +154,8 @@ public class FarmLogicCocoa extends FarmLogic { Block block = getBlock(position); ICrop crop = null; - if (!block.isWood(world, position.x, position.y, position.z)) { - crop = cocoa.getCropAt(world, position.x, position.y, position.z); + if (!block.isWood(getWorld(), position.x, position.y, position.z)) { + crop = cocoa.getCropAt(getWorld(), position.x, position.y, position.z); if (crop == null) return crops; } @@ -180,6 +179,8 @@ public class FarmLogicCocoa extends FarmLogic { private ArrayList processHarvestBlock(Stack crops, Collection seen, Vect start, Vect position) { + World world = getWorld(); + ArrayList candidates = new ArrayList(); // Get additional candidates to return diff --git a/src/main/java/forestry/farming/logic/FarmLogicCrops.java b/src/main/java/forestry/farming/logic/FarmLogicCrops.java index 02a06de01..253258271 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicCrops.java +++ b/src/main/java/forestry/farming/logic/FarmLogicCrops.java @@ -21,6 +21,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import forestry.api.farming.ICrop; @@ -96,7 +97,7 @@ public abstract class FarmLogicCrops extends FarmLogicWatered { for (int i = 0; i < extent; i++) { Vect position = translateWithOffset(x, y, z, direction, i); - if (!isAirBlock(position) && !Utils.isReplaceableBlock(world, position.x, position.y, position.z)) + if (!isAirBlock(position) && !Utils.isReplaceableBlock(getWorld(), position.x, position.y, position.z)) continue; ItemStack below = getAsItemStack(position.add(new Vect(0, -1, 0))); @@ -112,6 +113,7 @@ public abstract class FarmLogicCrops extends FarmLogicWatered { } private boolean trySetCrop(Vect position) { + World world = getWorld(); for (IFarmable candidate : seeds) if (housing.plantGermling(candidate, world, position.x, position.y, position.z)) @@ -122,8 +124,7 @@ public abstract class FarmLogicCrops extends FarmLogicWatered { @Override public Collection harvest(int x, int y, int z, ForgeDirection direction, int extent) { - - world = housing.getWorld(); + World world = getWorld(); Stack crops = new Stack(); for (int i = 0; i < extent; i++) { diff --git a/src/main/java/forestry/farming/logic/FarmLogicGourd.java b/src/main/java/forestry/farming/logic/FarmLogicGourd.java index 7f897b66e..69f258ec5 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicGourd.java +++ b/src/main/java/forestry/farming/logic/FarmLogicGourd.java @@ -20,6 +20,7 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import forestry.api.farming.Farmables; @@ -80,8 +81,7 @@ public class FarmLogicGourd extends FarmLogic { @Override public Collection harvest(int x, int y, int z, ForgeDirection direction, int extent) { - - world = housing.getWorld(); + World world = getWorld(); Stack crops = new Stack(); for (int i = 0; i < extent; i++) { diff --git a/src/main/java/forestry/farming/logic/FarmLogicHomogenous.java b/src/main/java/forestry/farming/logic/FarmLogicHomogenous.java index 7cfe10fae..da2a67f5c 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicHomogenous.java +++ b/src/main/java/forestry/farming/logic/FarmLogicHomogenous.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import net.minecraft.item.ItemStack; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import forestry.api.farming.IFarmHousing; @@ -61,7 +62,6 @@ public abstract class FarmLogicHomogenous extends FarmLogic { @Override public boolean cultivate(int x, int y, int z, ForgeDirection direction, int extent) { - world = housing.getWorld(); if (maintainSoil(x, y, z, direction, extent)) return true; @@ -73,6 +73,7 @@ public abstract class FarmLogicHomogenous extends FarmLogic { } private boolean maintainSoil(int x, int yGround, int z, ForgeDirection direction, int extent) { + World world = getWorld(); if (!housing.hasResources(resource)) return false; diff --git a/src/main/java/forestry/farming/logic/FarmLogicInfernal.java b/src/main/java/forestry/farming/logic/FarmLogicInfernal.java index c18ead21c..e1b589c45 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicInfernal.java +++ b/src/main/java/forestry/farming/logic/FarmLogicInfernal.java @@ -21,6 +21,7 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import forestry.api.farming.Farmables; @@ -65,8 +66,7 @@ public class FarmLogicInfernal extends FarmLogicHomogenous { @Override public Collection harvest(int x, int y, int z, ForgeDirection direction, int extent) { - - world = housing.getWorld(); + World world = getWorld(); Stack crops = new Stack(); for (int i = 0; i < extent; i++) { @@ -84,6 +84,7 @@ public class FarmLogicInfernal extends FarmLogicHomogenous { @Override protected boolean maintainGermlings(int x, int y, int z, ForgeDirection direction, int extent) { + World world = getWorld(); for (int i = 0; i < extent; i++) { Vect position = translateWithOffset(x, y, z, direction, i); @@ -101,6 +102,7 @@ public class FarmLogicInfernal extends FarmLogicHomogenous { } private boolean trySetCrop(Vect position) { + World world = getWorld(); for (IFarmable candidate : germlings) if (housing.plantGermling(candidate, world, position.x, position.y, position.z)) diff --git a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java index a1f068845..0d5eea98d 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java +++ b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java @@ -23,6 +23,7 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import forestry.api.farming.ICrop; @@ -83,8 +84,6 @@ public class FarmLogicOrchard extends FarmLogic { @Override public Collection harvest(int x, int y, int z, ForgeDirection direction, int extent) { - world = housing.getWorld(); - Collection crops = null; Vect start = new Vect(x, y, z); @@ -113,7 +112,7 @@ public class FarmLogicOrchard extends FarmLogic { // Determine what type we want to harvest. IFruitBearer bearer = getFruitBlock(position); Block block = getBlock(position); - if ((!block.isWood(world, position.x, position.y, position.z)) && bearer == null) + if ((!block.isWood(getWorld(), position.x, position.y, position.z)) && bearer == null) return crops; ArrayList candidates = processHarvestBlock(crops, seen, position, position); @@ -131,6 +130,7 @@ public class FarmLogicOrchard extends FarmLogic { } private ArrayList processHarvestBlock(Stack crops, Collection seen, Vect start, Vect position) { + World world = getWorld(); ArrayList candidates = new ArrayList(); @@ -173,7 +173,7 @@ public class FarmLogicOrchard extends FarmLogic { } private IFruitBearer getFruitBlock(Vect position) { - TileEntity tile = world.getTileEntity(position.x, position.y, position.z); + TileEntity tile = getWorld().getTileEntity(position.x, position.y, position.z); if (!(tile instanceof IFruitBearer)) return null; diff --git a/src/main/java/forestry/farming/logic/FarmLogicPeat.java b/src/main/java/forestry/farming/logic/FarmLogicPeat.java index 977f069ab..c17fc3f2b 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicPeat.java +++ b/src/main/java/forestry/farming/logic/FarmLogicPeat.java @@ -20,6 +20,7 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import forestry.api.farming.ICrop; @@ -57,8 +58,7 @@ public class FarmLogicPeat extends FarmLogicWatered { @Override public Collection harvest(int x, int y, int z, ForgeDirection direction, int extent) { - - world = housing.getWorld(); + World world = getWorld(); Stack crops = new Stack(); for (int i = 0; i < extent; i++) { diff --git a/src/main/java/forestry/farming/logic/FarmLogicPoale.java b/src/main/java/forestry/farming/logic/FarmLogicPoale.java index 24142b6d0..7ad25c78f 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicPoale.java +++ b/src/main/java/forestry/farming/logic/FarmLogicPoale.java @@ -21,6 +21,7 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import forestry.api.farming.Farmables; @@ -91,8 +92,7 @@ public class FarmLogicPoale extends FarmLogic { @Override public Collection harvest(int x, int y, int z, ForgeDirection direction, int extent) { - - world = housing.getWorld(); + World world = getWorld(); Stack crops = new Stack(); for (int i = 0; i < extent; i++) { diff --git a/src/main/java/forestry/farming/logic/FarmLogicRubber.java b/src/main/java/forestry/farming/logic/FarmLogicRubber.java index d63cdfbb5..1c5e4d269 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicRubber.java +++ b/src/main/java/forestry/farming/logic/FarmLogicRubber.java @@ -23,6 +23,7 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import forestry.api.farming.ICrop; @@ -95,8 +96,6 @@ public class FarmLogicRubber extends FarmLogic { if (inActive) return null; - world = housing.getWorld(); - Collection crops = null; Vect start = new Vect(x, y, z); if (!lastExtents.containsKey(start)) @@ -126,7 +125,7 @@ public class FarmLogicRubber extends FarmLogic { int meta = this.getBlockMeta(position); if (meta >= 2 && meta <= 5) - crops.push(new CropRubber(world, block, meta, position)); + crops.push(new CropRubber(getWorld(), block, meta, position)); ArrayList candidates = processHarvestBlock(crops, seen, position); ArrayList temp = new ArrayList(); @@ -142,6 +141,7 @@ public class FarmLogicRubber extends FarmLogic { } private ArrayList processHarvestBlock(Stack crops, Collection seen, Vect position) { + World world = getWorld(); ArrayList candidates = new ArrayList(); diff --git a/src/main/java/forestry/farming/logic/FarmLogicSucculent.java b/src/main/java/forestry/farming/logic/FarmLogicSucculent.java index 47ab83de0..07c040240 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicSucculent.java +++ b/src/main/java/forestry/farming/logic/FarmLogicSucculent.java @@ -21,6 +21,7 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import forestry.api.farming.Farmables; @@ -91,8 +92,7 @@ public class FarmLogicSucculent extends FarmLogic { @Override public Collection harvest(int x, int y, int z, ForgeDirection direction, int extent) { - - world = housing.getWorld(); + World world = getWorld(); Stack crops = new Stack(); for (int i = 0; i < extent; i++) { diff --git a/src/main/java/forestry/farming/logic/FarmLogicWatered.java b/src/main/java/forestry/farming/logic/FarmLogicWatered.java index c9d97d607..c30b4c7b8 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicWatered.java +++ b/src/main/java/forestry/farming/logic/FarmLogicWatered.java @@ -16,6 +16,7 @@ import java.util.Collection; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; @@ -68,8 +69,6 @@ public abstract class FarmLogicWatered extends FarmLogic { @Override public boolean cultivate(int x, int y, int z, ForgeDirection direction, int extent) { - world = housing.getWorld(); - if (maintainSoil(x, y, z, direction, extent)) return true; @@ -91,6 +90,8 @@ public abstract class FarmLogicWatered extends FarmLogic { private boolean maintainSoil(int x, int y, int z, ForgeDirection direction, int extent) { + World world = getWorld(); + for (int i = 0; i < extent; i++) { Vect position = translateWithOffset(x, y, z, direction, i); if (!isAirBlock(position) && !Utils.isReplaceableBlock(world, position.x, position.y, position.z)) { @@ -132,6 +133,8 @@ public abstract class FarmLogicWatered extends FarmLogic { private boolean maintainWater(int x, int y, int z, ForgeDirection direction, int extent) { // Still not done, check water then + World world = getWorld(); + for (int i = 0; i < extent; i++) { Vect position = translateWithOffset(x, y, z, direction, i); if ((!isAirBlock(position) && !Utils.isReplaceableBlock(world, position.x, position.y, position.z))