Fix #1371 IC2 Rubber farm does not harvest rubber properly

This commit is contained in:
mezz committed 2016-08-03 02:21:27 -07:00
1 parent 89cfbfca9c
commit a3a1f7720e
3 files changed
+66 -71

No files matched your search

@@ -10,20 +10,25 @@
******************************************************************************/
package forestry.farming.logic;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Map;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableCollection;
import forestry.core.config.Constants;
import forestry.core.network.packets.PacketFXSignal;
import forestry.core.proxy.Proxies;
import forestry.core.utils.ItemStackUtil;
import forestry.plugins.compat.PluginIC2;
import net.minecraft.block.Block;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import forestry.core.config.Constants;
import forestry.core.network.packets.PacketFXSignal;
import forestry.core.proxy.Proxies;
import forestry.plugins.compat.PluginIC2;
public class CropRubber extends CropDestroy {
public CropRubber(World world, IBlockState blockState, BlockPos position) {
@@ -34,10 +39,44 @@ public class CropRubber extends CropDestroy {
* Convert a "wet" rubber log blockstate into the dry version.
* Total hack since we don't have access to the blockstates.
*/
private static IBlockState getReplantState(IBlockState sappyState) {
Block block = sappyState.getBlock();
int sappyMeta = block.getMetaFromState(sappyState);
return block.getStateFromMeta(sappyMeta - 4);
private static <T extends Comparable<T>> IBlockState getReplantState(IBlockState sappyState) {
if (hasRubberToHarvest(sappyState)) {
for (Map.Entry<IProperty<?>, Comparable<?>> wetPropertyEntry : sappyState.getProperties().entrySet()) {
String valueWetString = wetPropertyEntry.getValue().toString();
String valueDryString = valueWetString.replace("wet", "dry");
IProperty<?> property = wetPropertyEntry.getKey();
IBlockState baseState = sappyState.getBlock().getBlockState().getBaseState();
IBlockState dryState = getStateWithValue(baseState, property, valueDryString);
if (dryState != null) {
return dryState;
}
}
}
return sappyState.getBlock().getDefaultState();
}
public static boolean hasRubberToHarvest(IBlockState blockState) {
Block block = blockState.getBlock();
if (ItemStackUtil.equals(block, PluginIC2.rubberWood)) {
ImmutableCollection<Comparable<?>> propertyValues = blockState.getProperties().values();
for (Comparable<?> propertyValue : propertyValues) {
if (propertyValue.toString().contains("wet")) {
return true;
}
}
}
return false;
}
@Nullable
private static <T extends Comparable<T>> IBlockState getStateWithValue(IBlockState baseState, IProperty<T> property, String valueString) {
Optional<T> value = property.parseValue(valueString);
if (value.isPresent()) {
return baseState.withProperty(property, value.get());
}
return null;
}
@Override
@@ -10,27 +10,22 @@
******************************************************************************/
package forestry.farming.logic;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Stack;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import forestry.api.farming.FarmDirection;
import forestry.api.farming.ICrop;
import forestry.api.farming.IFarmHousing;
import forestry.core.utils.ItemStackUtil;
import forestry.core.utils.Log;
import forestry.plugins.compat.PluginIC2;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public class FarmLogicRubber extends FarmLogic {
@@ -114,63 +109,24 @@ public class FarmLogicRubber extends FarmLogic {
}
private Collection<ICrop> getHarvestBlocks(World world, BlockPos position) {
Set<BlockPos> seen = new HashSet<>();
Stack<ICrop> crops = new Stack<>();
// Determine what type we want to harvest.
IBlockState blockState = world.getBlockState(position);
Block block = blockState.getBlock();
if (!ItemStackUtil.equals(block, PluginIC2.rubberWood)) {
return crops;
}
for (int j = 0; j < 10; j++) {
BlockPos candidate = position.add(0, j, 0);
int meta = block.getMetaFromState(blockState);
if (meta >= 7 && meta <= 10) {
crops.push(new CropDestroy(world, blockState, position, null));
}
List<BlockPos> candidates = processHarvestBlock(world, crops, seen, position);
List<BlockPos> temp = new ArrayList<>();
while (!candidates.isEmpty() && crops.size() < 100) {
for (BlockPos candidate : candidates) {
temp.addAll(processHarvestBlock(world, crops, seen, candidate));
IBlockState blockState = world.getBlockState(candidate);
Block block = blockState.getBlock();
if (!ItemStackUtil.equals(block, PluginIC2.rubberWood)) {
break;
}
if (CropRubber.hasRubberToHarvest(blockState)) {
crops.push(new CropRubber(world, blockState, candidate));
break;
}
candidates.clear();
candidates.addAll(temp);
temp.clear();
}
return crops;
}
private List<BlockPos> processHarvestBlock(World world, Stack<ICrop> crops, Set<BlockPos> seen, BlockPos position) {
List<BlockPos> candidates = new ArrayList<>();
// Get additional candidates to return
for (int j = 0; j < 2; j++) {
BlockPos candidate = position.add(0, j, 0);
if (candidate.equals(position)) {
continue;
}
// See whether the given position has already been processed
if (seen.contains(candidate)) {
continue;
}
IBlockState blockState = world.getBlockState(candidate);
Block block = blockState.getBlock();
if (ItemStackUtil.equals(block, PluginIC2.rubberWood)) {
int meta = block.getMetaFromState(blockState);
if (meta >= 7 && meta <= 10) {
crops.push(new CropRubber(world, blockState, candidate));
}
candidates.add(candidate);
seen.add(candidate);
}
}
return candidates;
}
}