Fix crash from WATER effect bees

This commit is contained in:
mezz committed 2016-10-20 21:48:08 -07:00
1 parent 885ee83ede
commit d4cb398ac1
2 files changed
+50 -9

No files matched your search

@@ -0,0 +1,35 @@
package binnie.core.util;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability;
public class TileUtil {
@Nullable
public static <T extends TileEntity> T getTile(@Nonnull IBlockAccess world, @Nonnull BlockPos pos, @Nonnull Class<T> tileClass) {
if(pos == null){
return null;
}
TileEntity tileEntity = world.getTileEntity(pos);
if (tileClass.isInstance(tileEntity)) {
return tileClass.cast(tileEntity);
} else {
return null;
}
}
@Nullable
public static <T> T getCapability(World world, BlockPos pos, Capability<T> capability, EnumFacing facing) {
TileEntity tileEntity = world.getTileEntity(pos);
if (tileEntity != null && tileEntity.hasCapability(capability, facing)) {
return tileEntity.getCapability(capability, facing);
}
return null;
}
}
@@ -1,9 +1,19 @@
package binnie.extrabees.genetics.effect;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
import java.util.List;
import binnie.Binnie;
import binnie.core.util.TileUtil;
import binnie.extrabees.ExtraBees;
import binnie.extrabees.genetics.ExtraBeesFlowers;
import forestry.api.apiculture.*;
import forestry.api.apiculture.BeeManager;
import forestry.api.apiculture.IAlleleBeeEffect;
import forestry.api.apiculture.IArmorApiarist;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeHousing;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IEffectData;
import forestry.core.proxy.Proxies;
@@ -31,11 +41,7 @@ import net.minecraft.util.math.Vec3i;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
import java.util.List;
import net.minecraftforge.fluids.capability.IFluidHandler;
public enum ExtraBeesEffect implements IAlleleBeeEffect {
ECTOPLASM,
@@ -412,9 +418,9 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect {
if (world.rand.nextInt(120) > 1) {
return null;
}
final TileEntity tile = world.getTileEntity(pos);
if (tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.UP)) {
tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.UP).fill(Binnie.Liquid.getLiquidStack("water", 100), true);
IFluidHandler fluidHandler = TileUtil.getCapability(world, pos, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.UP);
if (fluidHandler != null) {
fluidHandler.fill(Binnie.Liquid.getLiquidStack("water", 100), true);
break;
}
break;