From 84b1fa8c07f679a4d4d3a6a35b0788683bd0ea2e Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 15 Nov 2015 02:59:56 -0800 Subject: [PATCH] Fix farms only planting brown mushrooms --- .../forestry/farming/logic/FarmLogicArboreal.java | 5 +++-- .../farming/logic/FarmLogicHomogeneous.java | 14 +++++++------- .../farming/logic/FarmableGenericSapling.java | 2 +- .../farming/logic/FarmableVanillaMushroom.java | 5 +++++ 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/main/java/forestry/farming/logic/FarmLogicArboreal.java b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java index eefde6744..d0b7d60b1 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicArboreal.java +++ b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java @@ -12,6 +12,7 @@ package forestry.farming.logic; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -59,7 +60,7 @@ public class FarmLogicArboreal extends FarmLogicHomogeneous { } Block block = BlockSoil.getBlockFromItem(soil.getItem()); - if (block == null || !(block instanceof BlockSoil)) { + if (!(block instanceof BlockSoil)) { return false; } BlockSoil blockSoil = (BlockSoil) block; @@ -246,8 +247,8 @@ public class FarmLogicArboreal extends FarmLogicHomogeneous { } private boolean plantSapling(Vect position) { - World world = getWorld(); + Collections.shuffle(germlings); 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/FarmLogicHomogeneous.java b/src/main/java/forestry/farming/logic/FarmLogicHomogeneous.java index ed3b76bf1..b6411bcc3 100644 --- a/src/main/java/forestry/farming/logic/FarmLogicHomogeneous.java +++ b/src/main/java/forestry/farming/logic/FarmLogicHomogeneous.java @@ -11,6 +11,7 @@ package forestry.farming.logic; import java.util.ArrayList; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -29,7 +30,7 @@ public abstract class FarmLogicHomogeneous extends FarmLogic { private final ItemStack resource; private final ItemStack soilBlock; - protected final Iterable germlings; + protected final List germlings; ArrayList produce = new ArrayList<>(); @@ -37,7 +38,10 @@ public abstract class FarmLogicHomogeneous extends FarmLogic { super(housing); this.resource = resource; this.soilBlock = soilBlock; - this.germlings = germlings; + this.germlings = new ArrayList<>(); + for (IFarmable germling : germlings) { + this.germlings.add(germling); + } } protected boolean isAcceptedSoil(ItemStack itemStack) { @@ -75,11 +79,7 @@ public abstract class FarmLogicHomogeneous extends FarmLogic { return true; } - if (maintainGermlings(x, y + 1, z, direction, extent)) { - return true; - } - - return false; + return maintainGermlings(x, y + 1, z, direction, extent); } private boolean maintainSoil(int x, int yGround, int z, FarmDirection direction, int extent) { diff --git a/src/main/java/forestry/farming/logic/FarmableGenericSapling.java b/src/main/java/forestry/farming/logic/FarmableGenericSapling.java index d8182b1af..3afaa20e0 100755 --- a/src/main/java/forestry/farming/logic/FarmableGenericSapling.java +++ b/src/main/java/forestry/farming/logic/FarmableGenericSapling.java @@ -22,7 +22,7 @@ import forestry.core.utils.vect.Vect; public class FarmableGenericSapling implements IFarmable { - private final Block sapling; + protected final Block sapling; private final int saplingMeta; private final ItemStack[] windfall; diff --git a/src/main/java/forestry/farming/logic/FarmableVanillaMushroom.java b/src/main/java/forestry/farming/logic/FarmableVanillaMushroom.java index 622b95fd2..e5e200f41 100644 --- a/src/main/java/forestry/farming/logic/FarmableVanillaMushroom.java +++ b/src/main/java/forestry/farming/logic/FarmableVanillaMushroom.java @@ -39,6 +39,11 @@ public class FarmableVanillaMushroom extends FarmableGenericSapling { return new CropBlock(world, block, world.getBlockMetadata(x, y, z), new Vect(x, y, z)); } + @Override + public boolean isGermling(ItemStack itemstack) { + return ItemStackUtil.equals(sapling, itemstack); + } + @Override public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { int meta = 0;