lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix Harvest Moon not working with Pumpkins (#1432)

Browse source
This commit is contained in:
Nicholas Ignoffo 2018-09-03 11:35:15 -07:00
parent 2b587e84af
commit d54c828fba
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java
View file

@ -10,6 +10,7 @@ import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Collection;
import java.util.List; import java.util.List;
/** /**
@ -29,19 +30,21 @@ public class HarvestHandlerStem implements IHarvestHandler {
@Override @Override
public boolean harvest(World world, BlockPos pos, IBlockState state, List<ItemStack> drops) { public boolean harvest(World world, BlockPos pos, IBlockState state, List<ItemStack> drops) {
EnumFacing cropDir = state.getBlock().getActualState(state, world, pos).getValue(BlockStem.FACING); EnumFacing cropDir = state.getActualState(world, pos).getValue(BlockStem.FACING);
if (cropDir != EnumFacing.UP) { if (cropDir != EnumFacing.UP) {
BlockPos cropPos = pos.offset(cropDir); BlockPos cropPos = pos.offset(cropDir);
IBlockState probableCrop = world.getBlockState(cropPos); IBlockState probableCrop = world.getBlockState(cropPos);
IBlockState registeredCrop = HarvestRegistry.getStemCrops().get(state); Collection<IBlockState> registeredCrops = HarvestRegistry.getStemCrops().get(state);
if (registeredCrop == probableCrop) { for (IBlockState registeredCrop : registeredCrops) {
NonNullList<ItemStack> blockDrops = NonNullList.create(); if (registeredCrop == probableCrop) {
probableCrop.getBlock().getDrops(blockDrops, world, cropPos, probableCrop, 0); NonNullList<ItemStack> blockDrops = NonNullList.create();
drops.addAll(blockDrops); probableCrop.getBlock().getDrops(blockDrops, world, cropPos, probableCrop, 0);
world.destroyBlock(cropPos, false); drops.addAll(blockDrops);
return true; world.destroyBlock(cropPos, false);
return true;
}
} }
} }

6
src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestRegistry.java
View file

@ -14,7 +14,7 @@ public class HarvestRegistry {
private static final List<IHarvestHandler> HARVEST_HANDLERS = Lists.newArrayList(); private static final List<IHarvestHandler> HARVEST_HANDLERS = Lists.newArrayList();
private static final Map<Block, Integer> STANDARD_CROPS = Maps.newHashMap(); private static final Map<Block, Integer> STANDARD_CROPS = Maps.newHashMap();
private static final Set<IBlockState> TALL_CROPS = Sets.newHashSet(); private static final Set<IBlockState> TALL_CROPS = Sets.newHashSet();
private static final Map<IBlockState, IBlockState> STEM_CROPS = Maps.newHashMap(); private static final Multimap<IBlockState, IBlockState> STEM_CROPS = ArrayListMultimap.create();
private static final Map<IBlockState, Integer> AMPLIFIERS = Maps.newHashMap(); private static final Map<IBlockState, Integer> AMPLIFIERS = Maps.newHashMap();
/** /**
@ -95,8 +95,8 @@ public class HarvestRegistry {
return ImmutableSet.copyOf(TALL_CROPS); return ImmutableSet.copyOf(TALL_CROPS);
} }
public static Map<IBlockState, IBlockState> getStemCrops() { public static Multimap<IBlockState, IBlockState> getStemCrops() {
return ImmutableMap.copyOf(STEM_CROPS); return ImmutableMultimap.copyOf(STEM_CROPS);
} }
public static Map<IBlockState, Integer> getAmplifiers() { public static Map<IBlockState, Integer> getAmplifiers() {