diff --git a/src/main/java/com/glodblock/github/common/tile/TileFluidPacketDecoder.java b/src/main/java/com/glodblock/github/common/tile/TileFluidPacketDecoder.java index 0500fd32..cdabb33e 100644 --- a/src/main/java/com/glodblock/github/common/tile/TileFluidPacketDecoder.java +++ b/src/main/java/com/glodblock/github/common/tile/TileFluidPacketDecoder.java @@ -4,7 +4,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.*; import appeng.api.networking.GridFlags; import appeng.api.networking.IGridNode; @@ -30,7 +31,8 @@ import appeng.util.item.AEFluidStack; import com.glodblock.github.common.item.ItemFluidPacket; -public class TileFluidPacketDecoder extends AENetworkTile implements IGridTickable, IAEAppEngInventory, IInventory { +public class TileFluidPacketDecoder extends AENetworkTile + implements IGridTickable, IAEAppEngInventory, IInventory, IFluidHandler { private final AppEngInternalInventory inventory = new AppEngInternalInventory(this, 1); private final BaseActionSource ownActionSource = new MachineSource(this); @@ -164,4 +166,65 @@ public class TileFluidPacketDecoder extends AENetworkTile implements IGridTickab public boolean isItemValidForSlot(int slot, ItemStack stack) { return stack.getItem() instanceof ItemFluidPacket; } + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + return 0; + } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack requestFluid, boolean doDrain) { + return this.drain(requestFluid, doDrain); + } + + private FluidStack drain(FluidStack requestFluid, boolean doDrain) { + if (requestFluid == null || requestFluid.amount <= 0) return null; + ItemStack fluidPacket = this.inventory.getStackInSlot(0); + if (fluidPacket != null) { + FluidStack fs = ItemFluidPacket.getFluidStack(fluidPacket); + if (fs.isFluidEqual(requestFluid)) { + if (fs.amount > requestFluid.amount) { + fs.amount -= requestFluid.amount; + if (doDrain) this.inventory.setInventorySlotContents(0, ItemFluidPacket.newStack(fs)); + return requestFluid; + } else { + if (doDrain) this.inventory.setInventorySlotContents(0, null); + return fs; + } + } + } + return null; + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + ItemStack fluidPacket = this.inventory.getStackInSlot(0); + if (fluidPacket != null) { + FluidStack requestFluid = ItemFluidPacket.getFluidStack(fluidPacket); + requestFluid.amount = maxDrain; + return this.drain(requestFluid, doDrain); + } + return null; + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + return false; + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return true; + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + ItemStack fluidPacket = this.inventory.getStackInSlot(0); + if (fluidPacket == null) { + return new FluidTankInfo[0]; + } else { + FluidStack fs = ItemFluidPacket.getFluidStack(fluidPacket); + return new FluidTankInfo[] { new FluidTankInfo(fs, fs.amount) }; + } + } } diff --git a/src/main/java/com/glodblock/github/crossmod/waila/VanillaTileWailaDataProvider.java b/src/main/java/com/glodblock/github/crossmod/waila/VanillaTileWailaDataProvider.java new file mode 100644 index 00000000..b4df57d8 --- /dev/null +++ b/src/main/java/com/glodblock/github/crossmod/waila/VanillaTileWailaDataProvider.java @@ -0,0 +1,71 @@ +package com.glodblock.github.crossmod.waila; + +import java.util.List; + +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +import com.glodblock.github.crossmod.waila.vanilla.FluidInvWailaDataProvider; +import com.google.common.collect.Lists; + +public class VanillaTileWailaDataProvider implements IWailaDataProvider { + + private final List providers; + + public VanillaTileWailaDataProvider() { + final IWailaDataProvider fluidInv = new FluidInvWailaDataProvider(); + this.providers = Lists.newArrayList(fluidInv); + } + + @Override + public ItemStack getWailaStack(final IWailaDataAccessor accessor, final IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(final ItemStack itemStack, final List currentToolTip, + final IWailaDataAccessor accessor, final IWailaConfigHandler config) { + for (final IWailaDataProvider provider : this.providers) { + provider.getWailaHead(itemStack, currentToolTip, accessor, config); + } + + return currentToolTip; + } + + @Override + public List getWailaBody(final ItemStack itemStack, final List currentToolTip, + final IWailaDataAccessor accessor, final IWailaConfigHandler config) { + for (final IWailaDataProvider provider : this.providers) { + provider.getWailaBody(itemStack, currentToolTip, accessor, config); + } + + return currentToolTip; + } + + @Override + public List getWailaTail(final ItemStack itemStack, final List currentToolTip, + final IWailaDataAccessor accessor, final IWailaConfigHandler config) { + for (final IWailaDataProvider provider : this.providers) { + provider.getWailaTail(itemStack, currentToolTip, accessor, config); + } + + return currentToolTip; + } + + @Override + public NBTTagCompound getNBTData(final EntityPlayerMP player, final TileEntity te, final NBTTagCompound tag, + final World world, final int x, final int y, final int z) { + for (final IWailaDataProvider provider : this.providers) { + provider.getNBTData(player, te, tag, world, x, y, z); + } + + return tag; + } +} diff --git a/src/main/java/com/glodblock/github/crossmod/waila/WailaInit.java b/src/main/java/com/glodblock/github/crossmod/waila/WailaInit.java index 70186a9a..f7f56f1f 100644 --- a/src/main/java/com/glodblock/github/crossmod/waila/WailaInit.java +++ b/src/main/java/com/glodblock/github/crossmod/waila/WailaInit.java @@ -2,6 +2,9 @@ package com.glodblock.github.crossmod.waila; import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.IWailaRegistrar; + +import net.minecraft.tileentity.TileEntity; + import appeng.api.parts.IPartHost; import appeng.tile.AEBaseTile; import appeng.util.Platform; @@ -23,5 +26,10 @@ public class WailaInit { final IWailaDataProvider tile = new TileWailaDataProvider(); registrar.registerBodyProvider(tile, AEBaseTile.class); registrar.registerNBTProvider(tile, AEBaseTile.class); + + final IWailaDataProvider vanillaTile = new VanillaTileWailaDataProvider(); + registrar.registerBodyProvider(vanillaTile, TileEntity.class); + registrar.registerNBTProvider(vanillaTile, TileEntity.class); + } } diff --git a/src/main/java/com/glodblock/github/crossmod/waila/vanilla/FluidInvWailaDataProvider.java b/src/main/java/com/glodblock/github/crossmod/waila/vanilla/FluidInvWailaDataProvider.java new file mode 100644 index 00000000..e895728c --- /dev/null +++ b/src/main/java/com/glodblock/github/crossmod/waila/vanilla/FluidInvWailaDataProvider.java @@ -0,0 +1,45 @@ +package com.glodblock.github.crossmod.waila.vanilla; + +import java.util.List; + +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; + +import appeng.integration.modules.waila.BaseWailaDataProvider; + +import com.glodblock.github.common.tile.TileCertusQuartzTank; +import com.glodblock.github.crossmod.waila.Tooltip; + +public class FluidInvWailaDataProvider extends BaseWailaDataProvider { + + @Override + public List getWailaBody(final ItemStack itemStack, final List currentToolTip, + final IWailaDataAccessor accessor, final IWailaConfigHandler config) { + final TileEntity te = accessor.getTileEntity(); + if (te instanceof TileCertusQuartzTank) { + for (FluidTankInfo info : ((IFluidHandler) te).getTankInfo(ForgeDirection.UNKNOWN)) { + if (info.fluid == null) continue; + currentToolTip.add(Tooltip.fluidFormat(info.fluid.getLocalizedName(), info.fluid.amount)); + } + } + return currentToolTip; + } + + @Override + public NBTTagCompound getNBTData(final EntityPlayerMP player, final TileEntity te, final NBTTagCompound tag, + final World world, final int x, final int y, final int z) { + if (te instanceof TileCertusQuartzTank) { + te.writeToNBT(tag); + } + return tag; + } +}