mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-21 04:22:26 +00:00
Implemented new container edit modes in Portable Tank and Dynamic Tank, still need to set up IFluidContainerItem integration with the Dynamic Tank
This commit is contained in:
1 parent
12f3ef8665
commit
fc878661d5
3 files changed
+63
-7
No files matched your search
@@ -10,14 +10,19 @@ public final class FluidContainerUtils
|
||||
{
|
||||
public static FluidStack extractFluid(FluidTank tileTank, ItemStack container)
|
||||
{
|
||||
return extractFluid(tileTank, container, null);
|
||||
return extractFluid(tileTank, container, tileTank.getFluid() != null ? tileTank.getFluid().getFluid() : null);
|
||||
}
|
||||
|
||||
public static FluidStack extractFluid(FluidTank tileTank, ItemStack container, Fluid fluid)
|
||||
{
|
||||
IFluidContainerItem item = (IFluidContainerItem)container.getItem();
|
||||
|
||||
if(fluid != null && item.getFluid(container) != null && item.getFluid(container).getFluid() != fluid)
|
||||
if(item.getFluid(container) == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
if(fluid != null && item.getFluid(container).getFluid() != fluid)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user