From 56adc25fdffc1cd66e7de503e7a76ff2507271e6 Mon Sep 17 00:00:00 2001 From: Nirek-K Date: Thu, 23 Jun 2016 15:40:41 -0500 Subject: [PATCH] Fix #1330 Change resource checks to check tile for IBeeHousing --- .../genetics/JubilanceRequiresResource.java | 13 +++++++++++-- .../MutationConditionRequiresResource.java | 5 ++++- .../MutationConditionRequiresResourceOreDict.java | 5 ++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/main/java/forestry/apiculture/genetics/JubilanceRequiresResource.java b/src/main/java/forestry/apiculture/genetics/JubilanceRequiresResource.java index 4060abb69..b8ef025bf 100644 --- a/src/main/java/forestry/apiculture/genetics/JubilanceRequiresResource.java +++ b/src/main/java/forestry/apiculture/genetics/JubilanceRequiresResource.java @@ -12,6 +12,7 @@ package forestry.apiculture.genetics; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; @@ -33,9 +34,17 @@ public class JubilanceRequiresResource implements IJubilanceProvider { public boolean isJubilant(IAlleleBeeSpecies species, IBeeGenome genome, IBeeHousing housing) { World world = housing.getWorld(); ChunkCoordinates housingCoords = housing.getCoordinates(); + Block block; + TileEntity tile; + int meta; + int i = 1; + do { + block = world.getBlock(housingCoords.posX, housingCoords.posY - i, housingCoords.posZ); + meta = world.getBlockMetadata(housingCoords.posX, housingCoords.posY - i, housingCoords.posZ); + tile = world.getTileEntity(housingCoords.posX, housingCoords.posY - i, housingCoords.posZ); + i++; + } while (tile instanceof IBeeHousing); - Block block = world.getBlock(housingCoords.posX, housingCoords.posY - 1, housingCoords.posZ); - int meta = world.getBlockMetadata(housingCoords.posX, housingCoords.posY - 1, housingCoords.posZ); return ItemStackUtil.equals(block, meta, blockRequired); } diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java index dfe13558c..cc88d4524 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java @@ -12,6 +12,7 @@ package forestry.core.genetics.mutations; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import forestry.api.apiculture.IBeeHousing; @@ -32,13 +33,15 @@ public class MutationConditionRequiresResource implements IMutationCondition { @Override public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { Block block; + TileEntity tile; int meta; int i = 1; do { block = world.getBlock(x, y - i, z); meta = world.getBlockMetadata(x, y - i, z); + tile = world.getTileEntity(x, y - i, z); i++; - } while (block instanceof IBeeHousing); + } while (tile instanceof IBeeHousing); return ItemStackUtil.equals(block, meta, blockRequired) ? 1 : 0; } diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java index 5e4acee57..d2bad5b8c 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; @@ -44,12 +45,14 @@ public class MutationConditionRequiresResourceOreDict implements IMutationCondit public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { Block block; int meta; + TileEntity tile; int i = 1; do { block = world.getBlock(x, y - i, z); meta = world.getBlockMetadata(x, y - i, z); + tile = world.getTileEntity(x, y-i, z); i++; - } while (block instanceof IBeeHousing); + } while (tile instanceof IBeeHousing); int[] oreIds = OreDictionary.getOreIDs(new ItemStack(block, 1, meta)); for (int oreId : oreIds) {