Update for new fluid capabilities

This commit is contained in:
mezz committed 2016-06-04 04:25:51 -07:00
1 parent dbbb727576
commit 7bd5bb120d
58 files changed
+968 -1635

No files matched your search

@@ -28,6 +28,7 @@ import java.util.Map;
import java.util.Set;
import java.util.Stack;
import forestry.core.fluids.FluidHelper;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@@ -146,7 +147,8 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
public FarmController(World world) {
super(world, FarmMultiblockSizeLimits.instance);
this.resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, FluidRegistry.WATER);
this.resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY).setFilters(FluidRegistry.WATER);
this.tankManager = new TankManager(this, resourceTank);
this.inventory = new InventoryFarm(this);
@@ -790,7 +792,8 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
@Override
public boolean hasLiquid(FluidStack liquid) {
return resourceTank.canDrain(liquid);
FluidStack drained = resourceTank.drainInternal(liquid, false);
return FluidHelper.areFluidStacksEqual(drained, liquid);
}
@Override
@@ -19,7 +19,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidUtil;
import forestry.api.farming.FarmDirection;
import forestry.api.farming.IFarmInventory;
@@ -75,8 +76,8 @@ public class InventoryFarm extends InventoryAdapterRestricted implements IFarmIn
} else if (SlotUtil.isSlotInRange(slotIndex, SLOT_RESOURCES_1, SLOT_RESOURCES_COUNT)) {
return acceptsAsResource(itemStack);
} else if (SlotUtil.isSlotInRange(slotIndex, SLOT_CAN, SLOT_CAN_COUNT)) {
Fluid fluid = FluidHelper.getFluidInContainer(itemStack);
return farmController.getTankManager().accepts(fluid);
FluidStack fluid = FluidUtil.getFluidContained(itemStack);
return farmController.getTankManager().canFillFluidType(fluid);
}
return false;
}
@@ -14,50 +14,35 @@ import javax.annotation.Nonnull;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import forestry.core.fluids.ITankManager;
import forestry.core.tiles.ILiquidTankTile;
public class TileFarmValve extends TileFarm implements ILiquidTankTile, IFluidHandler {
/* ILIQUIDTANKCONTAINER */
@Override
public int fill(EnumFacing from, FluidStack resource, boolean doFill) {
return getTankManager().fill(from, resource, doFill);
}
@Override
public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) {
return getTankManager().drain(from, resource, doDrain);
}
@Override
public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) {
return getTankManager().drain(from, maxDrain, doDrain);
}
@Override
public boolean canFill(EnumFacing from, Fluid fluid) {
return getTankManager().canFill(from, fluid);
}
@Override
public boolean canDrain(EnumFacing from, Fluid fluid) {
return getTankManager().canDrain(from, fluid);
}
@Override
public FluidTankInfo[] getTankInfo(EnumFacing from) {
return getTankManager().getTankInfo(from);
}
public class TileFarmValve extends TileFarm implements ILiquidTankTile {
@Nonnull
@Override
public ITankManager getTankManager() {
return getMultiblockLogic().getController().getTankManager();
}
@Override
public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
if (super.hasCapability(capability, facing)) {
return true;
}
return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY;
}
@Override
public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
if (super.hasCapability(capability, facing)) {
return super.getCapability(capability, facing);
}
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(getTankManager());
}
return null;
}
}