Begin transitioning to new fluid system, doesn't exactly work yet

This commit is contained in:
aidancbrady committed 2016-06-27 19:56:53 -04:00
1 parent d70efc5cc7
commit 6086bc9f53
5 files changed
+106 -53

No files matched your search

@@ -18,7 +18,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.eventhandler.Event;
@@ -165,7 +165,7 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
if(acceptor != null && fluidToSend != null)
{
fluidSent += acceptor.fill(side, PipeUtils.copy(fluidToSend, currentSending), doTransfer);
fluidSent += acceptor.fill(PipeUtils.copy(fluidToSend, currentSending), doTransfer);
}
if(fluidSent > prev)
@@ -306,7 +306,7 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
for(EnumFacing side : sides)
{
if(acceptor != null && acceptor.canFill(side, fluidToSend.getFluid()))
if(acceptor != null && PipeUtils.canFill(acceptor, fluidToSend))
{
toReturn.add(acceptor);
break;
@@ -13,18 +13,20 @@ import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.fluids.capability.FluidTankPropertiesWrapper;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.fluids.capability.IFluidTankProperties;
public class PartMechanicalPipe extends PartTransmitter<IFluidHandler, FluidNetwork> implements IFluidHandler
{
public float currentScale;
public FluidTank buffer = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME);
public FluidTank buffer = new FluidTank(Fluid.BUCKET_VOLUME);
public FluidStack lastWrite;
@@ -54,11 +56,11 @@ public class PartMechanicalPipe extends PartTransmitter<IFluidHandler, FluidNetw
if(container != null)
{
FluidStack received = container.drain(side.getOpposite(), getPullAmount(), false);
FluidStack received = container.drain(getPullAmount(), false);
if(received != null && received.amount != 0)
{
container.drain(side.getOpposite(), takeFluid(received, true), true);
container.drain(takeFluid(received, true), true);
}
}
}
@@ -214,49 +216,39 @@ public class PartMechanicalPipe extends PartTransmitter<IFluidHandler, FluidNetw
}
@Override
public int fill(EnumFacing from, FluidStack resource, boolean doFill)
public int fill(FluidStack resource, boolean doFill)
{
if(getConnectionType(from) == ConnectionType.NORMAL)
{
return takeFluid(resource, doFill);
}
return 0;
return takeFluid(resource, doFill);
}
@Override
public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain)
public FluidStack drain(int maxDrain, boolean doDrain)
{
return null;
}
@Override
public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain)
public FluidStack drain(FluidStack resource, boolean doDrain)
{
return null;
}
@Override
public boolean canFill(EnumFacing from, Fluid fluid)
public IFluidTankProperties[] getTankProperties()
{
return getConnectionType(from) == ConnectionType.NORMAL;
}
return new IFluidTankProperties[] {new FluidTankPropertiesWrapper(buffer) {
@Override
public boolean canFillFluidType(FluidStack fluidStack)
{
return true;
}
@Override
public boolean canDrain(EnumFacing from, Fluid fluid)
{
return false;
}
@Override
public FluidTankInfo[] getTankInfo(EnumFacing from)
{
if(getConnectionType(from) != ConnectionType.NONE)
{
return new FluidTankInfo[] {buffer.getInfo()};
}
return new FluidTankInfo[0];
@Override
public boolean canDrainFluidType(FluidStack fluidStack)
{
return false;
}
}};
}
public int getPullAmount()
@@ -306,4 +298,22 @@ public class PartMechanicalPipe extends PartTransmitter<IFluidHandler, FluidNetw
super.writeUpdatePacket(packet);
}
@Override
public boolean hasCapability(Capability<?> capability, EnumFacing side)
{
return (getConnectionType(side) != ConnectionType.NONE && capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY)
|| super.hasCapability(capability, side);
}
@Override
public <T> T getCapability(Capability<T> capability, EnumFacing side)
{
if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY && getConnectionType(side) != ConnectionType.NONE)
{
return (T)this;
}
return super.getCapability(capability, side);
}
}
@@ -26,7 +26,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
@@ -11,10 +11,11 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.fluids.capability.IFluidTankProperties;
public final class PipeUtils
{
@@ -22,22 +23,18 @@ public final class PipeUtils
public static boolean isValidAcceptorOnSide(TileEntity tile, EnumFacing side)
{
if(CapabilityUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()) || !(tile instanceof IFluidHandler))
if(tile == null || CapabilityUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()) ||
!CapabilityUtils.hasCapability(tile, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side.getOpposite()))
{
return false;
}
IFluidHandler container = (IFluidHandler)tile;
FluidTankInfo[] infoArray = container.getTankInfo(side.getOpposite());
IFluidHandler container = CapabilityUtils.getCapability(tile, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side.getOpposite());
IFluidTankProperties[] infoArray = container.getTankProperties();
if(container.canDrain(side.getOpposite(), FluidRegistry.WATER)
|| container.canFill(side.getOpposite(), FluidRegistry.WATER)) //I hesitate to pass null to these.
if(infoArray != null && infoArray.length > 0)
{
return true;
}
else if(infoArray != null && infoArray.length > 0)
{
for(FluidTankInfo info : infoArray)
for(IFluidTankProperties info : infoArray)
{
if(info != null)
{
@@ -67,9 +64,10 @@ public final class PipeUtils
{
TileEntity acceptor = world.getTileEntity(pos.offset(orientation));
if(acceptor instanceof IFluidHandler)
if(acceptor != null && CapabilityUtils.hasCapability(acceptor, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, orientation.getOpposite()))
{
acceptors[orientation.ordinal()] = (IFluidHandler)acceptor;
IFluidHandler handler = CapabilityUtils.getCapability(acceptor, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, orientation.getOpposite());
acceptors[orientation.ordinal()] = handler;
}
}
@@ -97,7 +95,7 @@ public final class PipeUtils
{
IFluidHandler handler = possibleAcceptors[i];
if(handler != null && handler.canFill(EnumFacing.getFront(i).getOpposite(), stack.getFluid()))
if(handler != null && canFill(handler, stack))
{
availableAcceptors.add(handler);
}
@@ -125,7 +123,7 @@ public final class PipeUtils
}
EnumFacing dir = EnumFacing.getFront(Arrays.asList(possibleAcceptors).indexOf(acceptor)).getOpposite();
toSend -= acceptor.fill(dir, copy(stack, currentSending), true);
toSend -= acceptor.fill(copy(stack, currentSending), true);
}
}
@@ -139,4 +137,30 @@ public final class PipeUtils
return ret;
}
public static boolean canFill(IFluidHandler handler, FluidStack stack)
{
for(IFluidTankProperties props : handler.getTankProperties())
{
if(props.canFillFluidType(stack))
{
return true;
}
}
return false;
}
public static boolean canDrain(IFluidHandler handler, FluidStack stack)
{
for(IFluidTankProperties props : handler.getTankProperties())
{
if(props.canDrainFluidType(stack))
{
return true;
}
}
return false;
}
}
@@ -20,11 +20,13 @@ import mekanism.common.util.PipeUtils;
import mekanism.generators.common.content.turbine.TurbineFluidTank;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.fml.common.Optional.Interface;
import net.minecraftforge.fml.common.Optional.InterfaceList;
import net.minecraftforge.fml.common.Optional.Method;
@@ -403,4 +405,21 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I
{
return LangUtils.localize("gui.industrialTurbine");
}
@Override
public boolean hasCapability(Capability<?> capability, EnumFacing side)
{
return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, side);
}
@Override
public <T> T getCapability(Capability<T> capability, EnumFacing side)
{
if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY)
{
return (T)this;
}
return super.getCapability(capability, side);
}
}