From 41019417f48dad5f8f130ebab5a21bde1266888a Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 2 Sep 2016 08:33:54 +0200 Subject: [PATCH] Fixed Phantom Energyface not working for certain tesla machines and Liquiface crashing with capabilities Closes #226 --- .../mod/tile/TileEntityPhantomEnergyface.java | 17 ++- .../mod/tile/TileEntityPhantomLiquiface.java | 131 +++++++++++++++--- 2 files changed, 125 insertions(+), 23 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java index b1922c3f4..da30f960f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomEnergyface.java @@ -110,11 +110,20 @@ public class TileEntityPhantomEnergyface extends TileEntityPhantomface implement public boolean isBoundThingInRange(){ if(super.isBoundThingInRange()){ TileEntity tile = this.worldObj.getTileEntity(this.boundPosition); - return tile != null && (tile instanceof IEnergyHandler || (ActuallyAdditions.teslaLoaded && tile.hasCapability(TeslaUtil.teslaHolder, null))); - } - else{ - return false; + if(tile != null){ + if(tile instanceof IEnergyHandler){ + return true; + } + else if(ActuallyAdditions.teslaLoaded){ + for(EnumFacing facing : EnumFacing.values()){ + if(tile.hasCapability(TeslaUtil.teslaHolder, facing)){ + return true; + } + } + } + } } + return false; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java index 4d52cbbba..c61187cdf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java @@ -13,8 +13,12 @@ package de.ellpeck.actuallyadditions.mod.tile; import de.ellpeck.actuallyadditions.mod.blocks.BlockPhantom; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidTankProperties; public class TileEntityPhantomLiquiface extends TileEntityPhantomface implements ISharingFluidHandler{ @@ -28,7 +32,16 @@ public class TileEntityPhantomLiquiface extends TileEntityPhantomface implements if(super.isBoundThingInRange()){ TileEntity tile = this.worldObj.getTileEntity(this.boundPosition); if(tile != null){ - return tile instanceof IFluidHandler || tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null); + if(tile instanceof net.minecraftforge.fluids.IFluidHandler){ + return true; + } + else{ + for(EnumFacing facing : EnumFacing.values()){ + if(tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, facing)){ + return true; + } + } + } } } return false; @@ -37,7 +50,20 @@ public class TileEntityPhantomLiquiface extends TileEntityPhantomface implements @Override public int fill(EnumFacing from, FluidStack resource, boolean doFill){ if(this.isBoundThingInRange()){ - return this.getHandler().fill(from, resource, doFill); + TileEntity tile = this.worldObj.getTileEntity(this.boundPosition); + if(tile != null){ + if(tile instanceof net.minecraftforge.fluids.IFluidHandler){ + return ((net.minecraftforge.fluids.IFluidHandler)tile).fill(from, resource, doFill); + } + else{ + if(tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, from)){ + IFluidHandler cap = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, from); + if(cap != null){ + return cap.fill(resource, doFill); + } + } + } + } } return 0; } @@ -45,7 +71,20 @@ public class TileEntityPhantomLiquiface extends TileEntityPhantomface implements @Override public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain){ if(this.isBoundThingInRange()){ - return this.getHandler().drain(from, resource, doDrain); + TileEntity tile = this.worldObj.getTileEntity(this.boundPosition); + if(tile != null){ + if(tile instanceof net.minecraftforge.fluids.IFluidHandler){ + return ((net.minecraftforge.fluids.IFluidHandler)tile).drain(from, resource, doDrain); + } + else{ + if(tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, from)){ + IFluidHandler cap = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, from); + if(cap != null){ + return cap.drain(resource, doDrain); + } + } + } + } } return null; } @@ -53,37 +92,91 @@ public class TileEntityPhantomLiquiface extends TileEntityPhantomface implements @Override public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain){ if(this.isBoundThingInRange()){ - return this.getHandler().drain(from, maxDrain, doDrain); + TileEntity tile = this.worldObj.getTileEntity(this.boundPosition); + if(tile != null){ + if(tile instanceof net.minecraftforge.fluids.IFluidHandler){ + return ((net.minecraftforge.fluids.IFluidHandler)tile).drain(from, maxDrain, doDrain); + } + else{ + if(tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, from)){ + IFluidHandler cap = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, from); + if(cap != null){ + return cap.drain(maxDrain, doDrain); + } + } + } + } } return null; } @Override public boolean canFill(EnumFacing from, Fluid fluid){ - return this.isBoundThingInRange() && this.getHandler().canFill(from, fluid); + if(this.isBoundThingInRange()){ + TileEntity tile = this.worldObj.getTileEntity(this.boundPosition); + if(tile != null){ + if(tile instanceof net.minecraftforge.fluids.IFluidHandler){ + return ((net.minecraftforge.fluids.IFluidHandler)tile).canFill(from, fluid); + } + else{ + if(tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, from)){ + IFluidHandler cap = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, from); + if(cap != null){ + FluidStack stack = new FluidStack(fluid, 1); + IFluidTankProperties[] props = cap.getTankProperties(); + if(props != null){ + for(IFluidTankProperties prop : props){ + if(prop.canFillFluidType(stack)){ + return true; + } + } + } + } + } + } + } + } + return false; } @Override public boolean canDrain(EnumFacing from, Fluid fluid){ - return this.isBoundThingInRange() && this.getHandler().canDrain(from, fluid); + if(this.isBoundThingInRange()){ + TileEntity tile = this.worldObj.getTileEntity(this.boundPosition); + if(tile != null){ + if(tile instanceof net.minecraftforge.fluids.IFluidHandler){ + return ((net.minecraftforge.fluids.IFluidHandler)tile).canDrain(from, fluid); + } + else{ + if(tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, from)){ + IFluidHandler cap = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, from); + if(cap != null){ + FluidStack stack = new FluidStack(fluid, 1); + IFluidTankProperties[] props = cap.getTankProperties(); + if(props != null){ + for(IFluidTankProperties prop : props){ + if(prop.canDrainFluidType(stack)){ + return true; + } + } + } + } + } + } + } + } + return false; } @Override public FluidTankInfo[] getTankInfo(EnumFacing from){ - if(this.isBoundThingInRange()){ - return this.getHandler().getTankInfo(from); + TileEntity tile = this.worldObj.getTileEntity(this.boundPosition); + if(tile instanceof net.minecraftforge.fluids.IFluidHandler){ + return ((net.minecraftforge.fluids.IFluidHandler)tile).getTankInfo(from); } - return new FluidTankInfo[0]; - } - - public IFluidHandler getHandler(){ - if(this.boundPosition != null){ - TileEntity tile = this.worldObj.getTileEntity(this.boundPosition); - if(tile instanceof IFluidHandler){ - return (IFluidHandler)tile; - } + else{ + return new FluidTankInfo[0]; } - return null; } @Override