Adding Fluid and Item Capability to the machine tile entity

This commit is contained in:
Nedelosk committed 2016-10-28 14:11:28 +02:00
1 parent d77daf41d0
commit 91933a738b
6 files changed
+86 -93

No files matched your search

@@ -15,10 +15,12 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.ITickable;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.energy.CapabilityEnergy;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidTank;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.wrapper.InvWrapper;
import javax.annotation.Nullable;
@@ -191,36 +193,6 @@ public class TileEntityMachineBase extends TileEntity implements IInventoryMachi
return this.getTankContainer().getTankSlot(index);
}
@Override
public int fill(final EnumFacing from, final FluidStack resource, final boolean doFill) {
return this.getTankContainer().fill(from, resource, doFill);
}
@Override
public FluidStack drain(final EnumFacing from, final FluidStack resource, final boolean doDrain) {
return this.getTankContainer().drain(from, resource, doDrain);
}
@Override
public FluidStack drain(final EnumFacing from, final int maxDrain, final boolean doDrain) {
return this.getTankContainer().drain(from, maxDrain, doDrain);
}
@Override
public boolean canFill(final EnumFacing from, final Fluid fluid) {
return this.getTankContainer().canFill(from, fluid);
}
@Override
public boolean canDrain(final EnumFacing from, final Fluid fluid) {
return this.getTankContainer().canDrain(from, fluid);
}
@Override
public FluidTankInfo[] getTankInfo(final EnumFacing from) {
return this.getTankContainer().getTankInfo(from);
}
@Override
public IFluidTank[] getTanks() {
return this.getTankContainer().getTanks();
@@ -282,13 +254,17 @@ public class TileEntityMachineBase extends TileEntity implements IInventoryMachi
@Override
public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
return (capability == CapabilityEnergy.ENERGY && (canExtract() || canReceive())) || super.hasCapability(capability, facing);
return (capability == CapabilityEnergy.ENERGY && (canExtract() || canReceive())) || capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, facing);
}
@Override
public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
if (capability == CapabilityEnergy.ENERGY) {
return (T) this;
return CapabilityEnergy.ENERGY.cast(this);
}else if(capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY){
return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(new InvWrapper(getInventory()));
}else if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){
return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(getHandler(facing));
}
return super.getCapability(capability, facing);
}
@@ -303,4 +279,9 @@ public class TileEntityMachineBase extends TileEntity implements IInventoryMachi
}
@Override
public IFluidHandler getHandler(EnumFacing from) {
return getTankContainer().getHandler(from);
}
}
@@ -11,18 +11,28 @@ import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidTank;
import net.minecraftforge.fluids.capability.FluidTankProperties;
import net.minecraftforge.fluids.capability.FluidTankPropertiesWrapper;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.fluids.capability.IFluidTankProperties;
import java.util.ArrayList;
import java.util.EnumMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
public class ComponentTankContainer extends MachineComponent implements ITankMachine {
private Map<Integer, TankSlot> tanks;
private EnumMap<EnumFacing, IFluidHandler> handlers;
public ComponentTankContainer(final IMachine machine) {
super(machine);
this.tanks = new LinkedHashMap<>();
this.handlers = new EnumMap<>(EnumFacing.class);
for(EnumFacing facing : EnumFacing.VALUES){
handlers.put(facing, new TankContainer(facing));
}
}
@Override
@@ -32,24 +42,6 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac
return tank;
}
@Override
public final int fill(final EnumFacing from, final FluidStack resource, final boolean doFill) {
final int index = this.getTankIndexToFill(from, resource);
if (this.tanks.containsKey(index)) {
return this.fill(index, resource, doFill);
}
return 0;
}
@Override
public final FluidStack drain(final EnumFacing from, final int maxDrain, final boolean doDrain) {
final int index = this.getTankIndexToDrain(from, null);
if (this.tanks.containsKey(index)) {
return this.drain(index, maxDrain, doDrain);
}
return null;
}
private final int fill(final int tankIndex, final FluidStack resource, final boolean doFill) {
if (!this.tanks.containsKey(tankIndex)) {
return 0;
@@ -159,37 +151,59 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac
return this.tanks.get(index);
}
@Override
public FluidStack drain(final EnumFacing from, final FluidStack resource, final boolean doDrain) {
final int index = this.getTankIndexToDrain(from, null);
if (this.tanks.containsKey(index)) {
return this.drain(index, resource.amount, doDrain);
}
return null;
}
@Override
public boolean canFill(final EnumFacing from, final Fluid fluid) {
return this.fill(from, new FluidStack(fluid, 1), false) > 0;
}
@Override
public boolean canDrain(final EnumFacing from, final Fluid fluid) {
return this.drain(from, new FluidStack(fluid, 1), false) != null;
}
@Override
public FluidTankInfo[] getTankInfo(final EnumFacing from) {
final FluidTankInfo[] info = new FluidTankInfo[this.getTanks().length];
for (int i = 0; i < info.length; ++i) {
info[i] = new FluidTankInfo(this.getTanks()[i]);
}
return info;
}
public void markDirty() {
if (this.getMachine() != null) {
this.getMachine().markDirty();
}
}
@Override
public IFluidHandler getHandler(EnumFacing from) {
return handlers.get(from);
}
private class TankContainer implements IFluidHandler{
EnumFacing from;
public TankContainer(EnumFacing from) {
this.from = from;
}
@Override
public final int fill(final FluidStack resource, final boolean doFill) {
final int index = getTankIndexToFill(from, resource);
if (tanks.containsKey(index)) {
return ComponentTankContainer.this.fill(index, resource, doFill);
}
return 0;
}
@Override
public FluidStack drain(final FluidStack resource, final boolean doDrain) {
final int index = getTankIndexToDrain(from, null);
if (tanks.containsKey(index)) {
return ComponentTankContainer.this.drain(index, resource.amount, doDrain);
}
return null;
}
@Override
public final FluidStack drain(final int maxDrain, final boolean doDrain) {
final int index = getTankIndexToDrain(from, null);
if (tanks.containsKey(index)) {
return ComponentTankContainer.this.drain(index, maxDrain, doDrain);
}
return null;
}
@Override
public IFluidTankProperties[] getTankProperties() {
final IFluidTankProperties[] properties = new IFluidTankProperties[getTanks().length];
for (int i = 0; i < properties.length; ++i) {
IFluidTank tank = getTanks()[i];
properties[i] = new FluidTankProperties(tank.getFluid(), tank.getCapacity());
}
return properties;
}
}
}
@@ -2,10 +2,11 @@ package binnie.core.machines.power;
import binnie.core.machines.inventory.IValidatedTankContainer;
import binnie.core.machines.inventory.TankSlot;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.fluids.IFluidTank;
import net.minecraftforge.fluids.capability.IFluidHandler;
public interface ITankMachine extends IFluidHandler, IValidatedTankContainer {
public interface ITankMachine extends IValidatedTankContainer {
TankInfo[] getTankInfos();
IFluidTank[] getTanks();
@@ -15,4 +16,6 @@ public interface ITankMachine extends IFluidHandler, IValidatedTankContainer {
IFluidTank getTank(final int p0);
TankSlot getTankSlot(final int p0);
IFluidHandler getHandler(EnumFacing from);
}
@@ -1,6 +0,0 @@
package binnie.core.util;
public class Fluids {
public static final String BIO_ETHANOL = "bio.ethanol";
}
@@ -18,6 +18,7 @@ import binnie.genetics.item.GeneticsItems;
import binnie.genetics.machine.ComponentGeneticGUI;
import binnie.genetics.machine.GeneticMachine;
import binnie.genetics.machine.ModuleMachine;
import forestry.core.fluids.Fluids;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
@@ -50,12 +51,12 @@ public class PackageGenepool extends GeneticMachine.PackageGeneticBase implement
tankEthanol.setValidator(new TankValidator() {
@Override
public String getTooltip() {
return FluidRegistry.getFluidStack("bio.ethanol", 1).getLocalizedName();
return FluidRegistry.getFluidStack(Fluids.BIO_ETHANOL.getTag(), 1).getLocalizedName();
}
@Override
public boolean isValid(final FluidStack stack) {
return "bio.ethanol".equals(stack.getFluid().getName());
return Fluids.BIO_ETHANOL.getTag().equals(stack.getFluid().getName());
}
});
ComponentInventoryTransfer transfer = new ComponentInventoryTransfer(machine);
@@ -12,7 +12,6 @@ import binnie.core.machines.inventory.InventorySlot;
import binnie.core.machines.inventory.SlotValidator;
import binnie.core.machines.inventory.TankValidator;
import binnie.core.machines.power.ComponentPowerReceptor;
import binnie.core.util.Fluids;
import binnie.craftgui.minecraft.IMachineInformation;
import binnie.genetics.core.GeneticsGUI;
import binnie.genetics.core.GeneticsTexture;
@@ -20,6 +19,7 @@ import binnie.genetics.item.GeneticsItems;
import binnie.genetics.machine.ComponentGeneticGUI;
import binnie.genetics.machine.GeneticMachine;
import binnie.genetics.machine.ModuleMachine;
import forestry.core.fluids.Fluids;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
@@ -58,12 +58,12 @@ public class PackageIsolator extends GeneticMachine.PackageGeneticBase implement
tanks.addTank(Isolator.TANK_ETHANOL, "input", 1000).setValidator(new TankValidator() {
@Override
public String getTooltip() {
return FluidRegistry.getFluidStack(Fluids.BIO_ETHANOL, 1).getLocalizedName();
return FluidRegistry.getFluidStack(Fluids.BIO_ETHANOL.getTag(), 1).getLocalizedName();
}
@Override
public boolean isValid(final FluidStack stack) {
return Objects.equals(stack.getFluid().getName(), Fluids.BIO_ETHANOL);
return Objects.equals(stack.getFluid().getName(), Fluids.BIO_ETHANOL.getTag());
}
});
final ComponentChargedSlots chargedSlots = new ComponentChargedSlots(machine);