diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidStorageBus.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidStorageBus.java deleted file mode 100644 index aeb93291..00000000 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidStorageBus.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.glodblock.github.client.gui; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.resources.I18n; -import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.input.Mouse; - -import com.glodblock.github.client.gui.container.ContainerFluidStorageBus; -import com.glodblock.github.common.parts.PartFluidStorageBus; -import com.glodblock.github.util.NameConst; - -import appeng.api.config.AccessRestriction; -import appeng.api.config.ActionItems; -import appeng.api.config.Settings; -import appeng.api.storage.data.IAEFluidStack; -import appeng.client.gui.implementations.GuiUpgradeable; -import appeng.client.gui.widgets.GuiImgButton; -import appeng.client.gui.widgets.GuiTabButton; -import appeng.core.localization.GuiColors; -import appeng.core.localization.GuiText; -import appeng.core.sync.GuiBridge; -import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketConfigButton; -import appeng.core.sync.packets.PacketSwitchGuis; - -public class GuiFluidStorageBus extends GuiUpgradeable { - - private GuiImgButton rwMode; - private GuiTabButton priority; - private GuiImgButton partition; - private GuiImgButton clear; - - public GuiFluidStorageBus(InventoryPlayer inventoryPlayer, PartFluidStorageBus te) { - super(new ContainerFluidStorageBus(inventoryPlayer, te)); - this.ySize = 251; - } - - @Override - protected void addButtons() { - this.clear = new GuiImgButton(this.guiLeft - 18, this.guiTop + 8, Settings.ACTIONS, ActionItems.CLOSE); - this.partition = new GuiImgButton(this.guiLeft - 18, this.guiTop + 28, Settings.ACTIONS, ActionItems.WRENCH); - this.rwMode = new GuiImgButton( - this.guiLeft - 18, - this.guiTop + 48, - Settings.ACCESS, - AccessRestriction.READ_WRITE); - this.priority = new GuiTabButton( - this.guiLeft + 154, - this.guiTop, - 2 + 4 * 16, - GuiText.Priority.getLocal(), - itemRender); - - this.buttonList.add(this.priority); - this.buttonList.add(this.rwMode); - this.buttonList.add(this.partition); - this.buttonList.add(this.clear); - } - - @Override - public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - this.fontRendererObj.drawString( - this.getGuiDisplayName(I18n.format(NameConst.GUI_FLUID_STORAGE_BUS)), - 8, - 6, - GuiColors.StorageBusTitle.getColor()); - this.fontRendererObj.drawString( - GuiText.inventory.getLocal(), - 8, - this.ySize - 96 + 3, - GuiColors.StorageBusInventory.getColor()); - - if (this.rwMode != null) { - this.rwMode.set(((ContainerFluidStorageBus) this.cvb).getReadWriteMode()); - } - } - - @Override - protected String getBackground() { - return "guis/storagebus.png"; - } - - @Override - protected void actionPerformed(final GuiButton btn) { - super.actionPerformed(btn); - final boolean backwards = Mouse.isButtonDown(1); - if (btn == this.partition) { - // FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidPatternTermBtns("StorageBus.Action", - // "Partition")); - } else if (btn == this.clear) { - // FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidPatternTermBtns("StorageBus.Action", "Clear")); - } else if (btn == this.priority) { - NetworkHandler.instance.sendToServer(new PacketSwitchGuis(GuiBridge.GUI_PRIORITY)); - } else if (btn == this.rwMode) { - NetworkHandler.instance.sendToServer(new PacketConfigButton(this.rwMode.getSetting(), backwards)); - } - } - - public void update(int id, IAEFluidStack stack) { - ((ContainerFluidStorageBus) this.cvb).bus.setFluidInSlot(id, stack); - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidStorageBus.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidStorageBus.java deleted file mode 100644 index 3728ae01..00000000 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidStorageBus.java +++ /dev/null @@ -1,207 +0,0 @@ -package com.glodblock.github.client.gui.container; - -import java.util.Iterator; - -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IInventory; - -import com.glodblock.github.client.gui.container.base.FCContainerFluidConfigurable; -import com.glodblock.github.common.item.ItemFluidPacket; -import com.glodblock.github.common.parts.PartFluidStorageBus; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.slot.OptionalFluidSlotFakeTypeOnly; -import com.glodblock.github.loader.ItemAndBlockHolder; -import com.glodblock.github.util.FluidPrimaryGui; - -import appeng.api.AEApi; -import appeng.api.config.AccessRestriction; -import appeng.api.config.SecurityPermissions; -import appeng.api.config.Settings; -import appeng.api.config.StorageFilter; -import appeng.api.config.Upgrades; -import appeng.api.storage.IMEInventory; -import appeng.api.storage.data.IAEFluidStack; -import appeng.api.storage.data.IItemList; -import appeng.container.ContainerOpenContext; -import appeng.container.PrimaryGui; -import appeng.container.guisync.GuiSync; -import appeng.container.slot.SlotRestrictedInput; -import appeng.tile.inventory.AppEngInternalAEInventory; -import appeng.util.IterationCounter; -import appeng.util.Platform; -import appeng.util.iterators.NullIterator; - -public class ContainerFluidStorageBus extends FCContainerFluidConfigurable { - - public final PartFluidStorageBus bus; - - @GuiSync(3) - public AccessRestriction rwMode = AccessRestriction.READ_WRITE; - - @GuiSync(4) - public StorageFilter storageFilter = StorageFilter.EXTRACTABLE_ONLY; - - public ContainerFluidStorageBus(InventoryPlayer ip, PartFluidStorageBus te) { - super(ip, te); - this.bus = te; - } - - @Override - protected int getHeight() { - return 251; - } - - @Override - protected void setupConfig() { - final int xo = 8; - final int yo = 23 + 6; - final IInventory upgrades = getUpgradeable().getInventoryByName("upgrades"); - final IInventory config = getUpgradeable().getInventoryByName("config"); - for (int y = 0; y < 7; y++) { - for (int x = 0; x < 9; x++) { - this.addSlotToContainer( - new OptionalFluidSlotFakeTypeOnly(config, null, this, y * 9 + x, xo, yo, x, y, y)); - } - } - this.addSlotToContainer( - (new SlotRestrictedInput( - SlotRestrictedInput.PlacableItemType.UPGRADES, - upgrades, - 0, - 187, - 8, - this.getInventoryPlayer())).setNotDraggable()); - this.addSlotToContainer( - (new SlotRestrictedInput( - SlotRestrictedInput.PlacableItemType.UPGRADES, - upgrades, - 1, - 187, - 8 + 18, - this.getInventoryPlayer())).setNotDraggable()); - this.addSlotToContainer( - (new SlotRestrictedInput( - SlotRestrictedInput.PlacableItemType.UPGRADES, - upgrades, - 2, - 187, - 8 + 18 * 2, - this.getInventoryPlayer())).setNotDraggable()); - this.addSlotToContainer( - (new SlotRestrictedInput( - SlotRestrictedInput.PlacableItemType.UPGRADES, - upgrades, - 3, - 187, - 8 + 18 * 3, - this.getInventoryPlayer())).setNotDraggable()); - this.addSlotToContainer( - (new SlotRestrictedInput( - SlotRestrictedInput.PlacableItemType.UPGRADES, - upgrades, - 4, - 187, - 8 + 18 * 4, - this.getInventoryPlayer())).setNotDraggable()); - } - - @Override - protected boolean isValidForConfig(int slot, IAEFluidStack fs) { - if (this.supportCapacity()) { - final int upgrades = getUpgradeable().getInstalledUpgrades(Upgrades.CAPACITY); - final int y = slot / 9; - return y < upgrades + 2; - } - return true; - } - - @Override - protected boolean supportCapacity() { - return true; - } - - @Override - public int availableUpgrades() { - return 5; - } - - @Override - public void detectAndSendChanges() { - this.verifyPermissions(SecurityPermissions.BUILD, false); - - if (Platform.isServer()) { - this.setReadWriteMode((AccessRestriction) getUpgradeable().getConfigManager().getSetting(Settings.ACCESS)); - this.setStorageFilter( - (StorageFilter) getUpgradeable().getConfigManager().getSetting(Settings.STORAGE_FILTER)); - } - - this.standardDetectAndSendChanges(); - } - - @Override - public boolean isSlotEnabled(final int idx) { - if (getUpgradeable().getInstalledUpgrades(Upgrades.ORE_FILTER) > 0) return false; - final int upgrades = getUpgradeable().getInstalledUpgrades(Upgrades.CAPACITY); - return upgrades > (idx - 2); - } - - public void clear() { - AppEngInternalAEInventory h = this.bus.getConfig(); - for (int i = 0; i < h.getSizeInventory(); ++i) { - h.setInventorySlotContents(i, null); - } - this.detectAndSendChanges(); - } - - public void partition() { - AppEngInternalAEInventory h = this.bus.getConfig(); - final IMEInventory cellInv = this.bus.getInternalHandler(); - Iterator i = new NullIterator<>(); - if (cellInv != null) { - final IItemList list = cellInv - .getAvailableItems(AEApi.instance().storage().createFluidList(), IterationCounter.fetchNewId()); - i = list.iterator(); - } - - for (int x = 0; x < h.getSizeInventory(); x++) { - if (i.hasNext() && this.isSlotEnabled((x / 9) - 2)) { - h.setInventorySlotContents(x, ItemFluidPacket.newStack(i.next())); - } else { - h.setInventorySlotContents(x, null); - } - } - this.detectAndSendChanges(); - } - - public AccessRestriction getReadWriteMode() { - return this.rwMode; - } - - public StorageFilter getStorageFilter() { - return this.storageFilter; - } - - @Override - public AppEngInternalAEInventory getFakeFluidInv() { - return (AppEngInternalAEInventory) this.bus.getInventoryByName("config"); - } - - private void setReadWriteMode(final AccessRestriction rwMode) { - this.rwMode = rwMode; - } - - private void setStorageFilter(final StorageFilter storageFilter) { - this.storageFilter = storageFilter; - } - - @Override - public PrimaryGui getPrimaryGui() { - - ContainerOpenContext context = getOpenContext(); - return new FluidPrimaryGui( - GuiType.FLUID_STORAGE_BUS, - ItemAndBlockHolder.FLUID_STORAGE_BUS.stack(), - context.getTile(), - context.getSide()); - } -} diff --git a/src/main/java/com/glodblock/github/common/item/ItemFluidLevelEmitter.java b/src/main/java/com/glodblock/github/common/item/ItemFluidLevelEmitter.java index 72004215..96191d21 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemFluidLevelEmitter.java +++ b/src/main/java/com/glodblock/github/common/item/ItemFluidLevelEmitter.java @@ -1,5 +1,7 @@ package com.glodblock.github.common.item; +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; @@ -57,4 +59,11 @@ public class ItemFluidLevelEmitter extends FCBaseItem implements IPartItem { public int getSpriteNumber() { return 0; } + + @Override + public void addInformation(final ItemStack stack, final EntityPlayer player, final List lines, + final boolean displayMoreInfo) { + lines.add("Deprecated, use regular level emitter, hold CTRL for get fluid of container."); + super.addInformation(stack, player, lines, displayMoreInfo); + } } diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidLevelEmitter.java b/src/main/java/com/glodblock/github/common/parts/PartFluidLevelEmitter.java index b60b35ea..b0b2fe6f 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidLevelEmitter.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidLevelEmitter.java @@ -2,9 +2,12 @@ package com.glodblock.github.common.parts; import net.minecraft.item.ItemStack; +import appeng.helpers.Reflected; + public class PartFluidLevelEmitter extends PartLevelTerminal { - public PartFluidLevelEmitter(ItemStack is) { + @Reflected + public PartFluidLevelEmitter(final ItemStack is) { super(is); } } diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidP2PInterface.java b/src/main/java/com/glodblock/github/common/parts/PartFluidP2PInterface.java index 27efde51..80bef8e2 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidP2PInterface.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidP2PInterface.java @@ -61,6 +61,7 @@ import appeng.helpers.IPriorityHost; import appeng.me.GridAccessException; import appeng.me.cache.CraftingGridCache; import appeng.parts.automation.UpgradeInventory; +import appeng.parts.p2p.PartP2PTunnel; import appeng.parts.p2p.PartP2PTunnelStatic; import appeng.tile.inventory.AppEngInternalAEInventory; import appeng.tile.inventory.AppEngInternalInventory; diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidStorageBus.java b/src/main/java/com/glodblock/github/common/parts/PartFluidStorageBus.java index f0f20323..702367ac 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidStorageBus.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidStorageBus.java @@ -1,531 +1,18 @@ package com.glodblock.github.common.parts; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; - -import javax.annotation.Nullable; - -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Vec3; -import com.glodblock.github.client.textures.FCPartsTexture; -import com.glodblock.github.common.item.ItemFluidPacket; -import com.glodblock.github.inventory.InventoryHandler; -import com.glodblock.github.inventory.MEMonitorIFluidHandler; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.util.BlockPos; - -import appeng.api.AEApi; -import appeng.api.config.AccessRestriction; -import appeng.api.config.FuzzyMode; -import appeng.api.config.IncludeExclude; -import appeng.api.config.Settings; -import appeng.api.config.StorageFilter; -import appeng.api.config.Upgrades; -import appeng.api.config.YesNo; -import appeng.api.networking.IGridNode; -import appeng.api.networking.events.MENetworkCellArrayUpdate; -import appeng.api.networking.events.MENetworkChannelsChanged; -import appeng.api.networking.events.MENetworkEventSubscribe; -import appeng.api.networking.events.MENetworkPowerStatusChange; -import appeng.api.networking.security.BaseActionSource; -import appeng.api.networking.security.MachineSource; -import appeng.api.networking.storage.IBaseMonitor; -import appeng.api.networking.storage.IStorageGrid; -import appeng.api.networking.ticking.IGridTickable; -import appeng.api.networking.ticking.ITickManager; -import appeng.api.networking.ticking.TickRateModulation; -import appeng.api.networking.ticking.TickingRequest; -import appeng.api.parts.IPartCollisionHelper; -import appeng.api.parts.IPartRenderHelper; -import appeng.api.parts.PartItemStack; -import appeng.api.storage.ICellContainer; -import appeng.api.storage.IExternalStorageHandler; -import appeng.api.storage.IMEInventory; -import appeng.api.storage.IMEInventoryHandler; -import appeng.api.storage.IMEMonitor; -import appeng.api.storage.IMEMonitorHandlerReceiver; import appeng.api.storage.StorageChannel; -import appeng.api.storage.data.IAEFluidStack; -import appeng.api.storage.data.IAEItemStack; -import appeng.api.storage.data.IAEStack; -import appeng.api.storage.data.IItemList; -import appeng.api.util.IConfigManager; -import appeng.client.texture.CableBusTextures; -import appeng.core.settings.TickRates; -import appeng.helpers.IPriorityHost; -import appeng.me.GridAccessException; -import appeng.me.cache.GridStorageCache; -import appeng.me.storage.MEInventoryHandler; -import appeng.me.storage.StorageBusInventoryHandler; -import appeng.parts.automation.PartUpgradeable; -import appeng.tile.inventory.AppEngInternalAEInventory; -import appeng.tile.inventory.InvOperation; -import appeng.util.IterationCounter; -import appeng.util.Platform; -import appeng.util.item.AEFluidStack; -import appeng.util.prioitylist.PrecisePriorityList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import appeng.parts.misc.PartStorageBus; -public class PartFluidStorageBus extends PartUpgradeable - implements IGridTickable, ICellContainer, IMEMonitorHandlerReceiver, IPriorityHost { - - private final BaseActionSource source; - private final AppEngInternalAEInventory config = new AppEngInternalAEInventory(this, 63); - private int priority = 0; - private boolean cached = false; - private MEMonitorIFluidHandler monitor = null; - private MEInventoryHandler handler = null; - private int handlerHash = 0; - private boolean wasActive = false; - private byte resetCacheLogic = 0; - /** - * used to read changes once when the list of extractable items was changed - */ - private boolean readOncePass = false; +public class PartFluidStorageBus extends PartStorageBus { public PartFluidStorageBus(ItemStack is) { super(is); - this.getConfigManager().registerSetting(Settings.ACCESS, AccessRestriction.READ_WRITE); - this.getConfigManager().registerSetting(Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL); - this.getConfigManager().registerSetting(Settings.STORAGE_FILTER, StorageFilter.EXTRACTABLE_ONLY); - this.getConfigManager().registerSetting(Settings.STICKY_MODE, YesNo.NO); - this.source = new MachineSource(this); - if (is.getTagCompound() != null) { - NBTTagCompound tag = is.getTagCompound(); - if (tag.hasKey("priority")) { - priority = tag.getInteger("priority"); - // if we don't do this, the tag will stick forever to the storage bus, as it's never cleaned up, - // even when the item is broken with a pickaxe - this.is.setTagCompound(null); - } - } } @Override - public ItemStack getItemStack(final PartItemStack type) { - if (type == PartItemStack.Wrench) { - final NBTTagCompound tag = new NBTTagCompound(); - tag.setInteger("priority", priority); - final ItemStack copy = this.is.copy(); - copy.setTagCompound(tag); - return copy; - } - return super.getItemStack(type); - } - - @Override - @MENetworkEventSubscribe - public void powerRender(final MENetworkPowerStatusChange c) { - this.updateStatus(); - } - - @Override - @MENetworkEventSubscribe - public void chanRender(final MENetworkChannelsChanged changedChannels) { - this.updateStatus(); - } - - protected void updateStatus() { - final boolean currentActive = this.getProxy().isActive(); - if (this.wasActive != currentActive) { - this.wasActive = currentActive; - try { - this.getProxy().getGrid().postEvent(new MENetworkCellArrayUpdate()); - this.getHost().markForUpdate(); - } catch (final GridAccessException e) { - // NO-OP - } - } - } - - @Override - protected int getUpgradeSlots() { - return 5; - } - - @Override - public void updateSetting(final IConfigManager manager, @SuppressWarnings("rawtypes") final Enum settingName, - @SuppressWarnings("rawtypes") final Enum newValue) { - this.resetCache(true); - this.getHost().markForSave(); - } - - @Override - public void upgradesChanged() { - super.upgradesChanged(); - this.resetCache(true); - } - - @Override - public void readFromNBT(final NBTTagCompound data) { - super.readFromNBT(data); - this.config.readFromNBT(data, "config"); - this.priority = data.getInteger("priority"); - } - - @Override - public void writeToNBT(final NBTTagCompound data) { - super.writeToNBT(data); - this.config.writeToNBT(data, "config"); - data.setInteger("priority", this.priority); - } - - @Override - public IInventory getInventoryByName(final String name) { - if (name.equals("config")) { - return this.config; - } - return super.getInventoryByName(name); - } - - @Override - public void onChangeInventory(final IInventory inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { - super.onChangeInventory(inv, slot, mc, removedStack, newStack); - - if (inv == this.config) { - this.resetCache(true); - } - } - - protected void resetCache(final boolean fullReset) { - if (this.getHost() == null || this.getHost().getTile() == null - || this.getHost().getTile().getWorldObj() == null - || this.getHost().getTile().getWorldObj().isRemote) { - return; - } - - if (fullReset) { - this.resetCacheLogic = 2; - } else if (this.resetCacheLogic < 2) { - this.resetCacheLogic = 1; - } - - try { - this.getProxy().getTick().alertDevice(this.getProxy().getNode()); - } catch (final GridAccessException ignore) {} - } - - protected void resetCache() { - final boolean fullReset = this.resetCacheLogic == 2; - this.resetCacheLogic = 0; - - final MEInventoryHandler in = this.getInternalHandler(); - IItemList before = AEApi.instance().storage().createFluidList(); - if (in != null) { - before = in.getAvailableItems(before, IterationCounter.fetchNewId()); - } - - this.cached = false; - if (fullReset) { - this.handlerHash = 0; - } - - final MEInventoryHandler out = this.getInternalHandler(); - if (this.monitor != null) { - this.monitor.onTick(); - } - - IItemList after = AEApi.instance().storage().createFluidList(); - - if (in != out) { - if (out != null) { - after = out.getAvailableItems(after, IterationCounter.fetchNewId()); - } - Platform.postListChanges(before, after, this, this.source); - } - } - - @Override - public boolean isValid(final Object verificationToken) { - return this.handler == verificationToken; - } - - @Override - public void postChange(final IBaseMonitor monitor, final Iterable> change, - final BaseActionSource source) { - try { - if (this.getProxy().isActive()) { - if (!this.readOncePass) { - AccessRestriction currentAccess = (AccessRestriction) this.getConfigManager() - .getSetting(Settings.ACCESS); - if (!currentAccess.hasPermission(AccessRestriction.READ)) { - return; - } - } - Iterable> filteredChanges = this.filterChanges(change, this.readOncePass); - this.readOncePass = false; - if (filteredChanges == null) return; - this.getProxy().getStorage() - .postAlterationOfStoredItems(StorageChannel.FLUIDS, filteredChanges, this.source); - } - } catch (final GridAccessException ignore) {} - } - - /** - * Filters the changes to only include fluids that pass the handlers extract filter. Will return null if none of the - * changes match the filter. - */ - @Nullable - private Iterable> filterChanges(final Iterable> change, final boolean readOncePass) { - if (readOncePass) { - return change; - } - - if (this.handler != null && this.handler.isExtractFilterActive() - && !this.handler.getExtractPartitionList().isEmpty()) { - List> filteredChanges = new ArrayList<>(); - Predicate extractFilterCondition = this.handler.getExtractFilterCondition(); - for (final IAEStack changedFluid : change) { - if (extractFilterCondition.test((IAEFluidStack) changedFluid)) { - filteredChanges.add(changedFluid); - } - } - return filteredChanges.isEmpty() ? null : Collections.unmodifiableList(filteredChanges); - } - return change; - } - - @Override - public void onListUpdate() { - // NO-OP - } - - @Override - public void getBoxes(final IPartCollisionHelper bch) { - bch.addBox(3, 3, 15, 13, 13, 16); - bch.addBox(2, 2, 14, 14, 14, 15); - bch.addBox(5, 5, 12, 11, 11, 14); - } - - @Override - public void onNeighborChanged() { - this.resetCache(false); - } - - @Override - public boolean onPartActivate(final EntityPlayer player, final Vec3 pos) { - if (player.isSneaking()) { - return false; - } - if (Platform.isServer()) { - InventoryHandler.openGui( - player, - this.getHost().getTile().getWorldObj(), - new BlockPos(this.getHost().getTile()), - Objects.requireNonNull(this.getSide()), - GuiType.FLUID_STORAGE_BUS); - - } - return true; - } - - @Override - public TickingRequest getTickingRequest(IGridNode node) { - return new TickingRequest(TickRates.StorageBus.getMin(), TickRates.StorageBus.getMax(), monitor == null, true); - } - - @Override - public TickRateModulation tickingRequest(IGridNode node, int ticksSinceLastCall) { - if (this.resetCacheLogic != 0) { - this.resetCache(); - } - if (this.monitor != null) { - return this.monitor.onTick(); - } - return TickRateModulation.SLEEP; - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - public MEInventoryHandler getInternalHandler() { - if (this.cached) { - return this.handler; - } - - final boolean wasSleeping = this.monitor == null; - - this.cached = true; - final TileEntity self = this.getHost().getTile(); - final TileEntity target = new BlockPos(self).getOffSet(this.getSide()).getTileEntity(); - final int newHandlerHash = Platform.generateTileHash(target); - if (newHandlerHash != 0 && newHandlerHash == this.handlerHash) { - return this.handler; - } - this.handlerHash = newHandlerHash; - this.handler = null; - this.monitor = null; - this.readOncePass = true; - if (target != null) { - final IExternalStorageHandler esh = AEApi.instance().registries().externalStorage() - .getHandler(target, this.getSide().getOpposite(), StorageChannel.FLUIDS, this.source); - if (esh != null) { - final IMEInventory inv = esh - .getInventory(target, this.getSide().getOpposite(), StorageChannel.FLUIDS, this.source); - if (inv instanceof final MEMonitorIFluidHandler h) { - h.setMode((StorageFilter) this.getConfigManager().getSetting(Settings.STORAGE_FILTER)); - h.setActionSource(new MachineSource(this)); - this.monitor = h; - } - if (inv != null) { - this.handler = new StorageBusInventoryHandler(inv, StorageChannel.FLUIDS); - AccessRestriction currentAccess = (AccessRestriction) this.getConfigManager().getSetting(Settings.ACCESS); - this.handler.setBaseAccess(currentAccess); - this.handler.setWhitelist( - this.getInstalledUpgrades(Upgrades.INVERTER) > 0 ? IncludeExclude.BLACKLIST - : IncludeExclude.WHITELIST); - this.handler.setSticky(this.getInstalledUpgrades(Upgrades.STICKY) > 0); - this.handler.setPriority(this.priority); - // only READ since READ_WRITE would break compat of existing storage buses - // could use a new setting that is applied via button or a card too - this.handler.setIsExtractFilterActive(currentAccess == AccessRestriction.READ); - - if (inv instanceof IMEMonitor) { - ((IBaseMonitor) inv).addListener(this, this.handler); - } - final IItemList priorityList = AEApi.instance().storage().createFluidList(); - - final int slotsToUse = 18 + this.getInstalledUpgrades(Upgrades.CAPACITY) * 9; - for (int x = 0; x < this.config.getSizeInventory() && x < slotsToUse; x++) { - final IAEItemStack is = this.config.getAEStackInSlot(x); - if (is != null) priorityList.add(AEFluidStack.create(ItemFluidPacket.getFluidStack(is))); - } - PrecisePriorityList partitionList = new PrecisePriorityList(priorityList); - this.handler.setPartitionList(partitionList); - this.handler.setExtractPartitionList(partitionList); - } - } - } - - // update sleep state... - if (wasSleeping != (this.monitor == null)) { - try { - final ITickManager tm = this.getProxy().getTick(); - if (this.monitor == null) { - tm.sleepDevice(this.getProxy().getNode()); - } else { - tm.wakeDevice(this.getProxy().getNode()); - } - } catch (final GridAccessException ignore) {} - } - - try { - // force grid to update handlers... - ((GridStorageCache) this.getProxy().getGrid().getCache(IStorageGrid.class)).cellUpdate(null); - } catch (final GridAccessException ignore) {} - - return this.handler; - } - - @Override - @SuppressWarnings("rawtypes") - public List getCellArray(final StorageChannel channel) { - if (channel == StorageChannel.FLUIDS) { - final IMEInventoryHandler out = this.getInternalHandler(); - if (out != null) { - return Collections.singletonList(out); - } - } - return Collections.emptyList(); - } - - @Override - public int getPriority() { - return this.priority; - } - - @Override - public void setPriority(int newValue) { - this.priority = newValue; - this.getHost().markForSave(); - this.resetCache(true); - } - - @Override - public void saveChanges(@SuppressWarnings("rawtypes") final IMEInventory cellInventory) { - // NO-OP - } - - public AppEngInternalAEInventory getConfig() { - return this.config; - } - - public void setFluidInSlot(int id, IAEFluidStack fluid) { - ItemStack tmp = ItemFluidPacket.newDisplayStack(fluid == null ? null : fluid.getFluidStack()); - this.config.setInventorySlotContents(id, tmp); - } - - @Override - @SideOnly(Side.CLIENT) - public void renderInventory(final IPartRenderHelper rh, final RenderBlocks renderer) { - rh.setTexture( - CableBusTextures.PartStorageSides.getIcon(), - CableBusTextures.PartStorageSides.getIcon(), - CableBusTextures.PartStorageBack.getIcon(), - FCPartsTexture.PartFluidStorageBus.getIcon(), - CableBusTextures.PartStorageSides.getIcon(), - CableBusTextures.PartStorageSides.getIcon()); - - rh.setBounds(3, 3, 15, 13, 13, 16); - rh.renderInventoryBox(renderer); - - rh.setBounds(2, 2, 14, 14, 14, 15); - rh.renderInventoryBox(renderer); - - rh.setBounds(5, 5, 12, 11, 11, 14); - rh.renderInventoryBox(renderer); - } - - @Override - @SideOnly(Side.CLIENT) - public void renderStatic(final int x, final int y, final int z, final IPartRenderHelper rh, - final RenderBlocks renderer) { - this.setRenderCache(rh.useSimplifiedRendering(x, y, z, this, this.getRenderCache())); - rh.setTexture( - CableBusTextures.PartStorageSides.getIcon(), - CableBusTextures.PartStorageSides.getIcon(), - CableBusTextures.PartStorageBack.getIcon(), - FCPartsTexture.PartFluidStorageBus.getIcon(), - CableBusTextures.PartStorageSides.getIcon(), - CableBusTextures.PartStorageSides.getIcon()); - - rh.setBounds(3, 3, 15, 13, 13, 16); - rh.renderBlock(x, y, z, renderer); - - rh.setBounds(2, 2, 14, 14, 14, 15); - rh.renderBlock(x, y, z, renderer); - - rh.setTexture( - CableBusTextures.PartStorageSides.getIcon(), - CableBusTextures.PartStorageSides.getIcon(), - CableBusTextures.PartStorageBack.getIcon(), - FCPartsTexture.PartFluidStorageBus.getIcon(), - CableBusTextures.PartStorageSides.getIcon(), - CableBusTextures.PartStorageSides.getIcon()); - - rh.setBounds(5, 5, 12, 11, 11, 13); - rh.renderBlock(x, y, z, renderer); - - rh.setTexture( - CableBusTextures.PartMonitorSidesStatus.getIcon(), - CableBusTextures.PartMonitorSidesStatus.getIcon(), - CableBusTextures.PartMonitorBack.getIcon(), - FCPartsTexture.PartFluidStorageBus.getIcon(), - CableBusTextures.PartMonitorSidesStatus.getIcon(), - CableBusTextures.PartMonitorSidesStatus.getIcon()); - - rh.setBounds(5, 5, 13, 11, 11, 14); - rh.renderBlock(x, y, z, renderer); - - this.renderLights(x, y, z, rh, renderer); + public StorageChannel getStorageChannel() { + return StorageChannel.FLUIDS; } } diff --git a/src/main/java/com/glodblock/github/inventory/gui/GuiType.java b/src/main/java/com/glodblock/github/inventory/gui/GuiType.java index 1953fbe5..28c31c5a 100644 --- a/src/main/java/com/glodblock/github/inventory/gui/GuiType.java +++ b/src/main/java/com/glodblock/github/inventory/gui/GuiType.java @@ -12,7 +12,6 @@ import com.glodblock.github.client.gui.GuiFluidIO; import com.glodblock.github.client.gui.GuiFluidInterface; import com.glodblock.github.client.gui.GuiFluidPacketDecoder; import com.glodblock.github.client.gui.GuiFluidPatternEncoder; -import com.glodblock.github.client.gui.GuiFluidStorageBus; import com.glodblock.github.client.gui.GuiIngredientBuffer; import com.glodblock.github.client.gui.GuiLargeIngredientBuffer; import com.glodblock.github.client.gui.GuiLevelEmitterProxy; @@ -28,7 +27,6 @@ import com.glodblock.github.client.gui.container.ContainerFluidIO; import com.glodblock.github.client.gui.container.ContainerFluidInterface; import com.glodblock.github.client.gui.container.ContainerFluidPacketDecoder; import com.glodblock.github.client.gui.container.ContainerFluidPatternEncoder; -import com.glodblock.github.client.gui.container.ContainerFluidStorageBus; import com.glodblock.github.client.gui.container.ContainerIngredientBuffer; import com.glodblock.github.client.gui.container.ContainerLargeIngredientBuffer; import com.glodblock.github.client.gui.container.ContainerLevelMaintainer; @@ -37,7 +35,6 @@ import com.glodblock.github.client.gui.container.ContainerLevelWireless; import com.glodblock.github.client.gui.container.ContainerMagnetFilter; import com.glodblock.github.client.gui.container.ContainerOCPatternEditor; import com.glodblock.github.client.gui.container.ContainerSuperStockReplenisher; -import com.glodblock.github.common.parts.PartFluidStorageBus; import com.glodblock.github.common.parts.base.FCSharedFluidBus; import com.glodblock.github.common.tile.TileFluidAutoFiller; import com.glodblock.github.common.tile.TileFluidPacketDecoder; @@ -149,19 +146,6 @@ public enum GuiType { } }), - FLUID_STORAGE_BUS(new PartGuiFactory<>(PartFluidStorageBus.class) { - - @Override - protected Object createServerGui(EntityPlayer player, PartFluidStorageBus inv) { - return new ContainerFluidStorageBus(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, PartFluidStorageBus inv) { - return new GuiFluidStorageBus(player.inventory, inv); - } - }), - INGREDIENT_BUFFER(new TileGuiFactory<>(TileIngredientBuffer.class) { @Override