upstream/AE2FluidCraft-Rework
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git synced 2026-11-15 09:34:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor 5

Browse Source
This commit is contained in:
GlodBlock committed 2023-01-22 19:37:44 +08:00
1 parent d9449622b9
commit 5b62c4fdc8
17 files changed
+204 -510
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/glodblock/github/util/Util.java
+17 -5
View File
@@ -10,9 +10,11 @@ import appeng.api.parts.IPart;
import appeng.api.storage.data.IAEFluidStack;
import appeng.util.item.AEFluidStack;
import com.glodblock.github.common.item.ItemFluidPacket;
import com.glodblock.github.inventory.IAEFluidTank;
import cpw.mods.fml.common.ModContainer;
import cpw.mods.fml.common.registry.GameData;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -190,6 +192,17 @@ public final class Util {
return fluid1.isFluidEqual(fluid2);
}
public static void mirrorFluidToPacket(IInventory packet, IAEFluidTank fluidTank) {
for (int i = 0; i < fluidTank.getSlots(); i++) {
IAEFluidStack fluid = fluidTank.getFluidInSlot(i);
if (fluid == null) {
packet.setInventorySlotContents(i, null);
} else {
packet.setInventorySlotContents(i, ItemFluidPacket.newDisplayStack(fluid.getFluidStack()));
}
}
}
public static class FluidUtil {
public static IAEFluidStack createAEFluidStack(Fluid fluid) {
return createAEFluidStack(new FluidStack(fluid, FluidContainerRegistry.BUCKET_VOLUME));
@@ -301,12 +314,11 @@ public final class Util {
if (item instanceof IFluidContainerItem) {
FluidStack drained = ((IFluidContainerItem) item).drain(itemStack, fluid.amount, true);
int amountDrained = drained != null && drained.getFluid() == fluid.getFluid() ? drained.amount : 0;
return new MutablePair<Integer, ItemStack>(amountDrained, itemStack);
return new MutablePair<>(amountDrained, itemStack);
} else if (FluidContainerRegistry.isContainer(itemStack)) {
FluidStack content = FluidContainerRegistry.getFluidForFilledItem(itemStack);
int amountDrained = content != null && content.getFluid() == fluid.getFluid() ? content.amount : 0;
return new MutablePair<Integer, ItemStack>(
amountDrained, FluidContainerRegistry.drainFluidContainer(itemStack));
return new MutablePair<>(amountDrained, FluidContainerRegistry.drainFluidContainer(itemStack));
}
return null;
@@ -321,14 +333,14 @@ public final class Util {
int filled = ((IFluidContainerItem) item).fill(itemStack, fluid, true);
// Return the filled itemstack.
return new MutablePair<Integer, ItemStack>(filled, itemStack);
return new MutablePair<>(filled, itemStack);
} else if (FluidContainerRegistry.isContainer(itemStack)) {
// Fill it through the fluidcontainer registry.
ItemStack filledContainer = FluidContainerRegistry.fillFluidContainer(fluid, itemStack);
// get the filled fluidstack.
FluidStack filled = FluidContainerRegistry.getFluidForFilledItem(filledContainer);
// Return filled container and fill amount.
return new MutablePair<Integer, ItemStack>(filled != null ? filled.amount : 0, filledContainer);
return new MutablePair<>(filled != null ? filled.amount : 0, filledContainer);
}
return null;
}