mirror of
https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git
synced 2026-11-16 01:54:59 +00:00
Use GT and ae2fс fluids in ME inputs/outputs and storagе (#191)
* use of GT and ae2fс fluids in inputs/outputs and storagе * remove unused imports --------- Co-authored-by: slprime <[email protected]>
This commit is contained in:
1 parent
e3cc9352b1
commit
0caf89e539
4 files changed
+43
-48
No files matched your search
@@ -55,6 +55,7 @@ import appeng.tile.networking.TileWireless;
|
||||
import appeng.util.Platform;
|
||||
import appeng.util.item.AEFluidStack;
|
||||
import baubles.api.BaublesApi;
|
||||
import codechicken.nei.recipe.StackInfo;
|
||||
import cpw.mods.fml.common.ModContainer;
|
||||
import cpw.mods.fml.common.registry.GameData;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
@@ -230,21 +231,10 @@ public final class Util {
|
||||
|
||||
public static AEFluidStack getAEFluidFromItem(ItemStack stack) {
|
||||
if (stack != null) {
|
||||
if (stack.getItem() instanceof IFluidContainerItem) {
|
||||
FluidStack fluid = ((IFluidContainerItem) stack.getItem()).getFluid(stack);
|
||||
if (fluid != null) {
|
||||
AEFluidStack fluid0 = AEFluidStack.create(fluid.copy());
|
||||
fluid0.setStackSize(fluid0.getStackSize() * stack.stackSize);
|
||||
return fluid0;
|
||||
}
|
||||
}
|
||||
if (FluidContainerRegistry.isContainer(stack)) {
|
||||
FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(stack);
|
||||
if (fluid != null) {
|
||||
AEFluidStack fluid0 = AEFluidStack.create(fluid.copy());
|
||||
fluid0.setStackSize(fluid0.getStackSize() * stack.stackSize);
|
||||
return fluid0;
|
||||
}
|
||||
FluidStack fluid = getFluidFromItem(stack);
|
||||
|
||||
if (fluid != null) {
|
||||
return AEFluidStack.create(fluid.copy());
|
||||
}
|
||||
}
|
||||
return null;
|
||||
@@ -252,21 +242,26 @@ public final class Util {
|
||||
|
||||
public static FluidStack getFluidFromItem(ItemStack stack) {
|
||||
if (stack != null) {
|
||||
FluidStack fluid = null;
|
||||
|
||||
if (stack.getItem() instanceof IFluidContainerItem) {
|
||||
FluidStack fluid = ((IFluidContainerItem) stack.getItem()).getFluid(stack);
|
||||
if (fluid != null) {
|
||||
FluidStack fluid0 = fluid.copy();
|
||||
fluid0.amount *= stack.stackSize;
|
||||
return fluid0;
|
||||
}
|
||||
fluid = ((IFluidContainerItem) stack.getItem()).getFluid(stack);
|
||||
} else if (FluidContainerRegistry.isContainer(stack)) {
|
||||
fluid = FluidContainerRegistry.getFluidForFilledItem(stack);
|
||||
} else if (stack.getItem() instanceof ItemFluidPacket) {
|
||||
fluid = ItemFluidPacket.getFluidStack(stack);
|
||||
} else if (stack.getItem() instanceof ItemFluidDrop) {
|
||||
fluid = ItemFluidDrop.getFluidStack(Util.copyStackWithSize(stack, 1));
|
||||
}
|
||||
if (FluidContainerRegistry.isContainer(stack)) {
|
||||
FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(stack);
|
||||
if (fluid != null) {
|
||||
FluidStack fluid0 = fluid.copy();
|
||||
fluid0.amount *= stack.stackSize;
|
||||
return fluid0;
|
||||
}
|
||||
|
||||
if (fluid == null) {
|
||||
fluid = StackInfo.getFluid(Util.copyStackWithSize(stack, 1));
|
||||
}
|
||||
|
||||
if (fluid != null) {
|
||||
FluidStack fluid0 = fluid.copy();
|
||||
fluid0.amount *= stack.stackSize;
|
||||
return fluid0;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
|
||||
Reference in new issue
Block a user