1st commit

This commit is contained in:
lordIcocain committed 2025-02-22 22:59:45 +02:00
1 parent bedb2c25e1
commit b13bd463a0
16 files changed
+1025 -6

No files matched your search

@@ -22,12 +22,21 @@ public class AEFluidInventory implements IAEFluidTank {
private final IAEFluidStack[] fluids;
private final IAEFluidInventory handler;
private final int capacity;
private final long capacityLong;
public int lastIndex;
public AEFluidInventory(final IAEFluidInventory handler, final int slots, final int capcity) {
this.fluids = new IAEFluidStack[slots];
this.handler = handler;
this.capacity = capcity;
this.capacityLong = capcity;
}
public AEFluidInventory(final IAEFluidInventory handler, final int slots, final long capcity) {
this.fluids = new IAEFluidStack[slots];
this.handler = handler;
this.capacity = Integer.MAX_VALUE;
this.capacityLong = capcity;
}
public AEFluidInventory(final IAEFluidInventory handler, final int slots) {
@@ -122,6 +131,37 @@ public class AEFluidInventory implements IAEFluidTank {
return amountToStore;
}
public long fill(final int slot, final IAEFluidStack resource, final boolean doFill) {
if (resource == null || resource.getStackSize() <= 0) {
return 0;
}
final IAEFluidStack fluid = this.fluids[slot];
if (fluid != null && !(fluid.getFluid() == resource.getFluid())) {
return 0;
}
long amountToStore = this.capacityLong;
if (fluid != null) {
amountToStore -= fluid.getStackSize();
}
amountToStore = Math.min(amountToStore, resource.getStackSize());
if (doFill) {
if (fluid == null) {
this.setFluidInSlot(slot, resource);
} else {
fluid.setStackSize(fluid.getStackSize() + amountToStore);
this.onContentChanged(slot);
}
}
return amountToStore;
}
public FluidStack drain(final int slot, final FluidStack resource, final boolean doDrain) {
final IAEFluidStack fluid = this.fluids[slot];
if (fluid == null || !fluid.getFluidStack().isFluidEqual(resource)) {
@@ -152,6 +192,28 @@ public class AEFluidInventory implements IAEFluidTank {
return stack;
}
public IAEFluidStack drain(final int slot, final long maxDrain, boolean doDrain) {
final IAEFluidStack fluid = this.fluids[slot];
if (fluid == null || maxDrain <= 0) {
return null;
}
long drained = maxDrain;
if (fluid.getStackSize() < drained) {
drained = fluid.getStackSize();
}
IAEFluidStack stack = fluid.copy().setStackSize(drained);
if (doDrain) {
fluid.setStackSize(fluid.getStackSize() - drained);
if (fluid.getStackSize() <= 0) {
this.fluids[slot] = null;
}
this.onContentChanged(slot);
}
return stack;
}
@Override
public int fill(ForgeDirection from, final FluidStack fluid, final boolean doFill) {
if (fluid == null || fluid.amount <= 0) {
@@ -5,6 +5,7 @@ import java.util.List;
import javax.annotation.Nullable;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import com.glodblock.github.client.gui.GuiCraftingStatus;
import com.glodblock.github.client.gui.GuiDualInterface;
@@ -37,6 +38,7 @@ import com.glodblock.github.client.gui.GuiOCPatternEditor;
import com.glodblock.github.client.gui.GuiPatternMulti;
import com.glodblock.github.client.gui.GuiPatternValueAmount;
import com.glodblock.github.client.gui.GuiRenamer;
import com.glodblock.github.client.gui.GuiSuperStoker;
import com.glodblock.github.client.gui.container.ContainerCraftingWireless;
import com.glodblock.github.client.gui.container.ContainerDualInterface;
import com.glodblock.github.client.gui.container.ContainerEssentiaMonitor;
@@ -65,6 +67,7 @@ import com.glodblock.github.client.gui.container.ContainerOCPatternEditor;
import com.glodblock.github.client.gui.container.ContainerPatternMulti;
import com.glodblock.github.client.gui.container.ContainerPatternValueAmount;
import com.glodblock.github.client.gui.container.ContainerRenamer;
import com.glodblock.github.client.gui.container.ContainerSuperStoker;
import com.glodblock.github.common.parts.PartFluidLevelEmitter;
import com.glodblock.github.common.parts.PartFluidStorageBus;
import com.glodblock.github.common.parts.base.FCPart;
@@ -76,6 +79,7 @@ import com.glodblock.github.common.tile.TileIngredientBuffer;
import com.glodblock.github.common.tile.TileLargeIngredientBuffer;
import com.glodblock.github.common.tile.TileLevelMaintainer;
import com.glodblock.github.common.tile.TileOCPatternEditor;
import com.glodblock.github.common.tile.TileSuperStoker;
import com.glodblock.github.inventory.IDualHost;
import com.glodblock.github.inventory.item.IFluidPortableCell;
import com.glodblock.github.inventory.item.IWirelessTerminal;
@@ -515,6 +519,18 @@ public enum GuiType {
return new GuiPatternValueAmount(player.inventory, inv);
}
}),
PATTERN_VALUE_SET_TILE(new TileGuiFactory<>(TileEntity.class) {
@Override
protected Object createServerGui(EntityPlayer player, TileEntity inv) {
return new ContainerPatternValueAmount(player.inventory, inv);
}
@Override
protected Object createClientGui(EntityPlayer player, TileEntity inv) {
return new GuiPatternValueAmount(player.inventory, inv);
}
}),
GUI_PATTERN_MULTI(new PartOrItemGuiFactory<>(ITerminalHost.class) {
@@ -527,6 +543,19 @@ public enum GuiType {
protected Object createClientGui(EntityPlayer player, ITerminalHost inv) {
return new GuiPatternMulti(player.inventory, inv);
}
}),
GUI_SUPER_STOKER(new TileGuiFactory<>(TileSuperStoker.class) {
@Override
protected Object createServerGui(EntityPlayer player, TileSuperStoker inv) {
return new ContainerSuperStoker(player.inventory, inv);
}
@Override
protected Object createClientGui(EntityPlayer player, TileSuperStoker inv) {
return new GuiSuperStoker(player.inventory, inv);
}
});
public static final List<GuiType> VALUES = ImmutableList.copyOf(values());
@@ -0,0 +1,28 @@
package com.glodblock.github.inventory.slot;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import com.glodblock.github.common.item.ItemFluidPacket;
import com.glodblock.github.util.Util;
import appeng.container.slot.IOptionalSlotHost;
import appeng.container.slot.OptionalSlotFake;
public class OptionalFluidSlotFake extends OptionalSlotFake {
public OptionalFluidSlotFake(final IInventory inv, final IOptionalSlotHost containerBus, final int idx, final int x,
final int y, final int offX, final int offY, final int groupNum) {
super(inv, containerBus, idx, x, y, offX, offY, groupNum);
}
@Override
public void putStack(ItemStack is) {
if (is == null) super.putStack(null);
FluidStack fluidStack = Util.getFluidFromItem(is);
if (fluidStack != null) {
super.putStack(ItemFluidPacket.newStack(fluidStack));
}
}
}