refactor 5

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

No files matched your search

@@ -24,8 +24,8 @@ import appeng.util.item.AEFluidStack;
import com.glodblock.github.client.textures.FCPartsTexture;
import com.glodblock.github.common.item.ItemFluidPacket;
import com.glodblock.github.inventory.AEFluidInventory;
import com.glodblock.github.inventory.IAEFluidInventory;
import com.glodblock.github.inventory.IAEFluidTank;
import com.glodblock.github.inventory.IDualHost;
import com.glodblock.github.inventory.InventoryHandler;
import com.glodblock.github.inventory.gui.GuiType;
import com.glodblock.github.util.BlockPos;
@@ -46,9 +46,8 @@ import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
public class PartFluidInterface extends PartInterface implements IFluidHandler, IAEFluidInventory {
public class PartFluidInterface extends PartInterface implements IDualHost {
private final BaseActionSource ownActionSource = new MachineSource(this);
private final AppEngInternalAEInventory config = new AppEngInternalAEInventory(this, 6);
@@ -136,23 +135,19 @@ public class PartFluidInterface extends PartInterface implements IFluidHandler,
fluidDuality.gridChanged();
}
@Override
public DualityFluidInterface getDualityFluid() {
return fluidDuality;
}
@Override
public AEFluidInventory getInternalFluid() {
return fluidDuality.getTanks();
}
@Override
public AppEngInternalAEInventory getConfig() {
for (int i = 0; i < fluidDuality.getConfig().getSlots(); i++) {
IAEFluidStack fluid = fluidDuality.getConfig().getFluidInSlot(i);
if (fluid == null) {
config.setInventorySlotContents(i, null);
} else {
config.setInventorySlotContents(i, ItemFluidPacket.newDisplayStack(fluid.getFluidStack()));
}
}
Util.mirrorFluidToPacket(this.config, fluidDuality.getConfig());
return config;
}
@@ -161,24 +156,8 @@ public class PartFluidInterface extends PartInterface implements IFluidHandler,
super.writeToStream(data);
for (int i = 0; i < config.getSizeInventory(); i++) {
ByteBufUtils.writeItemStack(data, config.getStackInSlot(i));
for (int j = 0; j < config.getSizeInventory(); j++) {
FluidStack fluid = ItemFluidPacket.getFluidStack(config.getStackInSlot(j));
fluidDuality.getConfig().setFluidInSlot(j, fluidDuality.getStandardFluid(fluid));
}
}
int fluidMask = 0;
for (int i = 0; i < getInternalFluid().getSlots(); i++) {
if (getInternalFluid().getFluidInSlot(i) != null) {
fluidMask |= 1 << i;
}
}
data.writeByte(fluidMask);
for (int i = 0; i < getInternalFluid().getSlots(); i++) {
IAEFluidStack fluid = getInternalFluid().getFluidInSlot(i);
if (fluid != null) {
fluid.writeToPacket(data);
}
}
getInternalFluid().writeToBuf(data);
}
@Override
@@ -191,27 +170,9 @@ public class PartFluidInterface extends PartInterface implements IFluidHandler,
config.setInventorySlotContents(i, stack);
changed = true;
}
for (int j = 0; j < config.getSizeInventory(); j++) {
FluidStack fluid = ItemFluidPacket.getFluidStack(config.getStackInSlot(j));
fluidDuality.getConfig().setFluidInSlot(j, fluidDuality.getStandardFluid(fluid));
}
}
int fluidMask = data.readByte();
for (int i = 0; i < getInternalFluid().getSlots(); i++) {
if ((fluidMask & (1 << i)) != 0) {
IAEFluidStack fluid = AEFluidStack.loadFluidStackFromPacket(data);
if (fluid != null) { // this shouldn't happen, but better safe than sorry
IAEFluidStack origFluid = getInternalFluid().getFluidInSlot(i);
if (!fluid.equals(origFluid) || fluid.getStackSize() != origFluid.getStackSize()) {
getInternalFluid().setFluidInSlot(i, fluid);
changed = true;
}
}
} else if (getInternalFluid().getFluidInSlot(i) != null) {
getInternalFluid().setFluidInSlot(i, null);
changed = true;
}
}
fluidDuality.loadConfigFromPacket(this.config);
changed |= getInternalFluid().readFromBuf(data);
return changed;
}
@@ -219,10 +180,7 @@ public class PartFluidInterface extends PartInterface implements IFluidHandler,
public void readFromNBT(NBTTagCompound data) {
super.readFromNBT(data);
config.readFromNBT(data, "ConfigInv");
for (int i = 0; i < config.getSizeInventory(); i++) {
FluidStack fluid = ItemFluidPacket.getFluidStack(config.getStackInSlot(i));
fluidDuality.getConfig().setFluidInSlot(i, fluidDuality.getStandardFluid(fluid));
}
fluidDuality.loadConfigFromPacket(this.config);
getInternalFluid().readFromNBT(data, "FluidInv");
}
@@ -320,6 +278,7 @@ public class PartFluidInterface extends PartInterface implements IFluidHandler,
fluidDuality.onFluidInventoryChanged(inv, slot);
}
@Override
public void setConfig(int id, IAEFluidStack fluid) {
if (id >= 0 && id < 6) {
config.setInventorySlotContents(
@@ -328,6 +287,7 @@ public class PartFluidInterface extends PartInterface implements IFluidHandler,
}
}
@Override
public void setFluidInv(int id, IAEFluidStack fluid) {
if (id >= 0 && id < 6) {
getInternalFluid().setFluidInSlot(id, fluid);
@@ -33,7 +33,6 @@ import appeng.parts.automation.PartUpgradeable;
import appeng.tile.inventory.AppEngInternalAEInventory;
import appeng.tile.inventory.InvOperation;
import appeng.tile.networking.TileCableBus;
import appeng.util.ConfigManager;
import appeng.util.Platform;
import appeng.util.item.AEFluidStack;
import appeng.util.prioitylist.PrecisePriorityList;
@@ -233,7 +232,7 @@ public class PartFluidStorageBus extends PartUpgradeable
final BaseActionSource source) {
if (this.getProxy().isActive()) {
AccessRestriction currentAccess =
(AccessRestriction) ((ConfigManager) this.getConfigManager()).getSetting(Settings.ACCESS);
(AccessRestriction) this.getConfigManager().getSetting(Settings.ACCESS);
if (readOncePass) {
readOncePass = false;
try {
@@ -15,13 +15,13 @@ import appeng.tile.TileEvent;
import appeng.tile.events.TileEventType;
import appeng.tile.inventory.AppEngInternalAEInventory;
import appeng.tile.misc.TileInterface;
import appeng.util.item.AEFluidStack;
import com.glodblock.github.common.item.ItemFluidPacket;
import com.glodblock.github.inventory.AEFluidInventory;
import com.glodblock.github.inventory.IAEFluidInventory;
import com.glodblock.github.inventory.IAEFluidTank;
import com.glodblock.github.inventory.IDualHost;
import com.glodblock.github.loader.ItemAndBlockHolder;
import com.glodblock.github.util.DualityFluidInterface;
import com.glodblock.github.util.Util;
import cpw.mods.fml.common.network.ByteBufUtils;
import io.netty.buffer.ByteBuf;
import java.io.IOException;
@@ -32,31 +32,28 @@ import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
public class TileFluidInterface extends TileInterface implements IFluidHandler, IAEFluidInventory {
public class TileFluidInterface extends TileInterface implements IDualHost {
private final IConfigManager dualityConfigManager = getInterfaceDuality().getConfigManager();
private final DualityFluidInterface fluidDuality = new DualityFluidInterface(this.getProxy(), this) {
private final IConfigManager dualityConfigManager =
getInterfaceDuality().getConfigManager();
@Override
public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) {
SidelessMode mode = (SidelessMode) dualityConfigManager.getSetting(Settings.SIDELESS_MODE);
if (mode == SidelessMode.SIDELESS) {
return this.getTanks().drain(from, maxDrain, doDrain);
}
return this.getTanks().drain(from.ordinal(), maxDrain, doDrain);
}
};
private final AppEngInternalAEInventory config = new AppEngInternalAEInventory(this, 6);
public TileFluidInterface() {
super.getInterfaceDuality().getConfigManager().registerSetting(Settings.SIDELESS_MODE, SidelessMode.SIDELESS);
}
private final AppEngInternalAEInventory config = new AppEngInternalAEInventory(this, 6);
@MENetworkEventSubscribe
public void stateChange(final MENetworkChannelsChanged c) {
fluidDuality.onChannelStateChange(c);
@@ -75,23 +72,19 @@ public class TileFluidInterface extends TileInterface implements IFluidHandler,
fluidDuality.gridChanged();
}
@Override
public DualityFluidInterface getDualityFluid() {
return fluidDuality;
}
@Override
public AEFluidInventory getInternalFluid() {
return fluidDuality.getTanks();
}
@Override
public AppEngInternalAEInventory getConfig() {
for (int i = 0; i < fluidDuality.getConfig().getSlots(); i++) {
IAEFluidStack fluid = fluidDuality.getConfig().getFluidInSlot(i);
if (fluid == null) {
config.setInventorySlotContents(i, null);
} else {
config.setInventorySlotContents(i, ItemFluidPacket.newDisplayStack(fluid.getFluidStack()));
}
}
Util.mirrorFluidToPacket(this.config, fluidDuality.getConfig());
return config;
}
@@ -121,24 +114,8 @@ public class TileFluidInterface extends TileInterface implements IFluidHandler,
protected void writeToStream(ByteBuf data) throws IOException {
for (int i = 0; i < config.getSizeInventory(); i++) {
ByteBufUtils.writeItemStack(data, config.getStackInSlot(i));
for (int j = 0; j < config.getSizeInventory(); j++) {
FluidStack fluid = ItemFluidPacket.getFluidStack(config.getStackInSlot(j));
fluidDuality.getConfig().setFluidInSlot(j, fluidDuality.getStandardFluid(fluid));
}
}
int fluidMask = 0;
for (int i = 0; i < getInternalFluid().getSlots(); i++) {
if (getInternalFluid().getFluidInSlot(i) != null) {
fluidMask |= 1 << i;
}
}
data.writeByte(fluidMask);
for (int i = 0; i < getInternalFluid().getSlots(); i++) {
IAEFluidStack fluid = getInternalFluid().getFluidInSlot(i);
if (fluid != null) {
fluid.writeToPacket(data);
}
}
getInternalFluid().writeToBuf(data);
}
@TileEvent(TileEventType.NETWORK_READ)
@@ -150,37 +127,16 @@ public class TileFluidInterface extends TileInterface implements IFluidHandler,
config.setInventorySlotContents(i, stack);
changed = true;
}
for (int j = 0; j < config.getSizeInventory(); j++) {
FluidStack fluid = ItemFluidPacket.getFluidStack(config.getStackInSlot(j));
fluidDuality.getConfig().setFluidInSlot(j, fluidDuality.getStandardFluid(fluid));
}
}
int fluidMask = data.readByte();
for (int i = 0; i < getInternalFluid().getSlots(); i++) {
if ((fluidMask & (1 << i)) != 0) {
IAEFluidStack fluid = AEFluidStack.loadFluidStackFromPacket(data);
if (fluid != null) { // this shouldn't happen, but better safe than sorry
IAEFluidStack origFluid = getInternalFluid().getFluidInSlot(i);
if (!fluid.equals(origFluid) || fluid.getStackSize() != origFluid.getStackSize()) {
getInternalFluid().setFluidInSlot(i, fluid);
changed = true;
}
}
} else if (getInternalFluid().getFluidInSlot(i) != null) {
getInternalFluid().setFluidInSlot(i, null);
changed = true;
}
}
fluidDuality.loadConfigFromPacket(this.config);
changed |= getInternalFluid().readFromBuf(data);
return changed;
}
@TileEvent(TileEventType.WORLD_NBT_READ)
public void readFromNBTEvent(NBTTagCompound data) {
config.readFromNBT(data, "ConfigInv");
for (int i = 0; i < config.getSizeInventory(); i++) {
FluidStack fluid = ItemFluidPacket.getFluidStack(config.getStackInSlot(i));
fluidDuality.getConfig().setFluidInSlot(i, fluidDuality.getStandardFluid(fluid));
}
fluidDuality.loadConfigFromPacket(this.config);
getInternalFluid().readFromNBT(data, "FluidInv");
}
@@ -241,6 +197,7 @@ public class TileFluidInterface extends TileInterface implements IFluidHandler,
fluidDuality.onFluidInventoryChanged(inv, slot);
}
@Override
public void setConfig(int id, IAEFluidStack fluid) {
if (id >= 0 && id < 6) {
config.setInventorySlotContents(
@@ -249,6 +206,7 @@ public class TileFluidInterface extends TileInterface implements IFluidHandler,
}
}
@Override
public void setFluidInv(int id, IAEFluidStack fluid) {
if (id >= 0 && id < 6) {
getInternalFluid().setFluidInSlot(id, fluid);
@@ -1,12 +1,10 @@
package com.glodblock.github.common.tile;
import appeng.api.storage.data.IAEFluidStack;
import appeng.tile.AEBaseInvTile;
import appeng.tile.TileEvent;
import appeng.tile.events.TileEventType;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.tile.inventory.InvOperation;
import appeng.util.item.AEFluidStack;
import com.glodblock.github.inventory.AEFluidInventory;
import com.glodblock.github.inventory.IAEFluidInventory;
import com.glodblock.github.inventory.IAEFluidTank;
@@ -25,8 +23,13 @@ import net.minecraftforge.fluids.IFluidHandler;
public class TileIngredientBuffer extends AEBaseInvTile implements IAEFluidInventory, IFluidHandler {
private final AppEngInternalInventory invItems = new AppEngInternalInventory(this, 9);
private final AEFluidInventory invFluids = new AEFluidInventory(this, 4, 64000);
protected AppEngInternalInventory invItems;
protected AEFluidInventory invFluids;
public TileIngredientBuffer() {
this.invFluids = new AEFluidInventory(this, 4, 64000);
this.invItems = new AppEngInternalInventory(this, 9);
}
@Nonnull
@Override
@@ -34,10 +37,6 @@ public class TileIngredientBuffer extends AEBaseInvTile implements IAEFluidInven
return invItems;
}
public IAEFluidTank getFluidInventory() {
return invFluids;
}
@Override
public boolean canBeRotated() {
return false;
@@ -69,19 +68,7 @@ public class TileIngredientBuffer extends AEBaseInvTile implements IAEFluidInven
for (int i = 0; i < invItems.getSizeInventory(); i++) {
ByteBufUtils.writeItemStack(data, invItems.getStackInSlot(i));
}
int fluidMask = 0;
for (int i = 0; i < invFluids.getSlots(); i++) {
if (invFluids.getFluidInSlot(i) != null) {
fluidMask |= 1 << i;
}
}
data.writeByte(fluidMask);
for (int i = 0; i < invFluids.getSlots(); i++) {
IAEFluidStack fluid = invFluids.getFluidInSlot(i);
if (fluid != null) {
fluid.writeToPacket(data);
}
}
this.invFluids.writeToBuf(data);
}
@TileEvent(TileEventType.NETWORK_READ)
@@ -94,22 +81,7 @@ public class TileIngredientBuffer extends AEBaseInvTile implements IAEFluidInven
changed = true;
}
}
int fluidMask = data.readByte();
for (int i = 0; i < invFluids.getSlots(); i++) {
if ((fluidMask & (1 << i)) != 0) {
IAEFluidStack fluid = AEFluidStack.loadFluidStackFromPacket(data);
if (fluid != null) { // this shouldn't happen, but better safe than sorry
IAEFluidStack origFluid = invFluids.getFluidInSlot(i);
if (!fluid.equals(origFluid) || fluid.getStackSize() != origFluid.getStackSize()) {
invFluids.setFluidInSlot(i, fluid);
changed = true;
}
}
} else if (invFluids.getFluidInSlot(i) != null) {
invFluids.setFluidInSlot(i, null);
changed = true;
}
}
changed |= this.invFluids.readFromBuf(data);
return changed;
}
@@ -1,51 +1,14 @@
package com.glodblock.github.common.tile;
import appeng.api.storage.data.IAEFluidStack;
import appeng.tile.AEBaseInvTile;
import appeng.tile.TileEvent;
import appeng.tile.events.TileEventType;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.tile.inventory.InvOperation;
import appeng.util.item.AEFluidStack;
import com.glodblock.github.inventory.AEFluidInventory;
import com.glodblock.github.inventory.IAEFluidInventory;
import com.glodblock.github.inventory.IAEFluidTank;
import cpw.mods.fml.common.network.ByteBufUtils;
import io.netty.buffer.ByteBuf;
import java.io.IOException;
import javax.annotation.Nonnull;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
public class TileLargeIngredientBuffer extends AEBaseInvTile implements IAEFluidInventory, IFluidHandler {
public class TileLargeIngredientBuffer extends TileIngredientBuffer {
private final AppEngInternalInventory invItems = new AppEngInternalInventory(this, 27);
private final AEFluidInventory invFluids = new AEFluidInventory(this, 7, 64000);
@Nonnull
@Override
public IInventory getInternalInventory() {
return invItems;
}
public IAEFluidTank getFluidInventory() {
return invFluids;
}
@Override
public boolean canBeRotated() {
return false;
}
@Override
public void onChangeInventory(IInventory inv, int slot, InvOperation mc, ItemStack removed, ItemStack added) {
markForUpdate();
public TileLargeIngredientBuffer() {
this.invFluids = new AEFluidInventory(this, 7, 64000);
this.invItems = new AppEngInternalInventory(this, 27);
}
@Override
@@ -55,106 +18,8 @@ public class TileLargeIngredientBuffer extends AEBaseInvTile implements IAEFluid
};
}
@Override
public void onFluidInventoryChanged(IAEFluidTank inv, int slot) {
saveChanges();
markForUpdate();
}
@Override
public AEFluidInventory getInternalFluid() {
return this.invFluids;
}
@TileEvent(TileEventType.NETWORK_WRITE)
protected void writeToStream(ByteBuf data) throws IOException {
for (int i = 0; i < invItems.getSizeInventory(); i++) {
ByteBufUtils.writeItemStack(data, invItems.getStackInSlot(i));
}
int fluidMask = 0;
for (int i = 0; i < invFluids.getSlots(); i++) {
if (invFluids.getFluidInSlot(i) != null) {
fluidMask |= 1 << i;
}
}
data.writeByte(fluidMask);
for (int i = 0; i < invFluids.getSlots(); i++) {
IAEFluidStack fluid = invFluids.getFluidInSlot(i);
if (fluid != null) {
fluid.writeToPacket(data);
}
}
}
@TileEvent(TileEventType.NETWORK_READ)
protected boolean readFromStream(ByteBuf data) throws IOException {
boolean changed = false;
for (int i = 0; i < invItems.getSizeInventory(); i++) {
ItemStack stack = ByteBufUtils.readItemStack(data);
if (!ItemStack.areItemStacksEqual(stack, invItems.getStackInSlot(i))) {
invItems.setInventorySlotContents(i, stack);
changed = true;
}
}
int fluidMask = data.readByte();
for (int i = 0; i < invFluids.getSlots(); i++) {
if ((fluidMask & (1 << i)) != 0) {
IAEFluidStack fluid = AEFluidStack.loadFluidStackFromPacket(data);
if (fluid != null) { // this shouldn't happen, but better safe than sorry
IAEFluidStack origFluid = invFluids.getFluidInSlot(i);
if (!fluid.equals(origFluid) || fluid.getStackSize() != origFluid.getStackSize()) {
invFluids.setFluidInSlot(i, fluid);
changed = true;
}
}
} else if (invFluids.getFluidInSlot(i) != null) {
invFluids.setFluidInSlot(i, null);
changed = true;
}
}
return changed;
}
@TileEvent(TileEventType.WORLD_NBT_READ)
public void readFromNBTEvent(NBTTagCompound data) {
invItems.readFromNBT(data, "ItemInv");
invFluids.readFromNBT(data, "FluidInv");
}
@TileEvent(TileEventType.WORLD_NBT_WRITE)
public NBTTagCompound writeToNBTEvent(NBTTagCompound data) {
invItems.writeToNBT(data, "ItemInv");
invFluids.writeToNBT(data, "FluidInv");
return data;
}
@Override
public int fill(ForgeDirection from, FluidStack resource, boolean doFill) {
return invFluids.fill(from, resource, doFill);
}
@Override
public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) {
return invFluids.drain(from, resource, doDrain);
}
@Override
public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) {
return invFluids.drain(from, maxDrain, doDrain);
}
@Override
public boolean canFill(ForgeDirection from, Fluid fluid) {
return invFluids.canFill(from, fluid);
}
@Override
public boolean canDrain(ForgeDirection from, Fluid fluid) {
return invFluids.canDrain(from, fluid);
}
@Override
public FluidTankInfo[] getTankInfo(ForgeDirection from) {
return invFluids.getTankInfo(from);
}
}