mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
null fluid handler
This commit is contained in:
1 parent
946ba5c48a
commit
07415eabe2
19 files changed
+128
-1
No files matched your search
@@ -2,10 +2,13 @@ package mekanism.common.base;
|
||||
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.capability.FluidTankProperties;
|
||||
import net.minecraftforge.fluids.capability.IFluidHandler;
|
||||
import net.minecraftforge.fluids.capability.IFluidTankProperties;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
public class FluidHandlerWrapper implements IFluidHandler
|
||||
{
|
||||
public IFluidHandlerWrapper wrapper;
|
||||
@@ -21,6 +24,9 @@ public class FluidHandlerWrapper implements IFluidHandler
|
||||
@Override
|
||||
public IFluidTankProperties[] getTankProperties()
|
||||
{
|
||||
if (side == null){
|
||||
return convertReadOnly(wrapper.getAllTanks());
|
||||
}
|
||||
return wrapper.getTankInfo(side) != null ? FluidTankProperties.convert(wrapper.getTankInfo(side))
|
||||
: new IFluidTankProperties[]{};
|
||||
}
|
||||
@@ -28,6 +34,9 @@ public class FluidHandlerWrapper implements IFluidHandler
|
||||
@Override
|
||||
public int fill(FluidStack resource, boolean doFill)
|
||||
{
|
||||
if (side == null){
|
||||
return 0;
|
||||
}
|
||||
if(wrapper.canFill(side, resource != null ? resource.getFluid() : null))
|
||||
{
|
||||
return wrapper.fill(side, resource, doFill);
|
||||
@@ -39,6 +48,10 @@ public class FluidHandlerWrapper implements IFluidHandler
|
||||
@Override
|
||||
public FluidStack drain(FluidStack resource, boolean doDrain)
|
||||
{
|
||||
if(side == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
if(wrapper.canDrain(side, resource != null ? resource.getFluid() : null))
|
||||
{
|
||||
return wrapper.drain(side, resource, doDrain);
|
||||
@@ -50,6 +63,10 @@ public class FluidHandlerWrapper implements IFluidHandler
|
||||
@Override
|
||||
public FluidStack drain(int maxDrain, boolean doDrain)
|
||||
{
|
||||
if(side == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
if(wrapper.canDrain(side, null))
|
||||
{
|
||||
return wrapper.drain(side, maxDrain, doDrain);
|
||||
@@ -57,4 +74,8 @@ public class FluidHandlerWrapper implements IFluidHandler
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private static IFluidTankProperties[] convertReadOnly(FluidTankInfo[] fluidTankInfos){
|
||||
return Arrays.stream(fluidTankInfos).map(t->new FluidTankProperties(t.fluid, t.capacity, false, false)).toArray(IFluidTankProperties[]::new);
|
||||
}
|
||||
}
|
||||
@@ -18,4 +18,6 @@ public interface IFluidHandlerWrapper
|
||||
boolean canDrain(EnumFacing from, Fluid fluid);
|
||||
|
||||
FluidTankInfo[] getTankInfo(EnumFacing from);
|
||||
|
||||
FluidTankInfo[] getAllTanks();
|
||||
}
|
||||
@@ -83,6 +83,12 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl
|
||||
return PipeUtils.EMPTY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getAllTanks()
|
||||
{
|
||||
return new FluidTankInfo[] { steamTank.getInfo(), waterTank.getInfo() };
|
||||
}
|
||||
|
||||
@Override
|
||||
public int fill(EnumFacing from, FluidStack resource, boolean doFill)
|
||||
{
|
||||
|
||||
@@ -455,6 +455,12 @@ public class TileEntityChemicalWasher extends TileEntityMachine implements IGasH
|
||||
return PipeUtils.EMPTY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getAllTanks()
|
||||
{
|
||||
return new FluidTankInfo[] {fluidTank.getInfo()};
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeSustainedData(ItemStack itemStack)
|
||||
{
|
||||
|
||||
@@ -28,6 +28,12 @@ public class TileEntityDynamicValve extends TileEntityDynamicTank implements IFl
|
||||
return ((!world.isRemote && structure != null) || (world.isRemote && clientHasStructure)) ? new FluidTankInfo[] {fluidTank.getInfo()} : PipeUtils.EMPTY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getAllTanks()
|
||||
{
|
||||
return getTankInfo(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int fill(EnumFacing from, FluidStack resource, boolean doFill)
|
||||
{
|
||||
|
||||
@@ -453,6 +453,12 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I
|
||||
return PipeUtils.EMPTY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getAllTanks()
|
||||
{
|
||||
return getTankInfo(EnumFacing.UP);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setFluidStack(FluidStack fluidStack, Object... data)
|
||||
{
|
||||
|
||||
@@ -554,6 +554,12 @@ public class TileEntityElectrolyticSeparator extends TileEntityMachine implement
|
||||
return new FluidTankInfo[] {fluidTank.getInfo()};
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getAllTanks()
|
||||
{
|
||||
return getTankInfo(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer)
|
||||
{
|
||||
|
||||
@@ -607,7 +607,13 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc
|
||||
{
|
||||
return new FluidTankInfo[] {fluidTank.getInfo()};
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getAllTanks()
|
||||
{
|
||||
return getTankInfo(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setFluidStack(FluidStack fluidStack, Object... data)
|
||||
{
|
||||
|
||||
@@ -417,6 +417,12 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen
|
||||
return PipeUtils.EMPTY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getAllTanks()
|
||||
{
|
||||
return getTankInfo(EnumFacing.UP);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setFluidStack(FluidStack fluidStack, Object... data)
|
||||
{
|
||||
|
||||
@@ -402,6 +402,12 @@ public class TileEntityPRC extends TileEntityBasicMachine<PressurizedInput, Pres
|
||||
return data.getFluidTankInfo(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getAllTanks()
|
||||
{
|
||||
return new FluidTankInfo[]{inputFluidTank.getInfo()};
|
||||
}
|
||||
|
||||
@Override
|
||||
public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer)
|
||||
{
|
||||
|
||||
@@ -527,6 +527,12 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp
|
||||
return PipeUtils.EMPTY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getAllTanks()
|
||||
{
|
||||
return hasFrequency() ? new FluidTankInfo[] { frequency.storedFluid.getInfo() } : PipeUtils.EMPTY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer)
|
||||
{
|
||||
|
||||
@@ -408,6 +408,12 @@ public class TileEntityRotaryCondensentrator extends TileEntityMachine implement
|
||||
return PipeUtils.EMPTY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getAllTanks()
|
||||
{
|
||||
return new FluidTankInfo[]{fluidTank.getInfo()};
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain)
|
||||
{
|
||||
|
||||
@@ -101,6 +101,12 @@ public class TileEntityThermalEvaporationValve extends TileEntityThermalEvaporat
|
||||
return new FluidTankInfo[] {new FluidTankInfo(controller.inputTank), new FluidTankInfo(controller.outputTank)};
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getAllTanks()
|
||||
{
|
||||
return getTankInfo(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getTemp()
|
||||
{
|
||||
|
||||
@@ -266,6 +266,12 @@ public class TileEntityMechanicalPipe extends TileEntityTransmitter<IFluidHandle
|
||||
return PipeUtils.EMPTY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getAllTanks()
|
||||
{
|
||||
return new FluidTankInfo[]{buffer.getInfo()};
|
||||
}
|
||||
|
||||
public int getPullAmount()
|
||||
{
|
||||
return tier.pipePullAmount;
|
||||
|
||||
@@ -325,4 +325,12 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui
|
||||
|
||||
return super.getCapability(capability, side);
|
||||
}
|
||||
|
||||
private static FluidTankInfo[] ALL_TANKS = new FluidTankInfo[0];
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getAllTanks()
|
||||
{
|
||||
return ALL_TANKS;
|
||||
}
|
||||
}
|
||||
@@ -354,6 +354,12 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu
|
||||
return new FluidTankInfo[] {lavaTank.getInfo()};
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getAllTanks()
|
||||
{
|
||||
return getTankInfo(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeSustainedData(ItemStack itemStack)
|
||||
{
|
||||
|
||||
@@ -172,6 +172,12 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl
|
||||
return new FluidTankInfo[] {getReactor().getWaterTank().getInfo(), getReactor().getSteamTank().getInfo()};
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getAllTanks()
|
||||
{
|
||||
return getTankInfo(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer)
|
||||
{
|
||||
|
||||
@@ -360,6 +360,12 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I
|
||||
return ((!world.isRemote && structure != null) || (world.isRemote && clientHasStructure)) ? new FluidTankInfo[] {fluidTank.getInfo()} : PipeUtils.EMPTY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getAllTanks()
|
||||
{
|
||||
return getTankInfo(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int fill(EnumFacing from, FluidStack resource, boolean doFill)
|
||||
{
|
||||
|
||||
@@ -56,6 +56,12 @@ public class TileEntityTurbineVent extends TileEntityTurbineCasing implements IF
|
||||
return ((!world.isRemote && structure != null) || (world.isRemote && clientHasStructure)) ? new FluidTankInfo[] {fakeInfo} : PipeUtils.EMPTY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getAllTanks()
|
||||
{
|
||||
return getTankInfo(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int fill(EnumFacing from, FluidStack resource, boolean doFill)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user