From fce98077ffaee7e4b4a07159dbb5d22b472e0f86 Mon Sep 17 00:00:00 2001 From: lc-1337 Date: Sun, 12 Oct 2025 19:37:16 +0300 Subject: [PATCH] save --- .../java/com/glodblock/github/FluidCraft.java | 13 - .../github/client/gui/GuiCraftingStatus.java | 94 -- .../client/gui/GuiEssentiaTerminal.java | 103 -- .../client/gui/GuiFluidCraftAmount.java | 122 --- .../client/gui/GuiFluidCraftConfirm.java | 43 - .../client/gui/GuiFluidCraftingWireless.java | 84 -- .../github/client/gui/GuiFluidMonitor.java | 65 -- .../client/gui/GuiFluidOptimizePatterns.java | 49 - .../client/gui/GuiFluidPatternEncoder.java | 3 +- .../client/gui/GuiFluidPatternExWireless.java | 24 - .../client/gui/GuiFluidPatternTerminal.java | 180 ---- .../client/gui/GuiFluidPatternTerminalEx.java | 232 ----- .../client/gui/GuiFluidPatternWireless.java | 24 - .../client/gui/GuiFluidPortableCell.java | 35 - .../github/client/gui/GuiFluidTerminal.java | 133 --- .../client/gui/GuiInterfaceWireless.java | 107 -- .../github/client/gui/GuiItemMonitor.java | 45 - .../github/client/gui/GuiLevelMaintainer.java | 2 - .../github/client/gui/GuiLevelTerminal.java | 19 +- .../client/gui/GuiPatternItemRenamer.java | 55 -- .../github/client/gui/GuiPatternMulti.java | 155 --- .../client/gui/GuiPatternValueAmount.java | 95 -- .../github/client/gui/GuiRenamer.java | 134 --- .../client/gui/GuiSuperStockReplenisher.java | 4 +- .../github/client/gui/base/FCBaseMEGui.java | 67 +- .../client/gui/base/FCGuiEncodeTerminal.java | 199 ---- .../github/client/gui/base/FCGuiMonitor.java | 914 ------------------ .../container/ContainerCraftingWireless.java | 109 --- .../container/ContainerEssentiaMonitor.java | 159 --- .../container/ContainerFluidCraftConfirm.java | 98 -- .../gui/container/ContainerFluidMonitor.java | 560 ----------- .../ContainerFluidOptimizePatterns.java | 69 -- .../ContainerFluidPatternExWireless.java | 17 - .../ContainerFluidPatternTerminal.java | 161 --- .../ContainerFluidPatternTerminalEx.java | 153 --- .../ContainerFluidPatternWireless.java | 17 - .../container/ContainerFluidPortableCell.java | 19 - .../container/ContainerInterfaceWireless.java | 44 - .../gui/container/ContainerItemMonitor.java | 153 --- .../gui/container/ContainerPatternMulti.java | 38 - .../ContainerPatternValueAmount.java | 42 - .../gui/container/ContainerRenamer.java | 13 - .../base/FCContainerEncodeTerminal.java | 669 ------------- .../container/base/FCContainerMonitor.java | 345 ------- .../common/item/ItemBaseWirelessTerminal.java | 26 +- .../common/item/ItemPortableFluidCell.java | 14 +- .../item/ItemWirelessFluidTerminal.java | 52 - .../item/ItemWirelessInterfaceTerminal.java | 4 +- .../item/ItemWirelessPatternTerminal.java | 7 +- .../item/ItemWirelessUltraTerminal.java | 64 +- .../common/storage/FluidCellHandler.java | 8 +- .../github/coremod/hooker/CoreModHooks.java | 8 - .../crossmod/extracells/ItemReplacements.java | 1 - .../github/inventory/InventoryHandler.java | 24 +- .../inventory/ItemBiggerAppEngInventory.java | 15 - .../github/inventory/gui/GuiType.java | 306 ------ .../github/loader/ChannelLoader.java | 40 - .../github/loader/ItemAndBlockHolder.java | 2 - .../glodblock/github/loader/RecipeLoader.java | 12 +- .../github/nei/AE2FC_NEIGuiHandler.java | 7 - .../nei/FluidCraftingTransferHandler.java | 76 -- ...dPatternTerminalRecipeTransferHandler.java | 51 - .../glodblock/github/nei/NEI_FC_Config.java | 76 -- .../github/network/CPacketCraftRequest.java | 145 --- .../github/network/CPacketEncodePattern.java | 38 - .../network/CPacketFluidPatternTermBtns.java | 49 +- .../github/network/CPacketFluidUpdate.java | 88 -- .../network/CPacketInventoryAction.java | 240 ----- .../network/CPacketPatternMultiSet.java | 89 -- .../network/CPacketPatternValueSet.java | 120 --- .../github/network/CPacketRenamer.java | 187 ---- .../github/network/CPacketSwitchGuis.java | 62 +- .../github/network/CPacketTransferRecipe.java | 169 ---- .../github/network/SPacketFluidUpdate.java | 14 - .../network/SPacketMEFluidInvUpdate.java | 104 -- .../network/SPacketMEItemInvUpdate.java | 101 -- .../github/network/SPacketMEUpdateBuffer.java | 137 --- .../network/SPacketPatternItemRenamer.java | 106 -- .../github/network/SPacketSetItemAmount.java | 49 - .../github/network/SPacketStringUpdate.java | 61 -- .../github/network/SPacketSwitchBack.java | 34 - .../glodblock/github/proxy/CommonProxy.java | 2 - 82 files changed, 148 insertions(+), 8106 deletions(-) delete mode 100644 src/main/java/com/glodblock/github/client/gui/GuiCraftingStatus.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/GuiEssentiaTerminal.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/GuiFluidCraftAmount.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/GuiFluidCraftConfirm.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/GuiFluidCraftingWireless.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/GuiFluidMonitor.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/GuiFluidOptimizePatterns.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/GuiFluidPatternExWireless.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminal.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalEx.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/GuiFluidPatternWireless.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/GuiFluidPortableCell.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/GuiFluidTerminal.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/GuiInterfaceWireless.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/GuiItemMonitor.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/GuiPatternItemRenamer.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/GuiPatternMulti.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/GuiRenamer.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/base/FCGuiEncodeTerminal.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/container/ContainerCraftingWireless.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/container/ContainerEssentiaMonitor.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/container/ContainerFluidCraftConfirm.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/container/ContainerFluidOptimizePatterns.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternExWireless.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminal.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminalEx.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternWireless.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPortableCell.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/container/ContainerInterfaceWireless.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/container/ContainerItemMonitor.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/container/ContainerPatternMulti.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/container/ContainerPatternValueAmount.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/container/ContainerRenamer.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java delete mode 100644 src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java delete mode 100644 src/main/java/com/glodblock/github/common/item/ItemWirelessFluidTerminal.java delete mode 100644 src/main/java/com/glodblock/github/nei/FluidCraftingTransferHandler.java delete mode 100644 src/main/java/com/glodblock/github/nei/FluidPatternTerminalRecipeTransferHandler.java delete mode 100644 src/main/java/com/glodblock/github/nei/NEI_FC_Config.java delete mode 100644 src/main/java/com/glodblock/github/network/CPacketCraftRequest.java delete mode 100644 src/main/java/com/glodblock/github/network/CPacketEncodePattern.java delete mode 100644 src/main/java/com/glodblock/github/network/CPacketFluidUpdate.java delete mode 100644 src/main/java/com/glodblock/github/network/CPacketInventoryAction.java delete mode 100644 src/main/java/com/glodblock/github/network/CPacketPatternMultiSet.java delete mode 100644 src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java delete mode 100644 src/main/java/com/glodblock/github/network/CPacketRenamer.java delete mode 100644 src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java delete mode 100644 src/main/java/com/glodblock/github/network/SPacketMEFluidInvUpdate.java delete mode 100644 src/main/java/com/glodblock/github/network/SPacketMEItemInvUpdate.java delete mode 100644 src/main/java/com/glodblock/github/network/SPacketMEUpdateBuffer.java delete mode 100644 src/main/java/com/glodblock/github/network/SPacketPatternItemRenamer.java delete mode 100644 src/main/java/com/glodblock/github/network/SPacketSetItemAmount.java delete mode 100644 src/main/java/com/glodblock/github/network/SPacketStringUpdate.java delete mode 100644 src/main/java/com/glodblock/github/network/SPacketSwitchBack.java diff --git a/src/main/java/com/glodblock/github/FluidCraft.java b/src/main/java/com/glodblock/github/FluidCraft.java index 5c20a21a..199bc43e 100644 --- a/src/main/java/com/glodblock/github/FluidCraft.java +++ b/src/main/java/com/glodblock/github/FluidCraft.java @@ -13,7 +13,6 @@ import com.glodblock.github.loader.ChannelLoader; import com.glodblock.github.loader.ItemAndBlockHolder; import com.glodblock.github.loader.RecipeLoader; import com.glodblock.github.loader.filter.FluidFilter; -import com.glodblock.github.network.SPacketMEUpdateBuffer; import com.glodblock.github.proxy.CommonProxy; import com.glodblock.github.util.ModAndClassUtil; @@ -25,8 +24,6 @@ import cpw.mods.fml.common.event.FMLLoadCompleteEvent; import cpw.mods.fml.common.event.FMLMissingMappingsEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.event.FMLServerStartingEvent; -import cpw.mods.fml.common.event.FMLServerStoppedEvent; import cpw.mods.fml.common.network.NetworkRegistry; @Mod( @@ -98,16 +95,6 @@ public class FluidCraft { proxy.onLoadComplete(event); } - @Mod.EventHandler - public void onServerStart(FMLServerStartingEvent event) { - SPacketMEUpdateBuffer.init(); - } - - @Mod.EventHandler - public void onServerStop(FMLServerStoppedEvent event) { - SPacketMEUpdateBuffer.disable(); - } - @Mod.EventHandler public void missingMappings(FMLMissingMappingsEvent event) { if (!ModAndClassUtil.EC2 && Config.replaceEC2) { diff --git a/src/main/java/com/glodblock/github/client/gui/GuiCraftingStatus.java b/src/main/java/com/glodblock/github/client/gui/GuiCraftingStatus.java deleted file mode 100644 index d1442bcf..00000000 --- a/src/main/java/com/glodblock/github/client/gui/GuiCraftingStatus.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.glodblock.github.client.gui; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.common.item.ItemWirelessUltraTerminal; -import com.glodblock.github.common.parts.PartFluidPatternTerminal; -import com.glodblock.github.common.parts.PartFluidPatternTerminalEx; -import com.glodblock.github.common.parts.PartFluidTerminal; -import com.glodblock.github.common.parts.PartLevelTerminal; -import com.glodblock.github.inventory.InventoryHandler; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.IWirelessTerminal; -import com.glodblock.github.inventory.item.WirelessFluidTerminalInventory; -import com.glodblock.github.inventory.item.WirelessInterfaceTerminalInventory; -import com.glodblock.github.inventory.item.WirelessLevelTerminalInventory; -import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory; -import com.glodblock.github.loader.ItemAndBlockHolder; -import com.glodblock.github.network.CPacketInventoryAction; -import com.glodblock.github.util.Ae2ReflectClient; - -import appeng.api.storage.ITerminalHost; -import appeng.api.storage.data.IAEItemStack; -import appeng.container.AEBaseContainer; -import appeng.helpers.InventoryAction; - -public class GuiCraftingStatus extends appeng.client.gui.implementations.GuiCraftingStatus { - - private final ITerminalHost host; - - public GuiCraftingStatus(InventoryPlayer inventoryPlayer, ITerminalHost te) { - super(inventoryPlayer, te); - host = te; - } - - @Override - public void initGui() { - if (host instanceof PartFluidPatternTerminal) this.myIcon = ItemAndBlockHolder.FLUID_TERMINAL.stack(); - else if (host instanceof PartFluidPatternTerminalEx) this.myIcon = ItemAndBlockHolder.FLUID_TERMINAL_EX.stack(); - else if (host instanceof PartFluidTerminal) this.myIcon = ItemAndBlockHolder.FLUID_TERM.stack(); - else if (host instanceof PartLevelTerminal) this.myIcon = ItemAndBlockHolder.LEVEL_TERMINAL.stack(); - else if (host instanceof IWirelessTerminal terminal && terminal.isUniversal(host)) - this.myIcon = ItemAndBlockHolder.WIRELESS_ULTRA_TERM.stack(); - else if (host instanceof WirelessFluidTerminalInventory) - this.myIcon = ItemAndBlockHolder.WIRELESS_FLUID_TERM.stack(); - else if (host instanceof WirelessPatternTerminalInventory) - this.myIcon = ItemAndBlockHolder.WIRELESS_PATTERN_TERM.stack(); - else if (host instanceof WirelessInterfaceTerminalInventory) - this.myIcon = ItemAndBlockHolder.WIRELESS_INTERFACE_TERM.stack(); - else if (host instanceof WirelessLevelTerminalInventory) - this.myIcon = ItemAndBlockHolder.WIRELESS_LEVEL_TERM.stack(); - super.initGui(); - } - - @Override - protected void actionPerformed(final GuiButton btn) { - if (btn == originalGuiBtn) { - if (host instanceof PartFluidPatternTerminal) InventoryHandler.switchGui(GuiType.FLUID_PATTERN_TERMINAL); - else if (host instanceof PartFluidPatternTerminalEx) - InventoryHandler.switchGui(GuiType.FLUID_PATTERN_TERMINAL_EX); - else if (host instanceof PartFluidTerminal) InventoryHandler.switchGui(GuiType.FLUID_TERMINAL); - else if (host instanceof PartLevelTerminal) InventoryHandler.switchGui(GuiType.LEVEL_TERMINAL); - else if (host instanceof IWirelessTerminal terminal && terminal.isUniversal(host)) - InventoryHandler.switchGui(ItemWirelessUltraTerminal.readMode(terminal.getItemStack())); - else if (host instanceof WirelessFluidTerminalInventory) - InventoryHandler.switchGui(GuiType.WIRELESS_FLUID_TERMINAL); - else if (host instanceof WirelessPatternTerminalInventory) - InventoryHandler.switchGui(GuiType.WIRELESS_FLUID_PATTERN_TERMINAL); - else if (host instanceof WirelessInterfaceTerminalInventory) - InventoryHandler.switchGui(GuiType.WIRELESS_INTERFACE_TERMINAL); - else if (host instanceof WirelessLevelTerminalInventory) - InventoryHandler.switchGui(GuiType.WIRELESS_LEVEL_TERMINAL); - } else { - super.actionPerformed(btn); - } - } - - @Override - protected void mouseClicked(final int xCoord, final int yCoord, final int btn) { - IAEItemStack hoveredAEStack = getHoveredAEStack(); - if (hoveredAEStack != null && btn == 2) { - ((AEBaseContainer) inventorySlots).setTargetStack(hoveredAEStack); - FluidCraft.proxy.netHandler.sendToServer( - new CPacketInventoryAction( - InventoryAction.AUTO_CRAFT, - Ae2ReflectClient.getInventorySlots(this).size(), - hoveredAEStack.getStackSize(), - hoveredAEStack)); - return; - } - super.mouseClicked(xCoord, yCoord, btn); - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/GuiEssentiaTerminal.java b/src/main/java/com/glodblock/github/client/gui/GuiEssentiaTerminal.java deleted file mode 100644 index 375ecfff..00000000 --- a/src/main/java/com/glodblock/github/client/gui/GuiEssentiaTerminal.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.glodblock.github.client.gui; - -import java.util.Objects; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.client.gui.container.ContainerEssentiaMonitor; -import com.glodblock.github.client.me.EssentiaRepo; -import com.glodblock.github.common.item.ItemFluidDrop; -import com.glodblock.github.crossmod.thaumcraft.AspectRender; -import com.glodblock.github.crossmod.thaumcraft.AspectUtil; -import com.glodblock.github.inventory.InventoryHandler; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.IWirelessTerminal; -import com.glodblock.github.network.CPacketFluidUpdate; - -import appeng.api.storage.data.IAEFluidStack; -import appeng.api.storage.data.IAEItemStack; -import appeng.client.me.SlotME; - -public class GuiEssentiaTerminal extends GuiFluidMonitor { - - protected EntityPlayer player; - - public GuiEssentiaTerminal(InventoryPlayer inventoryPlayer, IWirelessTerminal te) { - super(inventoryPlayer, te, new ContainerEssentiaMonitor(inventoryPlayer, te)); - this.repo = new EssentiaRepo(getScrollBar(), this); - this.player = inventoryPlayer.player; - } - - @Override - public void setTextFieldValue(String displayName, int mousex, int mousey, ItemStack stack) { - if (AspectUtil.getAspectFromJar(stack) != null) { - setSearchString(Objects.requireNonNull(AspectUtil.getAspectFromJar(stack)).getName(), true); - } - } - - @Override - public void func_146977_a(final Slot s) { - if (drawSlot0(s)) super.func_146977_a(s); - } - - public boolean drawSlot0(Slot slot) { - if (slot instanceof SlotME) { - IAEItemStack stack = ((SlotME) slot).getAEStack(); - if (stack == null) return true; - FluidStack fluidStack = ItemFluidDrop.getFluidStack(slot.getStack()); - AspectRender.drawAspect( - this.player, - slot.xDisplayPosition, - slot.yDisplayPosition, - this.zLevel, - AspectUtil.getAspectFromGas(fluidStack), - fluidStack.amount); - IAEItemStack gas = stack.copy().setStackSize(stack.getStackSize() / AspectUtil.R); - aeRenderItem.setAeStack(gas); - GL11.glTranslatef(0.0f, 0.0f, 200.0f); - aeRenderItem.renderItemOverlayIntoGUI( - fontRendererObj, - mc.getTextureManager(), - gas.getItemStack(), - slot.xDisplayPosition, - slot.yDisplayPosition); - GL11.glTranslatef(0.0f, 0.0f, -200.0f); - return false; - } - return true; - } - - @Override - protected void handleMouseClick(final Slot slot, final int slotIdx, final int ctrlDown, final int mouseButton) { - if (slot instanceof SlotME && AspectUtil.isEssentiaContainer(player.inventory.getItemStack())) { - IAEFluidStack fluid = ItemFluidDrop.getAeFluidStack(((SlotME) slot).getAEStack()); - FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidUpdate(fluid, isShiftKeyDown())); - } - if (mouseButton == 3 && slot instanceof SlotME) { - return; - } - super.handleMouseClick(slot, slotIdx, ctrlDown, mouseButton); - } - - @Override - protected void actionPerformed(final GuiButton btn) { - if (btn == craftingStatusBtn) { - InventoryHandler.switchGui(GuiType.CRAFTING_STATUS); - } else { - super.actionPerformed(btn); - } - } - - public void update(ItemStack itemStack) { - this.player.inventory.setItemStack(itemStack); - } - -} diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftAmount.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftAmount.java deleted file mode 100644 index 4203c8c2..00000000 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftAmount.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.glodblock.github.client.gui; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.input.Mouse; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.client.gui.base.FCGuiAmount; -import com.glodblock.github.common.item.ItemWirelessUltraTerminal; -import com.glodblock.github.common.parts.PartFluidPatternTerminal; -import com.glodblock.github.common.parts.PartFluidPatternTerminalEx; -import com.glodblock.github.common.parts.PartFluidTerminal; -import com.glodblock.github.common.parts.PartLevelTerminal; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.IWirelessTerminal; -import com.glodblock.github.inventory.item.WirelessLevelTerminalInventory; -import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory; -import com.glodblock.github.loader.ItemAndBlockHolder; -import com.glodblock.github.network.CPacketCraftRequest; - -import appeng.api.config.CraftingMode; -import appeng.api.config.Settings; -import appeng.api.storage.ITerminalHost; -import appeng.client.gui.widgets.GuiImgButton; -import appeng.container.implementations.ContainerCraftAmount; -import appeng.core.localization.GuiText; -import appeng.util.Platform; - -public class GuiFluidCraftAmount extends FCGuiAmount { - - private GuiImgButton craftingMode; - - public GuiFluidCraftAmount(final InventoryPlayer inventoryPlayer, final ITerminalHost te) { - super(new ContainerCraftAmount(inventoryPlayer, te)); - } - - @Override - public void initGui() { - super.initGui(); - - this.buttonList.add( - this.craftingMode = new GuiImgButton( - this.guiLeft + 10, - this.guiTop + 53, - Settings.CRAFTING_MODE, - CraftingMode.STANDARD)); - ((ContainerCraftAmount) this.inventorySlots).setAmountField(this.amountBox); - } - - @Override - public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - this.fontRendererObj.drawString(GuiText.SelectAmount.getLocal(), 8, 6, 0x404040); - } - - @Override - public void drawBG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - super.drawBG(offsetX, offsetY, mouseX, mouseY); - this.submit.displayString = isShiftKeyDown() ? GuiText.Start.getLocal() : GuiText.Next.getLocal(); - try { - this.submit.enabled = getAmount() > 0; - } catch (final NumberFormatException e) { - this.submit.enabled = false; - } - this.amountBox.drawTextBox(); - } - - @Override - protected void actionPerformed(final GuiButton btn) { - super.actionPerformed(btn); - try { - if (btn == this.craftingMode) { - GuiImgButton iBtn = ((GuiImgButton) btn); - - final Enum cv = iBtn.getCurrentValue(); - final boolean backwards = Mouse.isButtonDown(1); - final Enum next = Platform.rotateEnum(cv, backwards, iBtn.getSetting().getPossibleValues()); - - iBtn.set(next); - } else if (btn == this.submit && this.submit.enabled) { - FluidCraft.proxy.netHandler.sendToServer( - new CPacketCraftRequest( - getAmount(), - isShiftKeyDown(), - ((CraftingMode) this.craftingMode.getCurrentValue()))); - } - } catch (final NumberFormatException e) { - this.amountBox.setText("1"); - } - } - - @Override - protected void setOriginGUI(Object target) { - if (target instanceof PartFluidPatternTerminal) { - this.myIcon = ItemAndBlockHolder.FLUID_TERMINAL.stack(); - this.originalGui = GuiType.FLUID_PATTERN_TERMINAL; - } else if (target instanceof PartFluidPatternTerminalEx) { - this.myIcon = ItemAndBlockHolder.FLUID_TERMINAL_EX.stack(); - this.originalGui = GuiType.FLUID_PATTERN_TERMINAL_EX; - } else if (target instanceof PartFluidTerminal) { - this.myIcon = ItemAndBlockHolder.FLUID_TERM.stack(); - this.originalGui = GuiType.FLUID_TERMINAL; - } else if (target instanceof PartLevelTerminal) { - myIcon = ItemAndBlockHolder.LEVEL_TERMINAL.stack(); - originalGui = GuiType.LEVEL_TERMINAL; - } else if (target instanceof IWirelessTerminal terminal && terminal.isUniversal(target)) { - this.myIcon = ItemAndBlockHolder.WIRELESS_ULTRA_TERM.stack(); - this.originalGui = ItemWirelessUltraTerminal.readMode(terminal.getItemStack()); - } else if (target instanceof WirelessPatternTerminalInventory) { - this.myIcon = ItemAndBlockHolder.WIRELESS_PATTERN_TERM.stack(); - this.originalGui = GuiType.FLUID_TERMINAL; - } else if (target instanceof WirelessLevelTerminalInventory) { - myIcon = ItemAndBlockHolder.LEVEL_TERMINAL.stack(); - originalGui = GuiType.WIRELESS_LEVEL_TERMINAL; - } - } - - @Override - protected String getBackground() { - return "guis/craftAmt.png"; - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftConfirm.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftConfirm.java deleted file mode 100644 index 4ddbaea4..00000000 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftConfirm.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.glodblock.github.client.gui; - -import net.minecraft.entity.player.InventoryPlayer; - -import com.glodblock.github.common.item.ItemWirelessUltraTerminal; -import com.glodblock.github.common.parts.PartFluidPatternTerminal; -import com.glodblock.github.common.parts.PartFluidPatternTerminalEx; -import com.glodblock.github.common.parts.PartLevelTerminal; -import com.glodblock.github.inventory.InventoryHandler; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.IWirelessTerminal; -import com.glodblock.github.inventory.item.WirelessLevelTerminalInventory; -import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory; - -import appeng.api.storage.ITerminalHost; -import appeng.client.gui.implementations.GuiCraftConfirm; - -public class GuiFluidCraftConfirm extends GuiCraftConfirm { - - private GuiType originalGui; - - public GuiFluidCraftConfirm(final InventoryPlayer inventoryPlayer, final ITerminalHost te) { - super(inventoryPlayer, te); - if (te instanceof PartFluidPatternTerminal) { - this.originalGui = GuiType.FLUID_PATTERN_TERMINAL; - } else if (te instanceof PartFluidPatternTerminalEx) { - this.originalGui = GuiType.FLUID_PATTERN_TERMINAL_EX; - } else if (te instanceof PartLevelTerminal) { - originalGui = GuiType.LEVEL_TERMINAL; - } else if (te instanceof IWirelessTerminal terminal && terminal.isUniversal(te)) { - this.originalGui = ItemWirelessUltraTerminal.readMode(terminal.getItemStack()); - } else if (te instanceof WirelessPatternTerminalInventory) { - this.originalGui = GuiType.FLUID_TERMINAL; - } else if (te instanceof WirelessLevelTerminalInventory) { - originalGui = GuiType.WIRELESS_LEVEL_TERMINAL; - } - } - - @Override - public void switchToOriginalGUI() { - InventoryHandler.switchGui(originalGui); - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftingWireless.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftingWireless.java deleted file mode 100644 index 054cf43e..00000000 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftingWireless.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.glodblock.github.client.gui; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; - -import com.glodblock.github.client.gui.container.ContainerCraftingWireless; -import com.glodblock.github.inventory.InventoryHandler; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.IWirelessTerminal; - -import appeng.api.config.ActionItems; -import appeng.api.config.Settings; -import appeng.client.gui.widgets.GuiImgButton; -import appeng.container.slot.SlotCraftingMatrix; -import appeng.core.localization.GuiColors; -import appeng.core.localization.GuiText; -import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketInventoryAction; -import appeng.helpers.InventoryAction; - -public class GuiFluidCraftingWireless extends GuiItemMonitor { - - private GuiImgButton clearBtn; - - public GuiFluidCraftingWireless(final InventoryPlayer inventoryPlayer, final IWirelessTerminal te) { - super(inventoryPlayer, te, new ContainerCraftingWireless(inventoryPlayer, te)); - this.setReservedSpace(73); - } - - @Override - protected void actionPerformed(final GuiButton btn) { - if (btn == craftingStatusBtn) { - InventoryHandler.switchGui(GuiType.CRAFTING_STATUS); - } else { - super.actionPerformed(btn); - if (this.clearBtn == btn) { - Slot s = null; - final Container c = this.inventorySlots; - for (final Object j : c.inventorySlots) { - if (j instanceof SlotCraftingMatrix) { - s = (Slot) j; - } - } - if (s != null) { - final PacketInventoryAction p = new PacketInventoryAction( - InventoryAction.MOVE_REGION, - s.slotNumber, - 0); - NetworkHandler.instance.sendToServer(p); - } - } - } - } - - @Override - public void initGui() { - super.initGui(); - this.buttonList.add( - this.clearBtn = new GuiImgButton( - this.guiLeft + 92, - this.guiTop + this.ySize - 156, - Settings.ACTIONS, - ActionItems.STASH)); - this.clearBtn.setHalfSize(true); - } - - @Override - public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - super.drawFG(offsetX, offsetY, mouseX, mouseY); - this.fontRendererObj.drawString( - GuiText.CraftingTerminal.getLocal(), - 8, - this.ySize - 96 + 1 - this.getReservedSpace(), - GuiColors.CraftingTerminalTitle.getColor()); - } - - @Override - protected String getBackground() { - return "gui/crafting.png"; - } - -} diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidMonitor.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidMonitor.java deleted file mode 100644 index 1652483f..00000000 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidMonitor.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.glodblock.github.client.gui; - -import java.util.List; - -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -import com.glodblock.github.client.gui.base.FCGuiMonitor; -import com.glodblock.github.client.gui.container.ContainerFluidMonitor; -import com.glodblock.github.client.me.FluidRepo; -import com.glodblock.github.common.item.ItemFluidDrop; -import com.glodblock.github.util.Util; - -import appeng.api.storage.ITerminalHost; -import appeng.api.storage.data.IAEFluidStack; -import appeng.api.storage.data.IAEItemStack; -import appeng.core.localization.GuiText; -import appeng.util.item.AEItemStack; - -public class GuiFluidMonitor extends FCGuiMonitor { - - public GuiFluidMonitor(final InventoryPlayer inventoryPlayer, final ITerminalHost te, - final ContainerFluidMonitor c) { - super(inventoryPlayer, te, c); - this.repo = new FluidRepo(getScrollBar(), this); - this.setScrollBar(); - } - - @Override - public void postUpdate(final List list, boolean resort) { - for (final IAEFluidStack is : list) { - IAEItemStack stack = AEItemStack.create(ItemFluidDrop.newDisplayStack(is.getFluidStack())); - stack.setStackSize(is.getStackSize()); - this.repo.postUpdate(stack); - } - if (resort) { - this.repo.updateView(); - } - this.setScrollBar(); - } - - @Override - public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - this.fontRendererObj.drawString(this.getGuiDisplayName(GuiText.Terminal.getLocal()), 8, 6, 4210752); - this.fontRendererObj.drawString(GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752); - super.drawFG(offsetX, offsetY, mouseX, mouseY); - } - - @Override - protected IAEItemStack transformItem(IAEItemStack stack) { - if (stack.getItem() instanceof ItemFluidDrop) { - return ItemFluidDrop.newAeStack(ItemFluidDrop.getAeFluidStack(stack)); - } - return stack; - } - - @Override - public void setTextFieldValue(String displayName, int mousex, int mousey, ItemStack stack) { - final FluidStack fluid = Util.getFluidFromItem(stack); - if (fluid != null) { - setSearchString(fluid.getLocalizedName(), true); - } - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidOptimizePatterns.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidOptimizePatterns.java deleted file mode 100644 index ddd97789..00000000 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidOptimizePatterns.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.glodblock.github.client.gui; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; - -import com.glodblock.github.common.item.ItemWirelessUltraTerminal; -import com.glodblock.github.common.parts.PartFluidPatternTerminal; -import com.glodblock.github.common.parts.PartFluidPatternTerminalEx; -import com.glodblock.github.common.parts.PartLevelTerminal; -import com.glodblock.github.inventory.InventoryHandler; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.IWirelessTerminal; -import com.glodblock.github.inventory.item.WirelessLevelTerminalInventory; -import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory; - -import appeng.api.storage.ITerminalHost; -import appeng.client.gui.implementations.GuiOptimizePatterns; -import appeng.core.localization.GuiText; - -public class GuiFluidOptimizePatterns extends GuiOptimizePatterns { - - private GuiType originalGui; - - public GuiFluidOptimizePatterns(InventoryPlayer inventoryPlayer, ITerminalHost te) { - super(inventoryPlayer, te); - if (te instanceof PartFluidPatternTerminal) { - this.originalGui = GuiType.FLUID_PATTERN_TERMINAL; - } else if (te instanceof PartFluidPatternTerminalEx) { - this.originalGui = GuiType.FLUID_PATTERN_TERMINAL_EX; - } else if (te instanceof PartLevelTerminal) { - originalGui = GuiType.LEVEL_TERMINAL; - } else if (te instanceof IWirelessTerminal terminal && terminal.isUniversal(te)) { - this.originalGui = ItemWirelessUltraTerminal.readMode(terminal.getItemStack()); - } else if (te instanceof WirelessPatternTerminalInventory) { - this.originalGui = GuiType.FLUID_TERMINAL; - } else if (te instanceof WirelessLevelTerminalInventory) { - originalGui = GuiType.WIRELESS_LEVEL_TERMINAL; - } - } - - @Override - protected void actionPerformed(GuiButton btn) { - if (btn.displayString.equals(GuiText.Cancel.getLocal())) { - InventoryHandler.switchGui(originalGui); - return; - } - super.actionPerformed(btn); - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternEncoder.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternEncoder.java index 7ca1fdd1..512093ef 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternEncoder.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternEncoder.java @@ -22,7 +22,6 @@ import com.glodblock.github.common.tile.TileFluidPatternEncoder; import com.glodblock.github.inventory.gui.MouseRegionManager; import com.glodblock.github.inventory.slot.ISlotFluid; import com.glodblock.github.inventory.slot.SlotSingleItem; -import com.glodblock.github.network.CPacketEncodePattern; import com.glodblock.github.util.NameConst; import appeng.api.storage.data.IAEItemStack; @@ -50,7 +49,7 @@ public class GuiFluidPatternEncoder extends AEBaseGui { public boolean onClick(int button) { if (button == 0) { if (cont.canEncodePattern()) { - FluidCraft.proxy.netHandler.sendToServer(new CPacketEncodePattern()); + // FluidCraft.proxy.netHandler.sendToServer(new CPacketEncodePattern()); } return true; } diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternExWireless.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternExWireless.java deleted file mode 100644 index db13d964..00000000 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternExWireless.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.glodblock.github.client.gui; - -import net.minecraft.entity.player.InventoryPlayer; - -import com.glodblock.github.inventory.item.IWirelessTerminal; - -import appeng.container.slot.AppEngSlot; -import appeng.container.slot.SlotDisabled; - -public class GuiFluidPatternExWireless extends GuiFluidPatternTerminalEx { - - public GuiFluidPatternExWireless(InventoryPlayer inventoryPlayer, IWirelessTerminal te) { - super(inventoryPlayer, te); - } - - @Override - protected void repositionSlot(final AppEngSlot s) { - if (s instanceof SlotDisabled || s.isPlayerSide()) { - s.yDisplayPosition = s.getY() + this.ySize - 78 - 5; - } else { - s.yDisplayPosition = s.getY() + this.ySize - 78 - 3; - } - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminal.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminal.java deleted file mode 100644 index 8febe5a1..00000000 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminal.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.glodblock.github.client.gui; - -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.client.gui.base.FCGuiEncodeTerminal; -import com.glodblock.github.client.gui.container.ContainerFluidPatternTerminal; -import com.glodblock.github.client.gui.container.ContainerFluidPatternWireless; -import com.glodblock.github.inventory.item.IWirelessTerminal; -import com.glodblock.github.network.CPacketInventoryAction; -import com.glodblock.github.util.ModAndClassUtil; -import com.glodblock.github.util.NameConst; - -import appeng.api.config.ActionItems; -import appeng.api.config.ItemSubstitution; -import appeng.api.config.PatternBeSubstitution; -import appeng.api.config.Settings; -import appeng.api.storage.ITerminalHost; -import appeng.client.gui.widgets.GuiImgButton; -import appeng.client.gui.widgets.GuiTabButton; -import appeng.container.slot.OptionalSlotFake; -import appeng.container.slot.SlotFakeCraftingMatrix; -import appeng.container.slot.SlotPatternTerm; -import appeng.core.localization.GuiText; -import appeng.helpers.InventoryAction; - -public class GuiFluidPatternTerminal extends FCGuiEncodeTerminal { - - public GuiFluidPatternTerminal(final InventoryPlayer inventoryPlayer, final ITerminalHost te) { - super(inventoryPlayer, te, new ContainerFluidPatternTerminal(inventoryPlayer, te)); - } - - public GuiFluidPatternTerminal(final InventoryPlayer inventoryPlayer, final IWirelessTerminal te) { - super(inventoryPlayer, te, new ContainerFluidPatternWireless(inventoryPlayer, te)); - } - - @Override - public void initGui() { - super.initGui(); - this.tabCraftButton = new GuiTabButton( - this.guiLeft + 173, - this.guiTop + this.ySize - 177, - new ItemStack(Blocks.crafting_table), - GuiText.CraftingPattern.getLocal(), - itemRender); - this.buttonList.add(this.tabCraftButton); - - this.tabProcessButton = new GuiTabButton( - this.guiLeft + 173, - this.guiTop + this.ySize - 177, - new ItemStack(Blocks.furnace), - GuiText.ProcessingPattern.getLocal(), - itemRender); - this.buttonList.add(this.tabProcessButton); - - this.substitutionsEnabledBtn = new GuiImgButton( - this.guiLeft + 84, - this.guiTop + this.ySize - 163, - Settings.ACTIONS, - ItemSubstitution.ENABLED); - this.substitutionsEnabledBtn.setHalfSize(true); - this.buttonList.add(this.substitutionsEnabledBtn); - - this.substitutionsDisabledBtn = new GuiImgButton( - this.guiLeft + 84, - this.guiTop + this.ySize - 163, - Settings.ACTIONS, - ItemSubstitution.DISABLED); - this.substitutionsDisabledBtn.setHalfSize(true); - this.buttonList.add(this.substitutionsDisabledBtn); - - this.clearBtn = new GuiImgButton( - this.guiLeft + 74, - this.guiTop + this.ySize - 163, - Settings.ACTIONS, - ActionItems.CLOSE); - this.clearBtn.setHalfSize(true); - this.buttonList.add(this.clearBtn); - - this.encodeBtn = new GuiImgButton( - this.guiLeft + 147, - this.guiTop + this.ySize - 142, - Settings.ACTIONS, - ActionItems.ENCODE); - this.buttonList.add(this.encodeBtn); - - int combineLeft = 74; - int combineTop = 153; - if (ModAndClassUtil.isDoubleButton) { - this.doubleBtn = new GuiImgButton( - this.guiLeft + 74, - this.guiTop + this.ySize - 153, - Settings.ACTIONS, - ActionItems.DOUBLE); - this.doubleBtn.setHalfSize(true); - this.buttonList.add(this.doubleBtn); - combineLeft = 84; - } - if (ModAndClassUtil.isBeSubstitutionsButton) { - combineLeft = 74; - combineTop -= 11; - this.beSubstitutionsEnabledBtn = new GuiImgButton( - this.guiLeft + 84, - this.guiTop + this.ySize - 153, - Settings.ACTIONS, - PatternBeSubstitution.ENABLED); - this.beSubstitutionsEnabledBtn.setHalfSize(true); - this.buttonList.add(this.beSubstitutionsEnabledBtn); - - this.beSubstitutionsDisabledBtn = new GuiImgButton( - this.guiLeft + 84, - this.guiTop + this.ySize - 153, - Settings.ACTIONS, - PatternBeSubstitution.DISABLED); - this.beSubstitutionsDisabledBtn.setHalfSize(true); - this.buttonList.add(this.beSubstitutionsDisabledBtn); - } - this.combineEnableBtn = new GuiFCImgButton( - this.guiLeft + combineLeft, - this.guiTop + this.ySize - combineTop, - "FORCE_COMBINE", - "DO_COMBINE"); - this.combineEnableBtn.setHalfSize(true); - this.buttonList.add(this.combineEnableBtn); - - this.combineDisableBtn = new GuiFCImgButton( - this.guiLeft + combineLeft, - this.guiTop + this.ySize - combineTop, - "NOT_COMBINE", - "DONT_COMBINE"); - this.combineDisableBtn.setHalfSize(true); - this.buttonList.add(this.combineDisableBtn); - } - - @Override - public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - super.drawFG(offsetX, offsetY, mouseX, mouseY); - this.fontRendererObj.drawString( - StatCollector.translateToLocal(NameConst.GUI_FLUID_PATTERN_TERMINAL), - 8, - this.ySize - 96 + 2 - getReservedSpace(), - 4210752); - } - - @Override - protected void mouseClicked(final int xCoord, final int yCoord, final int btn) { - - if (btn == 2 && doubleBtn.mousePressed(this.mc, xCoord, yCoord)) { // - InventoryAction action = InventoryAction.SET_PATTERN_MULTI; - - final CPacketInventoryAction p = new CPacketInventoryAction(action, 0, 0); - FluidCraft.proxy.netHandler.sendToServer(p); - } else super.mouseClicked(xCoord, yCoord, btn); - - } - - @Override - protected void handleMouseClick(final Slot slot, final int slotIdx, final int ctrlDown, final int mouseButton) { - if (mouseButton == 3) { - if (this.container.isCraftingMode() - && (slot instanceof OptionalSlotFake || slot instanceof SlotFakeCraftingMatrix - || slot instanceof SlotPatternTerm)) { - return; - } - } - super.handleMouseClick(slot, slotIdx, ctrlDown, mouseButton); - } - - @Override - protected String getBackground() { - if (this.container.isCraftingMode()) { - return "gui/pattern.png"; - } - return "gui/pattern2.png"; - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalEx.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalEx.java deleted file mode 100644 index 5cd0d1e8..00000000 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalEx.java +++ /dev/null @@ -1,232 +0,0 @@ -package com.glodblock.github.client.gui; - -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.StatCollector; - -import org.lwjgl.input.Mouse; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.client.gui.base.FCGuiEncodeTerminal; -import com.glodblock.github.client.gui.container.ContainerFluidPatternExWireless; -import com.glodblock.github.client.gui.container.ContainerFluidPatternTerminalEx; -import com.glodblock.github.inventory.item.IWirelessTerminal; -import com.glodblock.github.network.CPacketFluidPatternTermBtns; -import com.glodblock.github.network.CPacketInventoryAction; -import com.glodblock.github.util.ModAndClassUtil; -import com.glodblock.github.util.NameConst; - -import appeng.api.config.ActionItems; -import appeng.api.config.ItemSubstitution; -import appeng.api.config.PatternBeSubstitution; -import appeng.api.config.PatternSlotConfig; -import appeng.api.config.Settings; -import appeng.api.storage.ITerminalHost; -import appeng.client.gui.widgets.GuiImgButton; -import appeng.helpers.InventoryAction; - -public class GuiFluidPatternTerminalEx extends FCGuiEncodeTerminal { - - public GuiFluidPatternTerminalEx(final InventoryPlayer inventoryPlayer, final ITerminalHost te) { - super(inventoryPlayer, te, new ContainerFluidPatternTerminalEx(inventoryPlayer, te)); - processingScrollBar.setHeight(70).setWidth(7).setLeft(6).setRange(0, 1, 1); - processingScrollBar.setTexture(FluidCraft.MODID, "gui/pattern3.png", 242, 0); - } - - public GuiFluidPatternTerminalEx(final InventoryPlayer inventoryPlayer, final IWirelessTerminal te) { - super(inventoryPlayer, te, new ContainerFluidPatternExWireless(inventoryPlayer, te)); - processingScrollBar.setHeight(70).setWidth(7).setLeft(6).setRange(0, 1, 1); - processingScrollBar.setTexture(FluidCraft.MODID, "gui/pattern3.png", 242, 0); - } - - @Override - public void initGui() { - super.initGui(); - - this.substitutionsEnabledBtn = new GuiImgButton( - this.guiLeft + 97, - this.guiTop + this.ySize - 163, - Settings.ACTIONS, - ItemSubstitution.ENABLED); - this.substitutionsEnabledBtn.setHalfSize(true); - this.buttonList.add(this.substitutionsEnabledBtn); - - this.substitutionsDisabledBtn = new GuiImgButton( - this.guiLeft + 97, - this.guiTop + this.ySize - 163, - Settings.ACTIONS, - ItemSubstitution.DISABLED); - this.substitutionsDisabledBtn.setHalfSize(true); - this.buttonList.add(this.substitutionsDisabledBtn); - - this.fluidPrioritizedEnabledBtn = new GuiFCImgButton( - this.guiLeft + 97, - this.guiTop + this.ySize - 114, - "FORCE_PRIO", - "DO_PRIO"); - this.fluidPrioritizedEnabledBtn.setHalfSize(true); - this.buttonList.add(this.fluidPrioritizedEnabledBtn); - - this.fluidPrioritizedDisabledBtn = new GuiFCImgButton( - this.guiLeft + 97, - this.guiTop + this.ySize - 114, - "NOT_PRIO", - "DONT_PRIO"); - this.fluidPrioritizedDisabledBtn.setHalfSize(true); - this.buttonList.add(this.fluidPrioritizedDisabledBtn); - - invertBtn = new GuiImgButton( - this.guiLeft + 87, - this.guiTop + this.ySize - 153, - Settings.ACTIONS, - container.inverted ? PatternSlotConfig.C_4_16 : PatternSlotConfig.C_16_4); - invertBtn.setHalfSize(true); - this.buttonList.add(this.invertBtn); - - this.clearBtn = new GuiImgButton( - this.guiLeft + 87, - this.guiTop + this.ySize - 163, - Settings.ACTIONS, - ActionItems.CLOSE); - this.clearBtn.setHalfSize(true); - this.buttonList.add(this.clearBtn); - - this.encodeBtn = new GuiImgButton( - this.guiLeft + 147, - this.guiTop + this.ySize - 142, - Settings.ACTIONS, - ActionItems.ENCODE); - this.buttonList.add(this.encodeBtn); - - if (ModAndClassUtil.isDoubleButton) { - this.doubleBtn = new GuiImgButton( - this.guiLeft + 97, - this.guiTop + this.ySize - 153, - Settings.ACTIONS, - ActionItems.DOUBLE); - this.doubleBtn.setHalfSize(true); - this.buttonList.add(this.doubleBtn); - } - - this.combineEnableBtn = new GuiFCImgButton( - this.guiLeft + 87, - this.guiTop + this.ySize - 114, - "FORCE_COMBINE", - "DO_COMBINE"); - this.combineEnableBtn.setHalfSize(true); - this.buttonList.add(this.combineEnableBtn); - - this.combineDisableBtn = new GuiFCImgButton( - this.guiLeft + 87, - this.guiTop + this.ySize - 114, - "NOT_COMBINE", - "DONT_COMBINE"); - this.combineDisableBtn.setHalfSize(true); - this.buttonList.add(this.combineDisableBtn); - if (ModAndClassUtil.isBeSubstitutionsButton) { - this.beSubstitutionsEnabledBtn = new GuiImgButton( - this.guiLeft + 87, - this.guiTop + this.ySize - 103, - Settings.ACTIONS, - PatternBeSubstitution.ENABLED); - this.beSubstitutionsEnabledBtn.setHalfSize(true); - this.buttonList.add(this.beSubstitutionsEnabledBtn); - - this.beSubstitutionsDisabledBtn = new GuiImgButton( - this.guiLeft + 87, - this.guiTop + this.ySize - 103, - Settings.ACTIONS, - PatternBeSubstitution.DISABLED); - this.beSubstitutionsDisabledBtn.setHalfSize(true); - this.buttonList.add(this.beSubstitutionsDisabledBtn); - } - processingScrollBar.setTop(this.ySize - 164); - } - - @Override - public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - super.drawFG(offsetX, offsetY, mouseX, mouseY); - this.fontRendererObj.drawString( - StatCollector.translateToLocal(NameConst.GUI_FLUID_PATTERN_TERMINAL_EX), - 8, - this.ySize - 96 + 2 - getReservedSpace(), - 4210752); - this.processingScrollBar.draw(this); - } - - @Override - protected String getBackground() { - return container.inverted ? "gui/pattern4.png" : "gui/pattern3.png"; - } - - @Override - public void drawScreen(final int mouseX, final int mouseY, final float btn) { - final int offset = container.inverted ? 18 * -3 : 0; - substitutionsEnabledBtn.xPosition = this.guiLeft + 97 + offset; - substitutionsDisabledBtn.xPosition = this.guiLeft + 97 + offset; - beSubstitutionsEnabledBtn.xPosition = this.guiLeft + 97 + offset; - beSubstitutionsDisabledBtn.xPosition = this.guiLeft + 97 + offset; - fluidPrioritizedEnabledBtn.xPosition = this.guiLeft + 97 + offset; - fluidPrioritizedDisabledBtn.xPosition = this.guiLeft + 97 + offset; - doubleBtn.xPosition = this.guiLeft + 97 + offset; - clearBtn.xPosition = this.guiLeft + 87 + offset; - invertBtn.xPosition = this.guiLeft + 87 + offset; - combineEnableBtn.xPosition = this.guiLeft + 87 + offset; - combineDisableBtn.xPosition = this.guiLeft + 87 + offset; - processingScrollBar.setCurrentScroll(container.activePage); - super.drawScreen(mouseX, mouseY, btn); - } - - @Override - protected void mouseClicked(final int xCoord, final int yCoord, final int btn) { - final int currentScroll = this.processingScrollBar.getCurrentScroll(); - this.processingScrollBar.click(this, xCoord - this.guiLeft, yCoord - this.guiTop); - if (btn == 2 && doubleBtn.mousePressed(this.mc, xCoord, yCoord)) { // - InventoryAction action = InventoryAction.SET_PATTERN_MULTI; - - final CPacketInventoryAction p = new CPacketInventoryAction(action, 0, 0); - FluidCraft.proxy.netHandler.sendToServer(p); - } else super.mouseClicked(xCoord, yCoord, btn); - - if (currentScroll != this.processingScrollBar.getCurrentScroll()) { - changeActivePage(); - } - } - - @Override - protected void mouseClickMove(final int x, final int y, final int c, final long d) { - final int currentScroll = this.processingScrollBar.getCurrentScroll(); - this.processingScrollBar.click(this, x - this.guiLeft, y - this.guiTop); - super.mouseClickMove(x, y, c, d); - - if (currentScroll != this.processingScrollBar.getCurrentScroll()) { - changeActivePage(); - } - } - - @Override - public void handleMouseInput() { - super.handleMouseInput(); - final int wheel = Mouse.getEventDWheel(); - - if (wheel != 0) { - final int x = Mouse.getEventX() * this.width / this.mc.displayWidth; - final int y = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight; - - if (this.processingScrollBar.contains(x - this.guiLeft, y - this.guiTop)) { - final int currentScroll = this.processingScrollBar.getCurrentScroll(); - this.processingScrollBar.wheel(wheel); - - if (currentScroll != this.processingScrollBar.getCurrentScroll()) { - changeActivePage(); - } - } - } - } - - private void changeActivePage() { - FluidCraft.proxy.netHandler.sendToServer( - new CPacketFluidPatternTermBtns( - "PatternTerminal.ActivePage", - String.valueOf(this.processingScrollBar.getCurrentScroll()))); - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternWireless.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternWireless.java deleted file mode 100644 index 24d0c94c..00000000 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternWireless.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.glodblock.github.client.gui; - -import net.minecraft.entity.player.InventoryPlayer; - -import com.glodblock.github.inventory.item.IWirelessTerminal; - -import appeng.container.slot.AppEngSlot; -import appeng.container.slot.SlotDisabled; - -public class GuiFluidPatternWireless extends GuiFluidPatternTerminal { - - public GuiFluidPatternWireless(InventoryPlayer inventoryPlayer, IWirelessTerminal te) { - super(inventoryPlayer, te); - } - - @Override - protected void repositionSlot(final AppEngSlot s) { - if (s instanceof SlotDisabled || s.isPlayerSide()) { - s.yDisplayPosition = s.getY() + this.ySize - 78 - 5; - } else { - s.yDisplayPosition = s.getY() + this.ySize - 78 - 3; - } - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidPortableCell.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidPortableCell.java deleted file mode 100644 index c3759a61..00000000 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidPortableCell.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.glodblock.github.client.gui; - -import net.minecraft.entity.player.InventoryPlayer; - -import com.glodblock.github.client.gui.container.ContainerFluidPortableCell; -import com.glodblock.github.inventory.item.IFluidPortableCell; -import com.glodblock.github.inventory.item.IWirelessTerminal; - -import appeng.container.slot.AppEngSlot; - -public class GuiFluidPortableCell extends GuiFluidTerminal { - - public GuiFluidPortableCell(final InventoryPlayer inventoryPlayer, final IFluidPortableCell te) { - super(inventoryPlayer, te, new ContainerFluidPortableCell(inventoryPlayer, te)); - } - - @Override - protected void repositionSlot(final AppEngSlot s) { - s.yDisplayPosition = s.getY() + this.ySize - 78 - 5; - } - - @Override - protected int getMaxRows() { - if (this.container.getHost() instanceof IWirelessTerminal) { - return super.getMaxRows(); - } else { - return 3; - } - } - - @Override - protected boolean isPortableCell() { - return true; - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidTerminal.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidTerminal.java deleted file mode 100644 index 36331e26..00000000 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidTerminal.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.glodblock.github.client.gui; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.client.gui.container.ContainerFluidMonitor; -import com.glodblock.github.common.item.ItemFluidDrop; -import com.glodblock.github.inventory.InventoryHandler; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.network.CPacketFluidUpdate; -import com.glodblock.github.util.ModAndClassUtil; -import com.glodblock.github.util.Util; -import com.mitchej123.hodgepodge.textures.IPatchedTextureAtlasSprite; - -import appeng.api.storage.ITerminalHost; -import appeng.api.storage.data.IAEFluidStack; -import appeng.api.storage.data.IAEItemStack; -import appeng.client.me.SlotME; -import appeng.container.slot.AppEngSlot; - -public class GuiFluidTerminal extends GuiFluidMonitor { - - protected EntityPlayer player; - public ContainerFluidMonitor container; - - public GuiFluidTerminal(InventoryPlayer inventoryPlayer, ITerminalHost te) { - super(inventoryPlayer, te, new ContainerFluidMonitor(inventoryPlayer, te)); - this.container = new ContainerFluidMonitor(inventoryPlayer, te); - this.player = inventoryPlayer.player; - this.showViewBtn = false; - } - - public GuiFluidTerminal(final InventoryPlayer inventoryPlayer, final ITerminalHost te, - final ContainerFluidMonitor c) { - super(inventoryPlayer, te, c); - this.container = c; - this.player = inventoryPlayer.player; - this.showViewBtn = false; - } - - @Override - protected void repositionSlot(final AppEngSlot s) { - if (s.isPlayerSide()) { - s.yDisplayPosition = s.getY() + this.ySize - 78 - 5; - } else { - s.yDisplayPosition = s.getY() + this.ySize - 78 - 3; - } - } - - @Override - protected void actionPerformed(final GuiButton btn) { - if (btn == craftingStatusBtn) { - InventoryHandler.switchGui(GuiType.CRAFTING_STATUS); - } else { - super.actionPerformed(btn); - } - } - - @Override - public void func_146977_a(final Slot s) { - if (drawSlot0(s)) super.func_146977_a(s); - } - - public boolean drawSlot0(Slot slot) { - if (slot instanceof SlotME) { - IAEItemStack stack = ((SlotME) slot).getAEStack(); - if (stack == null) return true; - FluidStack fluidStack = ItemFluidDrop.getFluidStack(slot.getStack()); - this.drawWidget(slot.xDisplayPosition, slot.yDisplayPosition, fluidStack.getFluid()); - aeRenderItem.setAeStack(stack); - GL11.glTranslatef(0.0f, 0.0f, 200.0f); - aeRenderItem.renderItemOverlayIntoGUI( - fontRendererObj, - mc.getTextureManager(), - stack.getItemStack(), - slot.xDisplayPosition, - slot.yDisplayPosition); - GL11.glTranslatef(0.0f, 0.0f, -200.0f); - return false; - } - return true; - } - - private void drawWidget(int posX, int posY, Fluid fluid) { - if (fluid == null) return; - IIcon icon = fluid.getIcon(); - if (icon == null) return; - - if (ModAndClassUtil.HODGEPODGE && icon instanceof IPatchedTextureAtlasSprite) { - ((IPatchedTextureAtlasSprite) icon).markNeedsAnimationUpdate(); - } - - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor3f( - (fluid.getColor() >> 16 & 0xFF) / 255.0F, - (fluid.getColor() >> 8 & 0xFF) / 255.0F, - (fluid.getColor() & 0xFF) / 255.0F); - drawTexturedModelRectFromIcon(posX, posY, fluid.getIcon(), 16, 16); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_BLEND); - GL11.glColor3f(1, 1, 1); - } - - @Override - protected void handleMouseClick(final Slot slot, final int slotIdx, final int ctrlDown, final int mouseButton) { - if (slot instanceof SlotME && Util.FluidUtil.isFluidContainer(player.inventory.getItemStack())) { - IAEFluidStack fluid = ItemFluidDrop.getAeFluidStack(((SlotME) slot).getAEStack()); - FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidUpdate(fluid, isShiftKeyDown())); - } - if (mouseButton == 3 && slot instanceof SlotME) { - return; - } - super.handleMouseClick(slot, slotIdx, ctrlDown, mouseButton); - } - - public void update(ItemStack itemStack) { - this.player.inventory.setItemStack(itemStack); - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/GuiInterfaceWireless.java b/src/main/java/com/glodblock/github/client/gui/GuiInterfaceWireless.java deleted file mode 100644 index e46adaf8..00000000 --- a/src/main/java/com/glodblock/github/client/gui/GuiInterfaceWireless.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.glodblock.github.client.gui; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; - -import com.glodblock.github.client.gui.container.ContainerInterfaceWireless; -import com.glodblock.github.common.item.ItemWirelessUltraTerminal; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.IWirelessTerminal; -import com.glodblock.github.util.ModAndClassUtil; - -import appeng.client.gui.implementations.GuiInterfaceTerminal; - -public class GuiInterfaceWireless extends GuiInterfaceTerminal { - - protected GuiFCImgButton FluidTerminal; - protected GuiFCImgButton CraftingTerminal; - protected GuiFCImgButton PatternTerminal; - protected GuiFCImgButton EssentiaTerminal; - protected GuiFCImgButton InterfaceTerminal; - protected GuiFCImgButton LevelTerminal; - protected GuiFCImgButton PatternTerminalEx; - - public GuiInterfaceWireless(final InventoryPlayer inventoryPlayer, final IWirelessTerminal te) { - super(new ContainerInterfaceWireless(inventoryPlayer, te)); - } - - @Override - public void initGui() { - super.initGui(); - drawSwitchGuiBtns(); - } - - protected void drawSwitchGuiBtns() { - this.buttonList.add(this.CraftingTerminal = new GuiFCImgButton(this.guiLeft - 18, offsetY, "CRAFT_TEM", "YES")); - offsetY += 20; - - this.buttonList - .add(this.PatternTerminal = new GuiFCImgButton(this.guiLeft - 18, offsetY, "PATTERN_TEM", "YES")); - offsetY += 20; - - this.buttonList - .add(this.PatternTerminalEx = new GuiFCImgButton(this.guiLeft - 18, offsetY, "PATTERN_EX_TEM", "YES")); - offsetY += 20; - - this.buttonList.add(this.FluidTerminal = new GuiFCImgButton(this.guiLeft - 18, offsetY, "FLUID_TEM", "YES")); - offsetY += 20; - - this.buttonList.add(this.LevelTerminal = new GuiFCImgButton(this.guiLeft - 18, offsetY, "LEVEL_TEM", "YES")); - offsetY += 20; - - if (ModAndClassUtil.ThE) { - this.buttonList - .add(this.EssentiaTerminal = new GuiFCImgButton(this.guiLeft - 18, offsetY, "ESSENTIA_TEM", "YES")); - offsetY += 20; - } - } - - private boolean scheduleGuiResize; - - @Override - protected void mouseClicked(int xCoord, int yCoord, int btn) { - super.mouseClicked(xCoord, yCoord, btn); - if (scheduleGuiResize) { - // in the GuiScreen class, the implementation of super.mouseClicked - // ends up looping on the button list and execute the action for any - // button below the mouse. - // Therefore, if we initGui() the terminal in the actionPerformed method below - // it will run the actionPerformed a second time for the new button - // that will end up being below the mouse (if any) after the initGui() - buttonList.clear(); - initGui(); - scheduleGuiResize = false; - } - } - - protected final void scheduleGuiResize() { - scheduleGuiResize = true; - } - - @Override - protected void actionPerformed(final GuiButton btn) { - if (btn instanceof GuiFCImgButton) { - if (btn == this.FluidTerminal) { - ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_FLUID_TERMINAL); - } else if (btn == this.CraftingTerminal) { - ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_CRAFTING_TERMINAL); - } else if (btn == this.EssentiaTerminal) { - ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_ESSENTIA_TERMINAL); - } else if (btn == this.PatternTerminal) { - ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_FLUID_PATTERN_TERMINAL); - } else if (btn == this.InterfaceTerminal) { - ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_INTERFACE_TERMINAL); - } else if (btn == this.LevelTerminal) { - ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_LEVEL_TERMINAL); - } else if (btn == this.PatternTerminalEx) { - ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_FLUID_PATTERN_TERMINAL_EX); - } - } - - super.actionPerformed(btn); - - if (btn == this.terminalStyleBox) { - scheduleGuiResize(); - } - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/GuiItemMonitor.java b/src/main/java/com/glodblock/github/client/gui/GuiItemMonitor.java deleted file mode 100644 index d2a41ec6..00000000 --- a/src/main/java/com/glodblock/github/client/gui/GuiItemMonitor.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.glodblock.github.client.gui; - -import java.util.List; - -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; - -import com.glodblock.github.client.gui.base.FCGuiMonitor; -import com.glodblock.github.client.gui.container.ContainerItemMonitor; - -import appeng.api.storage.ITerminalHost; -import appeng.api.storage.data.IAEItemStack; -import appeng.client.me.ItemRepo; -import appeng.core.localization.GuiText; - -public class GuiItemMonitor extends FCGuiMonitor { - - public GuiItemMonitor(final InventoryPlayer inventoryPlayer, final ITerminalHost te, final ContainerItemMonitor c) { - super(inventoryPlayer, te, c); - this.repo = new ItemRepo(getScrollBar(), this); - } - - @Override - public void postUpdate(final List list, boolean resort) { - for (final IAEItemStack is : list) { - this.repo.postUpdate(is); - } - if (resort) { - this.repo.updateView(); - } - this.setScrollBar(); - } - - @Override - public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - this.fontRendererObj.drawString(this.getGuiDisplayName(GuiText.Terminal.getLocal()), 8, 6, 4210752); - this.fontRendererObj.drawString(GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752); - super.drawFG(offsetX, offsetY, mouseX, mouseY); - } - - @Override - public void setTextFieldValue(String displayName, int mousex, int mousey, ItemStack stack) { - setSearchString(displayName, true); - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java b/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java index 4a63527f..81e17d68 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java @@ -22,7 +22,6 @@ import org.lwjgl.opengl.GL11; import com.glodblock.github.FluidCraft; import com.glodblock.github.api.registries.LevelState; import com.glodblock.github.client.gui.container.ContainerLevelMaintainer; -import com.glodblock.github.common.item.ItemWirelessUltraTerminal; import com.glodblock.github.common.parts.PartLevelTerminal; import com.glodblock.github.common.tile.TileLevelMaintainer; import com.glodblock.github.inventory.gui.GuiType; @@ -96,7 +95,6 @@ public class GuiLevelMaintainer extends AEBaseGui implements INEIGuiHandler { ""); } else if (target instanceof IWirelessTerminal terminal && terminal.isUniversal(target)) { icon = ItemAndBlockHolder.WIRELESS_ULTRA_TERM.stack(); - originalGui = ItemWirelessUltraTerminal.readMode(terminal.getItemStack()); originalBlockPos = new Util.DimensionalCoordSide( terminal.getInventorySlot(), Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM), diff --git a/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java b/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java index 98c8b78f..9c95adf4 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java @@ -39,12 +39,8 @@ import com.glodblock.github.api.registries.LevelItemInfo; import com.glodblock.github.api.registries.LevelState; import com.glodblock.github.client.gui.base.FCBaseMEGui; import com.glodblock.github.client.gui.container.ContainerLevelTerminal; -import com.glodblock.github.inventory.InventoryHandler; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.network.CPacketInventoryAction; import com.glodblock.github.network.CPacketLevelTerminalCommands; import com.glodblock.github.network.CPacketLevelTerminalCommands.Action; -import com.glodblock.github.network.CPacketRenamer; import com.glodblock.github.network.SPacketLevelTerminalUpdate; import com.glodblock.github.util.FCGuiColors; import com.glodblock.github.util.ModAndClassUtil; @@ -320,7 +316,6 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel searchStringSave.set(next); } else if (btn == craftingStatusBtn) { - InventoryHandler.switchGui(GuiType.CRAFTING_STATUS); } else if (btn instanceof final GuiImgButton iBtn) { if (iBtn.getSetting() != Settings.ACTIONS) { final Enum cv = iBtn.getCurrentValue(); @@ -1251,13 +1246,10 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel blockPos.getDimension(), blockPos.getSide())); } else if (isShiftKeyDown()) { - FluidCraft.proxy.netHandler.sendToServer( - new CPacketRenamer( - blockPos.x, - blockPos.y, - blockPos.z, - blockPos.getDimension(), - blockPos.getSide())); + /* + * FluidCraft.proxy.netHandler.sendToServer( new CPacketRenamer( blockPos.x, blockPos.y, blockPos.z, + * blockPos.getDimension(), blockPos.getSide())); + */ } else { BlockPosHighlighter.highlightBlocks( mc.thePlayer, @@ -1296,7 +1288,8 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel if (action != null && this.infoList[slotIdx] != null) { AEItemStack aeStack = AEItemStack.create(this.infoList[slotIdx].stack); ((AEBaseContainer) inventorySlots).setTargetStack(aeStack); - FluidCraft.proxy.netHandler.sendToServer(new CPacketInventoryAction(action, slotIdx, 0, aeStack)); + // FluidCraft.proxy.netHandler.sendToServer(new CPacketInventoryAction(action, slotIdx, 0, + // aeStack)); } return true; diff --git a/src/main/java/com/glodblock/github/client/gui/GuiPatternItemRenamer.java b/src/main/java/com/glodblock/github/client/gui/GuiPatternItemRenamer.java deleted file mode 100644 index fb0bc91d..00000000 --- a/src/main/java/com/glodblock/github/client/gui/GuiPatternItemRenamer.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.glodblock.github.client.gui; - -import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.input.Keyboard; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.common.item.ItemWirelessUltraTerminal; -import com.glodblock.github.common.parts.PartFluidPatternTerminal; -import com.glodblock.github.common.parts.PartFluidPatternTerminalEx; -import com.glodblock.github.common.parts.PartFluidTerminal; -import com.glodblock.github.common.parts.PartLevelTerminal; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.IWirelessTerminal; -import com.glodblock.github.inventory.item.WirelessLevelTerminalInventory; -import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory; -import com.glodblock.github.network.SPacketPatternItemRenamer; - -import appeng.api.storage.ITerminalHost; - -public class GuiPatternItemRenamer extends appeng.client.gui.implementations.GuiPatternItemRenamer { - - private GuiType originalGui; - - public GuiPatternItemRenamer(InventoryPlayer ip, ITerminalHost p) { - super(ip, p); - } - - @Override - protected void setOriginGUI(Object target) { - if (target instanceof PartFluidPatternTerminal) { - this.originalGui = GuiType.FLUID_PATTERN_TERMINAL; - } else if (target instanceof PartFluidPatternTerminalEx) { - this.originalGui = GuiType.FLUID_PATTERN_TERMINAL_EX; - } else if (target instanceof PartFluidTerminal) { - this.originalGui = GuiType.FLUID_TERMINAL; - } else if (target instanceof PartLevelTerminal) { - originalGui = GuiType.LEVEL_TERMINAL; - } else if (target instanceof IWirelessTerminal terminal && terminal.isUniversal(target)) { - this.originalGui = ItemWirelessUltraTerminal.readMode(terminal.getItemStack()); - } else if (target instanceof WirelessPatternTerminalInventory) { - this.originalGui = GuiType.FLUID_TERMINAL; - } else if (target instanceof WirelessLevelTerminalInventory) { - originalGui = GuiType.WIRELESS_LEVEL_TERMINAL; - } - } - - @Override - protected void keyTyped(final char character, final int key) { - if (key == Keyboard.KEY_RETURN || key == Keyboard.KEY_NUMPADENTER) { - FluidCraft.proxy.netHandler - .sendToServer(new SPacketPatternItemRenamer(originalGui, getText(), getValueIndex())); - } else super.keyTyped(character, key); - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/GuiPatternMulti.java b/src/main/java/com/glodblock/github/client/gui/GuiPatternMulti.java deleted file mode 100644 index e08d094e..00000000 --- a/src/main/java/com/glodblock/github/client/gui/GuiPatternMulti.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.glodblock.github.client.gui; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.common.item.ItemWirelessUltraTerminal; -import com.glodblock.github.common.parts.PartFluidPatternTerminal; -import com.glodblock.github.common.parts.PartFluidPatternTerminalEx; -import com.glodblock.github.common.parts.PartFluidTerminal; -import com.glodblock.github.common.parts.PartLevelTerminal; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.IWirelessTerminal; -import com.glodblock.github.inventory.item.WirelessLevelTerminalInventory; -import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory; -import com.glodblock.github.loader.ItemAndBlockHolder; -import com.glodblock.github.network.CPacketPatternMultiSet; - -import appeng.api.config.ActionItems; -import appeng.api.config.Settings; -import appeng.api.storage.ITerminalHost; -import appeng.client.gui.implementations.GuiAmount; -import appeng.client.gui.widgets.GuiImgButton; -import appeng.container.implementations.ContainerPatternMulti; -import appeng.core.localization.GuiColors; -import appeng.core.localization.GuiText; -import appeng.helpers.Reflected; -import appeng.util.calculators.ArithHelper; -import appeng.util.calculators.Calculator; - -public class GuiPatternMulti extends GuiAmount { - - private static final int DEFAULT_VALUE = 0; - private GuiImgButton symbolSwitch; - protected GuiType originalGui; - - @Reflected - public GuiPatternMulti(final InventoryPlayer inventoryPlayer, final ITerminalHost te) { - super(new ContainerPatternMulti(inventoryPlayer, te)); - } - - @Override - public void initGui() { - super.initGui(); - - this.buttonList.add( - this.symbolSwitch = new GuiImgButton( - this.guiLeft + 22, - this.guiTop + 53, - Settings.ACTIONS, - ActionItems.MULTIPLY)); - - this.amountTextField.x = this.guiLeft + 48; - this.amountTextField.w = 73; - this.amountTextField.setText(String.valueOf(DEFAULT_VALUE)); - this.amountTextField.setCursorPositionEnd(); - this.amountTextField.setSelectionPos(0); - } - - @Override - public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - this.fontRendererObj - .drawString(GuiText.SelectAmount.getLocal(), 8, 6, GuiColors.CraftAmountSelectAmount.getColor()); - } - - @Override - public void drawBG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - super.drawBG(offsetX, offsetY, mouseX, mouseY); - this.nextBtn.displayString = GuiText.Set.getLocal(); - - try { - int resultI = getAmount(); - - this.symbolSwitch.set(resultI >= 0 ? ActionItems.MULTIPLY : ActionItems.DIVIDE); - this.nextBtn.enabled = resultI < -1 || resultI > 1; - } catch (final NumberFormatException e) { - this.nextBtn.enabled = false; - } - - this.amountTextField.drawTextBox(); - } - - @Override - protected void actionPerformed(final GuiButton btn) { - super.actionPerformed(btn); - - try { - - if (btn == this.nextBtn && btn.enabled) { - int resultI = getAmount(); - if (resultI > 1 || resultI < -1) - FluidCraft.proxy.netHandler.sendToServer(new CPacketPatternMultiSet(this.originalGui, resultI)); - } - } catch (final NumberFormatException e) { - // nope.. - this.amountTextField.setText(String.valueOf(DEFAULT_VALUE)); - } - - if (btn == this.symbolSwitch) { - int resultI = -getAmount(); - this.amountTextField.setText(Integer.toString(resultI)); - } - - } - - @Override - protected int getAmount() { - String out = this.amountTextField.getText(); - - double resultD = Calculator.conversion(out); - - if (Double.isNaN(resultD)) { - return DEFAULT_VALUE; - } else { - return (int) ArithHelper.round(resultD, 0); - } - } - - @Override - protected void addAmount(int i) { - this.amountTextField.setText(Long.toString(i + getAmount())); - this.amountTextField.setCursorPositionEnd(); - } - - @Override - protected String getBackground() { - return "guis/patternMulti.png"; - } - - @Override - protected void setOriginGUI(Object target) { - if (target instanceof PartFluidPatternTerminal) { - this.myIcon = ItemAndBlockHolder.FLUID_TERMINAL.stack(); - this.originalGui = GuiType.FLUID_PATTERN_TERMINAL; - } else if (target instanceof PartFluidPatternTerminalEx) { - this.myIcon = ItemAndBlockHolder.FLUID_TERMINAL_EX.stack(); - this.originalGui = GuiType.FLUID_PATTERN_TERMINAL_EX; - } else if (target instanceof PartFluidTerminal) { - this.myIcon = ItemAndBlockHolder.FLUID_TERM.stack(); - this.originalGui = GuiType.FLUID_TERMINAL; - } else if (target instanceof PartLevelTerminal) { - myIcon = ItemAndBlockHolder.LEVEL_TERMINAL.stack(); - originalGui = GuiType.LEVEL_TERMINAL; - } else if (target instanceof IWirelessTerminal terminal && terminal.isUniversal(target)) { - this.myIcon = ItemAndBlockHolder.WIRELESS_ULTRA_TERM.stack(); - this.originalGui = ItemWirelessUltraTerminal.readMode(terminal.getItemStack()); - } else if (target instanceof WirelessPatternTerminalInventory) { - this.myIcon = ItemAndBlockHolder.WIRELESS_PATTERN_TERM.stack(); - this.originalGui = GuiType.FLUID_TERMINAL; - } else if (target instanceof WirelessLevelTerminalInventory) { - myIcon = ItemAndBlockHolder.LEVEL_TERMINAL.stack(); - originalGui = GuiType.WIRELESS_LEVEL_TERMINAL; - } - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java b/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java deleted file mode 100644 index b73d099d..00000000 --- a/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.glodblock.github.client.gui; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.client.gui.base.FCGuiAmount; -import com.glodblock.github.client.gui.container.ContainerPatternValueAmount; -import com.glodblock.github.common.item.ItemWirelessUltraTerminal; -import com.glodblock.github.common.parts.PartFluidPatternTerminal; -import com.glodblock.github.common.parts.PartFluidPatternTerminalEx; -import com.glodblock.github.common.tile.TileSuperStockReplenisher; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.IWirelessTerminal; -import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory; -import com.glodblock.github.loader.ItemAndBlockHolder; -import com.glodblock.github.network.CPacketPatternValueSet; - -import appeng.core.localization.GuiText; - -public class GuiPatternValueAmount extends FCGuiAmount { - - public GuiPatternValueAmount(final InventoryPlayer inventoryPlayer, final Object te) { - super(new ContainerPatternValueAmount(inventoryPlayer, te)); - } - - @Override - public void initGui() { - super.initGui(); - this.submit.displayString = GuiText.Set.getLocal(); - } - - @Override - public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - this.fontRendererObj.drawString(GuiText.SelectAmount.getLocal(), 8, 6, 0x404040); - } - - @Override - public void drawBG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - super.drawBG(offsetX, offsetY, mouseX, mouseY); - try { - int result = getAmount(); - this.submit.enabled = result > 0; - } catch (final NumberFormatException e) { - this.submit.enabled = false; - } - this.amountBox.drawTextBox(); - } - - @Override - protected void actionPerformed(final GuiButton btn) { - super.actionPerformed(btn); - try { - if (btn == this.submit && btn.enabled) { - FluidCraft.proxy.netHandler.sendToServer( - new CPacketPatternValueSet( - originalGui.ordinal(), - getAmount(), - ((ContainerPatternValueAmount) this.inventorySlots).getValueIndex())); - } - } catch (final NumberFormatException e) { - this.amountBox.setText("1"); - } - } - - @Override - protected void setOriginGUI(Object target) { - if (target instanceof PartFluidPatternTerminal) { - this.myIcon = ItemAndBlockHolder.FLUID_TERMINAL.stack(); - this.originalGui = GuiType.FLUID_PATTERN_TERMINAL; - } else if (target instanceof PartFluidPatternTerminalEx) { - this.myIcon = ItemAndBlockHolder.FLUID_TERMINAL_EX.stack(); - this.originalGui = GuiType.FLUID_PATTERN_TERMINAL_EX; - } else if (target instanceof IWirelessTerminal terminal && terminal.isUniversal(target)) { - this.myIcon = ItemAndBlockHolder.WIRELESS_ULTRA_TERM.stack(); - this.originalGui = ItemWirelessUltraTerminal.readMode(terminal.getItemStack()); - } else if (target instanceof WirelessPatternTerminalInventory) { - this.myIcon = ItemAndBlockHolder.WIRELESS_PATTERN_TERM.stack(); - this.originalGui = GuiType.WIRELESS_FLUID_PATTERN_TERMINAL; - } else if (target instanceof TileSuperStockReplenisher) { - this.myIcon = ItemAndBlockHolder.SUPER_STOCK_RERPLENISHER.stack(); - this.originalGui = GuiType.GUI_SUPER_STOCK_REPLENISHER; - } - } - - @Override - protected String getBackground() { - return "guis/craftAmt.png"; - } - - public void setAmount(int amount) { - this.amountBox.setText(String.valueOf(amount)); - this.amountBox.setSelectionPos(0); - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/GuiRenamer.java b/src/main/java/com/glodblock/github/client/gui/GuiRenamer.java deleted file mode 100644 index a12af8d2..00000000 --- a/src/main/java/com/glodblock/github/client/gui/GuiRenamer.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.glodblock.github.client.gui; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; - -import org.lwjgl.input.Keyboard; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.client.gui.container.ContainerRenamer; -import com.glodblock.github.common.item.ItemWirelessUltraTerminal; -import com.glodblock.github.common.parts.PartLevelTerminal; -import com.glodblock.github.inventory.InventoryHandler; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.IWirelessTerminal; -import com.glodblock.github.inventory.item.WirelessInterfaceTerminalInventory; -import com.glodblock.github.inventory.item.WirelessLevelTerminalInventory; -import com.glodblock.github.loader.ItemAndBlockHolder; -import com.glodblock.github.network.CPacketRenamer; - -import appeng.api.storage.ITerminalHost; -import appeng.client.gui.AEBaseGui; -import appeng.client.gui.widgets.GuiTabButton; -import appeng.client.gui.widgets.IDropToFillTextField; -import appeng.client.gui.widgets.MEGuiTextField; -import appeng.core.localization.GuiColors; -import appeng.core.localization.GuiText; - -public class GuiRenamer extends AEBaseGui implements IDropToFillTextField { - - protected final MEGuiTextField textField; - - protected final ITerminalHost host; - protected GuiTabButton originalGuiBtn; - - protected ItemStack icon = null; - - protected GuiType originalGui; - - public GuiRenamer(InventoryPlayer ip, ITerminalHost monitorable) { - super(new ContainerRenamer(ip, monitorable)); - this.host = monitorable; - this.xSize = 256; - - this.textField = new MEGuiTextField(230, 12); - this.textField.setMaxStringLength(32); - } - - @Override - public void initGui() { - super.initGui(); - FluidCraft.proxy.netHandler.sendToServer(new CPacketRenamer(CPacketRenamer.Action.GET_TEXT)); - if (host instanceof PartLevelTerminal) { - icon = ItemAndBlockHolder.LEVEL_TERMINAL.stack(); - originalGui = GuiType.LEVEL_TERMINAL; - } else if (host instanceof IWirelessTerminal terminal && terminal.isUniversal(host)) { - icon = ItemAndBlockHolder.WIRELESS_ULTRA_TERM.stack(); - originalGui = ItemWirelessUltraTerminal.readMode(terminal.getItemStack()); - } else if (host instanceof WirelessLevelTerminalInventory) { - icon = ItemAndBlockHolder.WIRELESS_LEVEL_TERM.stack(); - originalGui = GuiType.WIRELESS_LEVEL_TERMINAL; - } else if (host instanceof WirelessInterfaceTerminalInventory) { - icon = ItemAndBlockHolder.WIRELESS_INTERFACE_TERM.stack(); - originalGui = GuiType.WIRELESS_INTERFACE_TERMINAL; - } - if (this.icon != null) { - this.buttonList.add( - this.originalGuiBtn = new GuiTabButton( - this.guiLeft + 231, - this.guiTop - 4, - this.icon, - this.icon.getDisplayName(), - itemRender)); - this.originalGuiBtn.setHideEdge(13); - } - this.textField.x = this.guiLeft + 12; - this.textField.y = this.guiTop + 35; - this.textField.setFocused(true); - } - - @Override - public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) { - this.fontRendererObj.drawString(GuiText.Renamer.getLocal(), 12, 8, GuiColors.RenamerTitle.getColor()); - } - - @Override - public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY) { - this.bindTexture("guis/renamer.png"); - this.drawTexturedModalRect(offsetX, offsetY, 0, 0, this.xSize, this.ySize); - this.textField.drawTextBox(); - } - - @Override - protected void mouseClicked(final int xCoord, final int yCoord, final int btn) { - this.textField.mouseClicked(xCoord, yCoord, btn); - super.mouseClicked(xCoord, yCoord, btn); - } - - @Override - protected void keyTyped(final char character, final int key) { - if (key == Keyboard.KEY_RETURN || key == Keyboard.KEY_NUMPADENTER) { - FluidCraft.proxy.netHandler.sendToServer(new CPacketRenamer(this.textField.getText())); - } else if (!this.textField.textboxKeyTyped(character, key)) { - super.keyTyped(character, key); - } - } - - public boolean isOverTextField(final int mousex, final int mousey) { - return textField.isMouseIn(mousex, mousey); - } - - @Override - protected void actionPerformed(GuiButton button) { - if (button == originalGuiBtn) { - switchGui(); - } else { - super.actionPerformed(button); - } - } - - public void switchGui() { - if (originalGui != null) { - InventoryHandler.switchGui(originalGui); - } - } - - public void setTextFieldValue(final String displayName, final int mousex, final int mousey, final ItemStack stack) { - textField.setText(displayName); - } - - public void postUpdate(String text) { - this.textField.setText(text); - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/GuiSuperStockReplenisher.java b/src/main/java/com/glodblock/github/client/gui/GuiSuperStockReplenisher.java index b9cd2607..a1a851ab 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiSuperStockReplenisher.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiSuperStockReplenisher.java @@ -14,7 +14,6 @@ import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.container.ContainerSuperStockReplenisher; import com.glodblock.github.common.item.ItemFluidPacket; import com.glodblock.github.common.tile.TileSuperStockReplenisher; -import com.glodblock.github.network.CPacketInventoryAction; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEStack; @@ -46,7 +45,8 @@ public class GuiSuperStockReplenisher extends AEBaseGui { ((AEBaseContainer) this.inventorySlots).setTargetStack(stack); for (int i = 0; i < this.inventorySlots.inventorySlots.size(); i++) { if (slot.equals(this.inventorySlots.inventorySlots.get(i))) { - FluidCraft.proxy.netHandler.sendToServer(new CPacketInventoryAction(action, i, 0, stack)); + // FluidCraft.proxy.netHandler.sendToServer(new CPacketInventoryAction(action, i, 0, + // stack)); } } return; diff --git a/src/main/java/com/glodblock/github/client/gui/base/FCBaseMEGui.java b/src/main/java/com/glodblock/github/client/gui/base/FCBaseMEGui.java index b5dcdd67..7cc7aae7 100644 --- a/src/main/java/com/glodblock/github/client/gui/base/FCBaseMEGui.java +++ b/src/main/java/com/glodblock/github/client/gui/base/FCBaseMEGui.java @@ -8,12 +8,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import com.glodblock.github.FluidCraft; -import com.glodblock.github.client.gui.GuiEssentiaTerminal; import com.glodblock.github.client.gui.GuiFCImgButton; -import com.glodblock.github.client.gui.GuiFluidCraftingWireless; -import com.glodblock.github.client.gui.GuiFluidPatternExWireless; -import com.glodblock.github.client.gui.GuiFluidPatternWireless; -import com.glodblock.github.client.gui.GuiFluidPortableCell; import com.glodblock.github.client.gui.GuiLevelWireless; import com.glodblock.github.client.gui.container.base.FCBaseContainer; import com.glodblock.github.common.item.ItemWirelessUltraTerminal; @@ -21,10 +16,10 @@ import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.inventory.item.IWirelessTerminal; import com.glodblock.github.inventory.item.WirelessMagnet; import com.glodblock.github.network.CPacketFluidPatternTermBtns; -import com.glodblock.github.util.ModAndClassUtil; import appeng.api.storage.StorageChannel; import appeng.client.gui.AEBaseMEGui; +import appeng.core.sync.GuiBridge; public abstract class FCBaseMEGui extends AEBaseMEGui { @@ -125,42 +120,6 @@ public abstract class FCBaseMEGui extends AEBaseMEGui { "RESTOCK", "DISABLE")); } - if (!(this instanceof GuiFluidCraftingWireless)) { - this.buttonList.add( - this.CraftingTerminal = new GuiFCImgButton( - this.guiLeft - 18, - this.getOffsetY(), - "CRAFT_TEM", - "YES")); - this.setOffsetY(this.getOffsetY() + 20); - termBtns.add(this.CraftingTerminal); - } - if (!(this instanceof GuiFluidPatternWireless)) { - this.buttonList.add( - this.PatternTerminal = new GuiFCImgButton( - this.guiLeft - 18, - this.getOffsetY(), - "PATTERN_TEM", - "YES")); - this.setOffsetY(this.getOffsetY() + 20); - termBtns.add(this.PatternTerminal); - } - if (!(this instanceof GuiFluidPatternExWireless)) { - this.buttonList.add( - this.PatternTerminalEx = new GuiFCImgButton( - this.guiLeft - 18, - this.getOffsetY(), - "PATTERN_EX_TEM", - "YES")); - this.setOffsetY(this.getOffsetY() + 20); - termBtns.add(this.PatternTerminalEx); - } - if (!(this instanceof GuiFluidPortableCell)) { - this.buttonList.add( - this.FluidTerminal = new GuiFCImgButton(this.guiLeft - 18, this.getOffsetY(), "FLUID_TEM", "YES")); - this.setOffsetY(this.getOffsetY() + 20); - termBtns.add(this.FluidTerminal); - } this.buttonList.add( this.InterfaceTerminal = new GuiFCImgButton( this.guiLeft - 18, @@ -175,16 +134,6 @@ public abstract class FCBaseMEGui extends AEBaseMEGui { this.setOffsetY(this.getOffsetY() + 20); termBtns.add(this.LevelTerminal); } - if (ModAndClassUtil.ThE && !(this instanceof GuiEssentiaTerminal)) { - this.buttonList.add( - this.EssentiaTerminal = new GuiFCImgButton( - this.guiLeft - 18, - this.getOffsetY(), - "ESSENTIA_TEM", - "YES")); - this.setOffsetY(this.getOffsetY() + 20); - termBtns.add(this.EssentiaTerminal); - } } protected void addSwitchGuiBtns() { @@ -232,20 +181,14 @@ public abstract class FCBaseMEGui extends AEBaseMEGui { @Override protected void actionPerformed(final GuiButton btn) { if (btn instanceof GuiFCImgButton) { - if (btn == this.FluidTerminal) { - ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_FLUID_TERMINAL); - } else if (btn == this.CraftingTerminal) { - ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_CRAFTING_TERMINAL); - } else if (btn == this.EssentiaTerminal) { - ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_ESSENTIA_TERMINAL); + if (btn == this.CraftingTerminal) { + ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiBridge.GUI_CRAFTING_TERMINAL); } else if (btn == this.PatternTerminal) { - ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_FLUID_PATTERN_TERMINAL); + ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiBridge.GUI_PATTERN_TERMINAL); } else if (btn == this.InterfaceTerminal) { - ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_INTERFACE_TERMINAL); + ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiBridge.GUI_INTERFACE_TERMINAL); } else if (btn == this.LevelTerminal) { ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_LEVEL_TERMINAL); - } else if (btn == this.PatternTerminalEx) { - ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_FLUID_PATTERN_TERMINAL_EX); } else if (btn == this.magnetOff || btn == this.magnetME || btn == this.magnetInv) { FluidCraft.proxy.netHandler.sendToServer( new CPacketFluidPatternTermBtns("WirelessTerminal.MagnetMode", this.getMagnetMode().ordinal())); diff --git a/src/main/java/com/glodblock/github/client/gui/base/FCGuiEncodeTerminal.java b/src/main/java/com/glodblock/github/client/gui/base/FCGuiEncodeTerminal.java deleted file mode 100644 index f6d294eb..00000000 --- a/src/main/java/com/glodblock/github/client/gui/base/FCGuiEncodeTerminal.java +++ /dev/null @@ -1,199 +0,0 @@ -package com.glodblock.github.client.gui.base; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; - -import org.lwjgl.input.Keyboard; -import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.client.gui.GuiFCImgButton; -import com.glodblock.github.client.gui.GuiItemMonitor; -import com.glodblock.github.client.gui.container.base.FCContainerEncodeTerminal; -import com.glodblock.github.common.item.ItemFluidPacket; -import com.glodblock.github.inventory.InventoryHandler; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.slot.SlotSingleItem; -import com.glodblock.github.network.CPacketFluidPatternTermBtns; -import com.glodblock.github.util.ModAndClassUtil; - -import appeng.api.storage.ITerminalHost; -import appeng.api.storage.data.IAEItemStack; -import appeng.client.gui.widgets.GuiImgButton; -import appeng.client.gui.widgets.GuiScrollbar; -import appeng.client.gui.widgets.GuiTabButton; -import appeng.container.slot.AppEngSlot; -import appeng.container.slot.SlotFake; -import appeng.util.item.AEItemStack; - -public abstract class FCGuiEncodeTerminal extends GuiItemMonitor { - - private static final String SUBSTITUTION_DISABLE = "0"; - private static final String SUBSTITUTION_ENABLE = "1"; - private static final String PRIORITY_DISABLE = "0"; - private static final String PRIORITY_ENABLE = "1"; - private static final String MODE_CRAFTING = "1"; - private static final String MODE_PROCESSING = "0"; - public FCContainerEncodeTerminal container; - protected GuiTabButton tabCraftButton; - protected GuiTabButton tabProcessButton; - protected GuiImgButton substitutionsEnabledBtn; - protected GuiImgButton substitutionsDisabledBtn; - protected GuiFCImgButton fluidPrioritizedEnabledBtn; - protected GuiFCImgButton fluidPrioritizedDisabledBtn; - protected GuiImgButton encodeBtn; - protected GuiImgButton invertBtn; - protected GuiImgButton clearBtn; - protected GuiImgButton doubleBtn; - protected GuiImgButton beSubstitutionsEnabledBtn; - protected GuiImgButton beSubstitutionsDisabledBtn; - protected GuiFCImgButton combineEnableBtn; - protected GuiFCImgButton combineDisableBtn; - protected GuiFCImgButton autoFillPatternEnableBtn; - protected GuiFCImgButton autoFillPatternDisableBtn; - protected final GuiScrollbar processingScrollBar = new GuiScrollbar(); - - public FCGuiEncodeTerminal(final InventoryPlayer inventoryPlayer, final ITerminalHost te, - final FCContainerEncodeTerminal c) { - super(inventoryPlayer, te, c); - this.container = (FCContainerEncodeTerminal) this.inventorySlots; - c.setGui(this); - setReservedSpace(81); - } - - @Override - public void initGui() { - super.initGui(); - this.buttonList.add( - this.autoFillPatternEnableBtn = new GuiFCImgButton( - this.guiLeft - 18, - this.offsetY, - "FILL_PATTERN", - "DO_FILL")); - this.buttonList.add( - this.autoFillPatternDisableBtn = new GuiFCImgButton( - this.guiLeft - 18, - this.offsetY, - "NOT_FILL_PATTERN", - "DONT_FILL")); - this.offsetY += 20; - } - - @Override - protected void actionPerformed(final GuiButton btn) { - super.actionPerformed(btn); - if (btn == craftingStatusBtn) { - InventoryHandler.switchGui(GuiType.CRAFTING_STATUS); - } else if (this.tabCraftButton == btn || this.tabProcessButton == btn) { - FluidCraft.proxy.netHandler.sendToServer( - new CPacketFluidPatternTermBtns( - "PatternTerminal.CraftMode", - this.tabProcessButton == btn ? MODE_CRAFTING : MODE_PROCESSING)); - } else if (this.encodeBtn == btn) { - FluidCraft.proxy.netHandler.sendToServer( - new CPacketFluidPatternTermBtns( - "PatternTerminal.Encode", - (isCtrlKeyDown() ? 1 : 0) << 1 | (isShiftKeyDown() ? 1 : 0))); - } else if (this.clearBtn == btn) { - FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidPatternTermBtns("PatternTerminal.Clear", "1")); - } else if (this.substitutionsEnabledBtn == btn || this.substitutionsDisabledBtn == btn) { - FluidCraft.proxy.netHandler.sendToServer( - new CPacketFluidPatternTermBtns( - "PatternTerminal.Substitute", - this.substitutionsEnabledBtn == btn ? SUBSTITUTION_DISABLE : SUBSTITUTION_ENABLE)); - } else if (this.fluidPrioritizedEnabledBtn == btn || this.fluidPrioritizedDisabledBtn == btn) { - FluidCraft.proxy.netHandler.sendToServer( - new CPacketFluidPatternTermBtns( - "PatternTerminal.Prioritize", - isShiftKeyDown() ? "2" : (container.prioritize ? PRIORITY_DISABLE : PRIORITY_ENABLE))); - } else if (this.invertBtn == btn) { - FluidCraft.proxy.netHandler.sendToServer( - new CPacketFluidPatternTermBtns("PatternTerminal.Invert", container.inverted ? "0" : "1")); - } else if (this.combineDisableBtn == btn || this.combineEnableBtn == btn) { - FluidCraft.proxy.netHandler.sendToServer( - new CPacketFluidPatternTermBtns( - "PatternTerminal.Combine", - this.combineDisableBtn == btn ? "1" : "0")); - } else if (ModAndClassUtil.isDoubleButton && doubleBtn == btn) { - int val = Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) ? 1 : 0; - if (Mouse.isButtonDown(1)) val |= 0b10; - FluidCraft.proxy.netHandler - .sendToServer(new CPacketFluidPatternTermBtns("PatternTerminal.Double", String.valueOf(val))); - } else if (ModAndClassUtil.isBeSubstitutionsButton && beSubstitutionsDisabledBtn == btn) { - FluidCraft.proxy.netHandler - .sendToServer(new CPacketFluidPatternTermBtns("PatternTerminal.beSubstitute", "1")); - } else if (ModAndClassUtil.isBeSubstitutionsButton && beSubstitutionsEnabledBtn == btn) { - FluidCraft.proxy.netHandler - .sendToServer(new CPacketFluidPatternTermBtns("PatternTerminal.beSubstitute", "0")); - } else if (this.autoFillPatternDisableBtn == btn || this.autoFillPatternEnableBtn == btn) { - FluidCraft.proxy.netHandler.sendToServer( - new CPacketFluidPatternTermBtns( - "PatternTerminal.AutoFillerPattern", - this.autoFillPatternDisableBtn == btn ? "1" : "0")); - } - } - - @Override - public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - updateButton(this.tabCraftButton, this.container.isCraftingMode()); - updateButton(this.tabProcessButton, !this.container.isCraftingMode()); - updateButton(this.doubleBtn, !this.container.isCraftingMode()); - updateButton(this.substitutionsEnabledBtn, this.container.substitute); - updateButton(this.substitutionsDisabledBtn, !this.container.substitute); - updateButton(this.combineEnableBtn, !this.container.isCraftingMode() && this.container.combine); - updateButton(this.combineDisableBtn, !this.container.isCraftingMode() && !this.container.combine); - updateButton(this.beSubstitutionsEnabledBtn, this.container.beSubstitute); - updateButton(this.beSubstitutionsDisabledBtn, !this.container.beSubstitute); - updateButton(this.fluidPrioritizedEnabledBtn, this.container.prioritize); - updateButton(this.fluidPrioritizedDisabledBtn, !this.container.prioritize); - updateButton(this.autoFillPatternEnableBtn, this.container.autoFillPattern); - updateButton(this.autoFillPatternDisableBtn, !this.container.autoFillPattern); - super.drawFG(offsetX, offsetY, mouseX, mouseY); - } - - protected void updateButton(GuiButton button, boolean vis) { - if (button != null) { - button.visible = vis; - } - } - - @Override - protected void repositionSlot(final AppEngSlot s) { - if (s.isPlayerSide()) { - s.yDisplayPosition = s.getY() + this.ySize - 78 - 5; - } else { - s.yDisplayPosition = s.getY() + this.ySize - 78 - 3; - } - } - - @Override - public void func_146977_a(final Slot s) { - if (drawSlot0(s)) super.func_146977_a(s); - } - - public boolean drawSlot0(Slot slot) { - if (slot instanceof SlotFake && !this.container.isCraftingMode()) { - AEItemStack stack = AEItemStack.create(slot.getStack()); - super.func_146977_a(new SlotSingleItem(slot)); - if (stack == null) return true; - IAEItemStack fake = stack.copy(); - if (fake.getItemStack().getItem() instanceof ItemFluidPacket) { - if (ItemFluidPacket.getFluidStack(stack) != null && ItemFluidPacket.getFluidStack(stack).amount > 0) - fake.setStackSize(ItemFluidPacket.getFluidStack(stack).amount); - } else return true; - aeRenderItem.setAeStack(fake); - GL11.glTranslatef(0.0f, 0.0f, 200.0f); - aeRenderItem.renderItemOverlayIntoGUI( - fontRendererObj, - mc.getTextureManager(), - stack.getItemStack(), - slot.xDisplayPosition, - slot.yDisplayPosition); - GL11.glTranslatef(0.0f, 0.0f, -200.0f); - return false; - } - return true; - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java b/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java deleted file mode 100644 index 2d706d6e..00000000 --- a/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java +++ /dev/null @@ -1,914 +0,0 @@ -package com.glodblock.github.client.gui.base; - -import java.io.IOException; -import java.lang.reflect.Field; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.input.Keyboard; -import org.lwjgl.input.Mouse; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.client.gui.GuiFluidMonitor; -import com.glodblock.github.client.gui.GuiItemMonitor; -import com.glodblock.github.client.gui.container.base.FCContainerMonitor; -import com.glodblock.github.inventory.InventoryHandler; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.network.CPacketInventoryAction; -import com.glodblock.github.util.Ae2ReflectClient; -import com.glodblock.github.util.ModAndClassUtil; - -import appeng.api.config.CraftingStatus; -import appeng.api.config.PinsState; -import appeng.api.config.SearchBoxFocusPriority; -import appeng.api.config.SearchBoxMode; -import appeng.api.config.Settings; -import appeng.api.config.TerminalStyle; -import appeng.api.config.YesNo; -import appeng.api.implementations.tiles.IViewCellStorage; -import appeng.api.storage.ITerminalHost; -import appeng.api.storage.ITerminalPins; -import appeng.api.storage.data.IAEItemStack; -import appeng.api.storage.data.IAEStack; -import appeng.api.storage.data.IDisplayRepo; -import appeng.api.util.IConfigManager; -import appeng.api.util.IConfigurableObject; -import appeng.client.gui.widgets.GuiImgButton; -import appeng.client.gui.widgets.GuiScrollbar; -import appeng.client.gui.widgets.GuiTabButton; -import appeng.client.gui.widgets.IDropToFillTextField; -import appeng.client.gui.widgets.ISortSource; -import appeng.client.gui.widgets.MEGuiTextField; -import appeng.client.me.InternalSlotME; -import appeng.client.me.ItemRepo; -import appeng.client.me.PinSlotME; -import appeng.client.me.SlotDisconnected; -import appeng.client.me.SlotME; -import appeng.container.AEBaseContainer; -import appeng.container.slot.AppEngSlot; -import appeng.container.slot.OptionalSlotFake; -import appeng.container.slot.SlotCraftingMatrix; -import appeng.container.slot.SlotCraftingTerm; -import appeng.container.slot.SlotDisabled; -import appeng.container.slot.SlotFake; -import appeng.container.slot.SlotFakeCraftingMatrix; -import appeng.container.slot.SlotPatternTerm; -import appeng.core.AEConfig; -import appeng.core.AELog; -import appeng.core.localization.ButtonToolTips; -import appeng.core.localization.GuiText; -import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketInventoryAction; -import appeng.core.sync.packets.PacketPinsUpdate; -import appeng.core.sync.packets.PacketValueConfig; -import appeng.helpers.IPinsHandler; -import appeng.helpers.InventoryAction; -import appeng.integration.IntegrationRegistry; -import appeng.integration.IntegrationType; -import appeng.util.IConfigManagerHost; -import appeng.util.Platform; -import appeng.util.item.AEItemStack; -import codechicken.nei.LayoutManager; -import codechicken.nei.util.TextHistory; - -// TODO why is this copy pasting all the UI code from AE2 instead of reusing it ??? -public abstract class FCGuiMonitor> extends FCBaseMEGui - implements ISortSource, IConfigManagerHost, IDropToFillTextField, IPinsHandler { - - public static int craftingGridOffsetX; - public static int craftingGridOffsetY; - protected static String memoryText = ""; - protected final int offsetX = 9; - protected final int lowerTextureOffset = 0; - public IConfigManager configSrc; - protected final boolean viewCell; - protected final ItemStack[] myCurrentViewCells = new ItemStack[5]; - public FCContainerMonitor monitorableContainer; - public GuiTabButton craftingStatusBtn; - protected IDisplayRepo repo; - protected GuiImgButton craftingStatusImgBtn; - protected MEGuiTextField searchField; - protected int perRow = 9; - protected int reservedSpace = 0; - protected boolean customSortOrder = true; - protected boolean showViewBtn = true; - protected int rows = 0; - protected int maxRows = Integer.MAX_VALUE; - protected int standardSize; - protected int offsetY; - protected GuiImgButton ViewBox; - protected GuiImgButton SortByBox; - protected GuiImgButton SortDirBox; - protected GuiImgButton searchBoxSettings; - protected GuiImgButton terminalStyleBox; - protected GuiImgButton searchStringSave; - protected GuiImgButton typeFilter; - protected GuiImgButton pinsStateButton; - protected boolean hasShiftKeyDown = false; - private PinsState pinsState; - public final boolean hasPinHost; - private boolean canBeAutoFocused; - private boolean isAutoFocused; - protected int currentMouseY; - protected int currentMouseX; - - @SuppressWarnings("unchecked") - public FCGuiMonitor(final InventoryPlayer inventoryPlayer, final ITerminalHost te, final FCContainerMonitor c) { - super(inventoryPlayer, c); - final GuiScrollbar scrollbar = new GuiScrollbar(); - this.setScrollBar(scrollbar); - this.xSize = 195; - this.ySize = 204; - this.standardSize = this.xSize; - this.configSrc = ((IConfigurableObject) this.inventorySlots).getConfigManager(); - (this.monitorableContainer = (FCContainerMonitor) this.inventorySlots).setGui(this); - this.viewCell = te instanceof IViewCellStorage; - pinsState = (PinsState) configSrc.getSetting(Settings.PINS_STATE); - hasPinHost = te instanceof ITerminalPins && !(this instanceof GuiFluidMonitor); - } - - public int getOffsetY() { - return offsetY; - } - - public void setOffsetY(int y) { - offsetY = y; - } - - public abstract void postUpdate(final List list, boolean resort); - - protected void setScrollBar() { - this.getScrollBar().setTop(18).setLeft(175).setHeight(this.rows * 18 - 2); - this.getScrollBar().setRange( - 0, - (this.repo.size() + pinsState.ordinal() * 9 + this.perRow - 1) / this.perRow - this.rows, - Math.max(1, this.rows / 6)); - } - - @Override - protected void actionPerformed(final GuiButton btn) { - memoryText = this.searchField.getText(); - if (btn == this.craftingStatusBtn || btn == this.craftingStatusImgBtn) { - InventoryHandler.switchGui(GuiType.CRAFTING_STATUS); - } - if (btn instanceof final GuiImgButton iBtn) { - final boolean backwards = Mouse.isButtonDown(1); - if (iBtn.getSetting() != Settings.ACTIONS) { - final Enum cv = iBtn.getCurrentValue(); - final Enum next = Platform.rotateEnum(cv, backwards, iBtn.getSetting().getPossibleValues()); - if (btn == this.terminalStyleBox) { - AEConfig.instance.settings.putSetting(iBtn.getSetting(), next); - } else if (btn == this.searchBoxSettings) { - AEConfig.instance.settings.putSetting(iBtn.getSetting(), next); - } else if (ModAndClassUtil.isSaveText && btn == this.searchStringSave) { - AEConfig.instance.preserveSearchBar = next == YesNo.YES; - } else if (btn == this.pinsStateButton) { - try { - if (next.ordinal() >= rows) return; // ignore to avoid hiding terminal inventory - - final PacketPinsUpdate p = new PacketPinsUpdate((PinsState) next); - NetworkHandler.instance.sendToServer(p); - } catch (final IOException e) { - AELog.debug(e); - } - } else { - try { - NetworkHandler.instance - .sendToServer(new PacketValueConfig(iBtn.getSetting().name(), next.name())); - } catch (final IOException e) { - AELog.debug(e); - } - } - iBtn.set(next); - if (next.getClass() == SearchBoxMode.class || next.getClass() == TerminalStyle.class) { - super.scheduleGuiResize(); - } - } - } - super.actionPerformed(btn); - } - - private void adjustPinsSize() { - final int pinMaxSize = rows - 1; - if (pinsState.ordinal() <= pinMaxSize) return; - - try { - PinsState newState = PinsState.fromOrdinal(pinMaxSize); - final PacketPinsUpdate p = new PacketPinsUpdate(newState); - NetworkHandler.instance.sendToServer(p); - } catch (final IOException e) { - AELog.debug(e); - } - } - - @Override - public void initGui() { - Keyboard.enableRepeatEvents(true); - - this.maxRows = this.getMaxRows(); - this.perRow = AEConfig.instance.getConfigManager().getSetting(Settings.TERMINAL_STYLE) != TerminalStyle.FULL ? 9 - : 9 + ((this.width - this.standardSize) / 18); - - final boolean hasNEI = IntegrationRegistry.INSTANCE.isEnabled(IntegrationType.NEI); - - final int NEI = hasNEI ? 1 : 0; - int top = hasNEI ? 22 : 0; - - final int magicNumber = 114 + 1; - final int extraSpace = this.height - magicNumber - NEI - top - this.reservedSpace; - - this.rows = (int) Math.floor(extraSpace / 18.0); - if (this.rows > this.maxRows) { - this.rows = this.maxRows; - } - - if (hasNEI) { - this.rows--; - } - - if (this.rows < 3) { - this.rows = 3; - } - - this.getMeSlots().clear(); - - // make sure we have space at least for one row of normal slots, because pins not adjusted by scroll bar - adjustPinsSize(); - - int pinsRows = pinsState.ordinal(); - for (int y = 0; y < pinsRows; y++) { - for (int x = 0; x < this.perRow; x++) { - this.getMeSlots() - .add(new PinSlotME(this.repo, x + y * this.perRow, this.offsetX + x * 18, y * 18 + 18)); - } - } - - for (int y = 0; y < this.rows - pinsRows; y++) { - for (int x = 0; x < this.perRow; x++) { - this.getMeSlots().add( - new InternalSlotME( - this.repo, - x + y * this.perRow, - this.offsetX + x * 18, - 18 + y * 18 + pinsRows * 18)); - } - } - - if (AEConfig.instance.getConfigManager().getSetting(Settings.TERMINAL_STYLE) != TerminalStyle.FULL) { - this.xSize = this.standardSize + ((this.perRow - 9) * 18); - } else { - this.xSize = this.standardSize; - } - - super.initGui(); - this.setScrollBar(); - // full size : 204 - // extra slots : 72 - // slot 18 - - this.ySize = magicNumber + this.rows * 18 + this.reservedSpace; - final int unusedSpace = this.height - this.ySize; - this.guiTop = (int) Math.floor(unusedSpace / (unusedSpace < 0 ? 3.8f : 2.0f)); - - this.offsetY = this.guiTop + 8; - - buttonList.clear(); - if (this.customSortOrder) { - this.buttonList.add( - this.SortByBox = new GuiImgButton( - this.guiLeft - 18, - this.offsetY, - Settings.SORT_BY, - this.configSrc.getSetting(Settings.SORT_BY))); - this.offsetY += 20; - } - if (this.showViewBtn) { - this.buttonList.add( - this.ViewBox = new GuiImgButton( - this.guiLeft - 18, - this.offsetY, - Settings.VIEW_MODE, - this.configSrc.getSetting(Settings.VIEW_MODE))); - this.offsetY += 20; - } - if (ModAndClassUtil.isTypeFilter && this instanceof GuiItemMonitor) { - this.buttonList.add( - this.typeFilter = new GuiImgButton( - this.guiLeft - 18, - this.offsetY, - Settings.TYPE_FILTER, - this.configSrc.getSetting(Settings.TYPE_FILTER))); - this.offsetY += 20; - } - - this.buttonList.add( - this.SortDirBox = new GuiImgButton( - this.guiLeft - 18, - this.offsetY, - Settings.SORT_DIRECTION, - this.configSrc.getSetting(Settings.SORT_DIRECTION))); - this.offsetY += 20; - - this.buttonList.add( - this.searchBoxSettings = new GuiImgButton( - this.guiLeft - 18, - this.offsetY, - Settings.SEARCH_MODE, - AEConfig.instance.settings.getSetting(Settings.SEARCH_MODE))); - this.offsetY += 20; - - if (ModAndClassUtil.isSaveText) { - this.buttonList.add( - this.searchStringSave = new GuiImgButton( - this.guiLeft - 18, - this.offsetY, - Settings.SAVE_SEARCH, - AEConfig.instance.preserveSearchBar ? YesNo.YES : YesNo.NO)); - this.offsetY += 20; - } - - this.buttonList.add( - this.terminalStyleBox = new GuiImgButton( - this.guiLeft - 18, - this.offsetY, - Settings.TERMINAL_STYLE, - AEConfig.instance.settings.getSetting(Settings.TERMINAL_STYLE))); - this.offsetY += 20; - - this.searchField = new MEGuiTextField(90, 12) { - - @Override - public void onTextChange(final String oldText) { - final String text = getText(); - repo.setSearchString(text); - repo.updateView(); - setScrollBar(); - } - }; - this.searchField.x = this.guiLeft + Math.max(80, this.offsetX); - this.searchField.y = this.guiTop + 4; - this.searchField.setMaxStringLength(25); - if (ModAndClassUtil.isSearchStringTooltip) - searchField.setMessage(ButtonToolTips.SearchStringTooltip.getLocal()); - - if (this.viewCell) { - if (ModAndClassUtil.isCraftStatus && AEConfig.instance.getConfigManager() - .getSetting(Settings.CRAFTING_STATUS).equals(CraftingStatus.BUTTON)) { - this.buttonList.add( - this.craftingStatusImgBtn = new GuiImgButton( - this.guiLeft - 18, - this.offsetY, - Settings.CRAFTING_STATUS, - AEConfig.instance.settings.getSetting(Settings.CRAFTING_STATUS))); - this.offsetY += 20; - } else { - this.buttonList.add( - this.craftingStatusBtn = new GuiTabButton( - this.guiLeft + 170, - this.guiTop - 4, - 2 + 11 * 16, - GuiText.CraftingStatus.getLocal(), - itemRender)); - this.craftingStatusBtn.setHideEdge(13); // GuiTabButton implementation // - } - } - - if (hasPinHost) { - this.buttonList.add( - this.pinsStateButton = new GuiImgButton( - this.guiLeft + 177, - this.guiTop + 18 + (rows * 18) + 26, - Settings.PINS_STATE, - configSrc.getSetting(Settings.PINS_STATE))); - } - - final Enum setting = AEConfig.instance.settings.getSetting(Settings.SEARCH_MODE); - this.canBeAutoFocused = SearchBoxMode.AUTOSEARCH == setting || SearchBoxMode.NEI_AUTOSEARCH == setting; - this.searchField.setFocused(this.canBeAutoFocused); - this.isAutoFocused = this.canBeAutoFocused; - - if (ModAndClassUtil.isSearchBar && (AEConfig.instance.preserveSearchBar || this.isSubGui())) { - setSearchString(memoryText, false); - } - if (this.isSubGui()) { - this.repo.updateView(); - this.setScrollBar(); - } - - craftingGridOffsetX = Integer.MAX_VALUE; - craftingGridOffsetY = Integer.MAX_VALUE; - - for (final Object s : this.inventorySlots.inventorySlots) { - if (s instanceof AppEngSlot) { - if (((Slot) s).xDisplayPosition < 195 || s instanceof SlotDisabled) { - this.repositionSlot((AppEngSlot) s); - } - } - - if (s instanceof SlotCraftingMatrix || s instanceof SlotFakeCraftingMatrix) { - final Slot g = (Slot) s; - if (g.xDisplayPosition > 0 && g.yDisplayPosition > 0) { - craftingGridOffsetX = Math.min(craftingGridOffsetX, g.xDisplayPosition); - craftingGridOffsetY = Math.min(craftingGridOffsetY, g.yDisplayPosition); - } - } - } - - craftingGridOffsetX -= 25; - craftingGridOffsetY -= 6; - initGuiDone(); - } - - public void setSearchString(String memoryText, boolean updateView) { - this.searchField.setText(memoryText); - this.searchField.setCursorPositionEnd(); - this.repo.setSearchString(memoryText); - if (updateView) { - this.repo.updateView(); - this.setScrollBar(); - } - } - - @Override - protected void mouseClicked(final int xCoord, final int yCoord, final int btn) { - this.searchField.mouseClicked(xCoord, yCoord, btn); - isAutoFocused = false; - super.mouseClicked(xCoord, yCoord, btn); - } - - @Override - public void handleMouseInput() { - final int wheel = Mouse.getEventDWheel(); - final int x = Mouse.getEventX() * this.width / this.mc.displayWidth; - final int y = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight; - - if (wheel != 0 && this.searchField.isMouseIn(x, y) && isCtrlKeyDown()) { - final Enum searchMode = AEConfig.instance.settings.getSetting(Settings.SEARCH_MODE); - if (searchMode == SearchBoxMode.NEI_MANUAL_SEARCH || searchMode == SearchBoxMode.NEI_AUTOSEARCH) { - try { - Field cls = LayoutManager.searchField.getClass().getDeclaredField("history"); - cls.setAccessible(true); - TextHistory history = ((TextHistory) cls.get("get")); - TextHistory.Direction direction; - if (wheel > 0) { - direction = TextHistory.Direction.PREVIOUS; - } else { - direction = TextHistory.Direction.NEXT; - } - history.get(direction, this.searchField.getText()).map(newText -> { - setSearchString(newText, true); - return true; - }).orElse(false); - return; - } catch (NoSuchFieldException | IllegalAccessException ignore) {} - } - } - super.handleMouseInput(); - } - - @Override - protected void handleMouseClick(final Slot slot, final int slotIdx, final int ctrlDown, final int mouseButton) { - final EntityPlayer player = Minecraft.getMinecraft().thePlayer; - if (mouseButton == 3) { - if (slot instanceof OptionalSlotFake || slot instanceof SlotFakeCraftingMatrix) { - if (slot.getHasStack()) { - InventoryAction action = InventoryAction.SET_PATTERN_VALUE; - if (isCtrlKeyDown()) { - action = InventoryAction.RENAME_PATTERN_ITEM; - } - IAEItemStack stack = AEItemStack.create(slot.getStack()); - ((AEBaseContainer) this.inventorySlots).setTargetStack(stack); - for (int i = 0; i < this.inventorySlots.inventorySlots.size(); i++) { - if (slot.equals(this.inventorySlots.inventorySlots.get(i))) { - FluidCraft.proxy.netHandler.sendToServer(new CPacketInventoryAction(action, i, 0, stack)); - } - } - return; - } - } - } - - if (slot instanceof SlotFake) { - InventoryAction action = ctrlDown == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE - : InventoryAction.PICKUP_OR_SET_DOWN; - if (Keyboard.isKeyDown(Keyboard.KEY_LMENU) || Keyboard.isKeyDown(Keyboard.KEY_RMENU)) { - if (action == InventoryAction.SPLIT_OR_PLACE_SINGLE) { - action = InventoryAction.MOVE_REGION; - } else { - action = InventoryAction.PICKUP_SINGLE; - } - } - if (this.drag_click.size() > 1) { - return; - } - final PacketInventoryAction p = new PacketInventoryAction(action, slotIdx, 0); - NetworkHandler.instance.sendToServer(p); - return; - } - - if (slot instanceof SlotPatternTerm) { - if (mouseButton == 6) { - return; // prevents weird double clicks - } - try { - NetworkHandler.instance.sendToServer(((SlotPatternTerm) slot).getRequest(isShiftKeyDown())); - } catch (final IOException e) { - AELog.debug(e); - } - } else if (slot instanceof SlotCraftingTerm) { - if (mouseButton == 6) { - return; // prevents weird double clicks - } - InventoryAction action; - if (isShiftKeyDown()) { - action = InventoryAction.CRAFT_SHIFT; - } else { - // Craft a stack on right-click, craft a single one on left-click - action = (mouseButton == 1) ? InventoryAction.CRAFT_STACK : InventoryAction.CRAFT_ITEM; - } - final PacketInventoryAction p = new PacketInventoryAction(action, slotIdx, 0); - NetworkHandler.instance.sendToServer(p); - return; - } - - if (Keyboard.isKeyDown(Keyboard.KEY_SPACE)) { - if (this.enableSpaceClicking() && !(slot instanceof SlotPatternTerm)) { - IAEItemStack stack = null; - if (slot instanceof SlotME) { - stack = ((SlotME) slot).getAEStack(); - } - int slotNum = Ae2ReflectClient.getInventorySlots(this).size(); - if (!(slot instanceof SlotME) && slot != null) { - slotNum = slot.slotNumber; - } - ((AEBaseContainer) this.inventorySlots).setTargetStack(stack); - final PacketInventoryAction p = new PacketInventoryAction(InventoryAction.MOVE_REGION, slotNum, 0); - NetworkHandler.instance.sendToServer(p); - return; - } - } - - if (slot instanceof SlotDisconnected) { - if (this.drag_click.size() > 1) { - return; - } - InventoryAction action = null; - switch (mouseButton) { - case 0: // pickup / set-down. - { - ItemStack heldStack = player.inventory.getItemStack(); - if (slot.getStack() == null && heldStack != null) action = InventoryAction.SPLIT_OR_PLACE_SINGLE; - else if (slot.getStack() != null && (heldStack == null || heldStack.stackSize <= 1)) - action = InventoryAction.PICKUP_OR_SET_DOWN; - } - break; - case 1: - action = ctrlDown == 1 ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK; - break; - case 3: // creative dupe: - if (player.capabilities.isCreativeMode) { - action = InventoryAction.CREATIVE_DUPLICATE; - } - break; - default: - case 4: // drop item: - case 6: - } - if (action != null) { - final PacketInventoryAction p = new PacketInventoryAction( - action, - slot.getSlotIndex(), - ((SlotDisconnected) slot).getSlot().getId()); - NetworkHandler.instance.sendToServer(p); - } - return; - } - - if (slot instanceof SlotME sme) { - InventoryAction action = null; - IAEItemStack stack = null; - switch (mouseButton) { - case 0: // pickup / set-down. - action = ctrlDown == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN; - if (sme.isPin() && player.inventory.getItemStack() != null) { - final PacketInventoryAction p = new PacketInventoryAction( - InventoryAction.SET_PIN, - sme.getPinIndex(), - 0); - NetworkHandler.instance.sendToServer(p); - return; - } - - stack = sme.getAEStack(); - if (stack != null && action == InventoryAction.PICKUP_OR_SET_DOWN - && stack.getStackSize() == 0 - && player.inventory.getItemStack() == null) { - action = InventoryAction.AUTO_CRAFT; - } - break; - case 1: - if (sme.isPin() && ctrlDown == 1) { // clear pin - final PacketInventoryAction p = new PacketInventoryAction( - InventoryAction.SET_PIN, - sme.getPinIndex(), - -1); - NetworkHandler.instance.sendToServer(p); - return; - } - - action = ctrlDown == 1 ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK; - stack = ((SlotME) slot).getAEStack(); - break; - case 3: // creative dupe: - stack = ((SlotME) slot).getAEStack(); - stack = transformItem(stack); // for fluid terminal - if (stack != null && stack.isCraftable()) { - action = InventoryAction.AUTO_CRAFT; - } else if (player.capabilities.isCreativeMode) { - final IAEItemStack slotItem = ((SlotME) slot).getAEStack(); - if (slotItem != null) { - action = InventoryAction.CREATIVE_DUPLICATE; - } - } - break; - default: - case 4: // drop item: - case 6: - } - if (action == InventoryAction.AUTO_CRAFT) { - ((AEBaseContainer) this.inventorySlots).setTargetStack(stack); - FluidCraft.proxy.netHandler.sendToServer( - new CPacketInventoryAction(action, Ae2ReflectClient.getInventorySlots(this).size(), 0, stack)); - } else if (action != null) { - ((AEBaseContainer) this.inventorySlots).setTargetStack(stack); - final PacketInventoryAction p = new PacketInventoryAction( - action, - Ae2ReflectClient.getInventorySlots(this).size(), - 0); - NetworkHandler.instance.sendToServer(p); - } - - return; - } - - super.handleMouseClick(slot, slotIdx, ctrlDown, mouseButton); - } - - protected IAEItemStack transformItem(IAEItemStack stack) { - return stack; - } - - @Override - public void onGuiClosed() { - super.onGuiClosed(); - Keyboard.enableRepeatEvents(false); - memoryText = this.searchField.getText(); - } - - @Override - public void handleKeyboardInput() { - super.handleKeyboardInput(); - - // Pause the terminal when holding shift - this.repo.setPaused(hasShiftDown()); - } - - private boolean hasShiftDown() { - return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT); - } - - public void bindTextureBack(final String file) { - final ResourceLocation loc = new ResourceLocation(FluidCraft.MODID, "textures/" + file); - this.mc.getTextureManager().bindTexture(loc); - } - - @Override - public void drawBG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - this.bindTextureBack(this.getBackground()); - final int x_width = 195; - this.drawTexturedModalRect(offsetX, offsetY, 0, 0, x_width, 18); - if (this.viewCell) { - this.drawTexturedModalRect(offsetX + x_width, offsetY, x_width, 0, 46, 128); - } - for (int x = 0; x < this.rows; x++) { - this.drawTexturedModalRect(offsetX, offsetY + 18 + x * 18, 0, 18, x_width, 18); - } - this.drawTexturedModalRect( - offsetX, - offsetY + 16 + this.rows * 18 + this.lowerTextureOffset, - 0, - 106 - 18 - 18, - x_width, - 99 + this.reservedSpace - this.lowerTextureOffset); - if (this.viewCell) { - boolean update = false; - for (int i = 0; i < 5; i++) { - if (this.myCurrentViewCells[i] != this.monitorableContainer.getCellViewSlot(i).getStack()) { - update = true; - this.myCurrentViewCells[i] = this.monitorableContainer.getCellViewSlot(i).getStack(); - } - } - if (update) { - this.repo.setViewCell(this.myCurrentViewCells); - } - } - if (this.searchField != null) { - this.searchField.drawTextBox(); - } - - this.currentMouseX = mouseX; - this.currentMouseY = mouseY; - } - - protected String getBackground() { - return "gui/terminal.png"; - } - - @Override - protected boolean isPowered() { - return this.repo.hasPower(); - } - - protected int getMaxRows() { - return AEConfig.instance.getConfigManager().getSetting(Settings.TERMINAL_STYLE) == TerminalStyle.SMALL ? 6 - : Integer.MAX_VALUE; - } - - protected void repositionSlot(final AppEngSlot s) { - s.yDisplayPosition = s.getY() + this.ySize - 78 - 5; - } - - @Override - protected void keyTyped(final char character, final int key) { - if (character == ' ' && this.searchField.getText().isEmpty()) { - return; - } - - boolean skipHotbarCheck = searchField.isFocused() - && (AEConfig.instance.searchBoxFocusPriority == SearchBoxFocusPriority.ALWAYS - || (AEConfig.instance.searchBoxFocusPriority == SearchBoxFocusPriority.NO_AUTOSEARCH - && !isAutoFocused)); - - if (!skipHotbarCheck && checkHotbarKeys(key)) { - return; - } - - final boolean mouseInGui = this - .isPointInRegion(0, 0, this.xSize, this.ySize, this.currentMouseX, this.currentMouseY); - - if (this.canBeAutoFocused && !searchField.isFocused() && mouseInGui) { - searchField.setFocused(true); - isAutoFocused = true; - } - - if (!searchField.textboxKeyTyped(character, key)) { - super.keyTyped(character, key); - } - } - - @Override - public void updateScreen() { - this.repo.setPowered(this.monitorableContainer.isPowered()); - super.updateScreen(); - } - - @Override - public Enum getSortBy() { - return this.configSrc.getSetting(Settings.SORT_BY); - } - - @Override - public Enum getSortDir() { - return this.configSrc.getSetting(Settings.SORT_DIRECTION); - } - - @Override - public Enum getSortDisplay() { - return this.configSrc.getSetting(Settings.VIEW_MODE); - } - - @Override - public Enum getTypeFilter() { - return this.configSrc.getSetting(Settings.TYPE_FILTER); - } - - @Override - public void updateSetting(final IConfigManager manager, @SuppressWarnings("rawtypes") final Enum settingName, - @SuppressWarnings("rawtypes") final Enum newValue) { - if (this.SortByBox != null) { - this.SortByBox.set(this.configSrc.getSetting(Settings.SORT_BY)); - } - - if (this.SortDirBox != null) { - this.SortDirBox.set(this.configSrc.getSetting(Settings.SORT_DIRECTION)); - } - - if (this.ViewBox != null) { - this.ViewBox.set(this.configSrc.getSetting(Settings.VIEW_MODE)); - } - if (this.typeFilter != null) { - this.typeFilter.set(this.configSrc.getSetting(Settings.TYPE_FILTER)); - } - - if (this.pinsStateButton != null) { - pinsState = (PinsState) this.configSrc.getSetting(Settings.PINS_STATE); - this.pinsStateButton.set(pinsState); - - initGui(); - } - - this.repo.updateView(); - } - - public int getReservedSpace() { - return this.reservedSpace; - } - - public void setReservedSpace(final int reservedSpace) { - this.reservedSpace = reservedSpace; - } - - public boolean isCustomSortOrder() { - return this.customSortOrder; - } - - public void setCustomSortOrder(final boolean customSortOrder) { - this.customSortOrder = customSortOrder; - } - - public int getStandardSize() { - return this.standardSize; - } - - public void setStandardSize(final int standardSize) { - this.standardSize = standardSize; - } - - public boolean isOverSearchField(int x, int y) { - return searchField.isMouseIn(x, y); - } - - public boolean hideItemPanelSlot(int tx, int ty, int tw, int th) { - if (this.viewCell) { - int rw = 33; - int rh = 14 + myCurrentViewCells.length * 18; - - if (tw <= 0 || th <= 0) { - return false; - } - - int rx = this.guiLeft + this.xSize; - int ry = this.guiTop; - - rw += rx; - rh += ry; - tw += tx; - th += ty; - - // overflow || intersect - return (rw < rx || rw > tx) && (rh < ry || rh > ty) && (tw < tx || tw > rx) && (th < ty || th > ry); - } - return false; - } - - @Override - public boolean isOverTextField(int mousex, int mousey) { - return searchField.isMouseIn(mousex, mousey); - } - - @Override - public void setAEPins(IAEStack[] pins) { - if (repo instanceof ItemRepo) repo.setAEPins(pins); - } - - @Override - public void setPinsState(PinsState state) { - configSrc.putSetting(Settings.PINS_STATE, state); - } - - @SuppressWarnings("SameParameterValue") - protected boolean isPointInRegion(int rectX, int rectY, int rectWidth, int rectHeight, int pointX, int pointY) { - pointX -= this.guiLeft; - pointY -= this.guiTop; - return pointX >= rectX - 1 && pointX < rectX + rectWidth + 1 - && pointY >= rectY - 1 - && pointY < rectY + rectHeight + 1; - } - - // Moving items via hotbar keys in terminals isn't working anyway. - // Let's disable hotbar keys processing for terminal slots to allow proper input of numbers in the search field - @Override - protected boolean checkHotbarKeys(int keyCode) { - if (theSlot instanceof SlotME) { - return false; - } - return super.checkHotbarKeys(keyCode); - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerCraftingWireless.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerCraftingWireless.java deleted file mode 100644 index df3732e4..00000000 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerCraftingWireless.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.glodblock.github.client.gui.container; - -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; - -import com.glodblock.github.inventory.ItemBiggerAppEngInventory; -import com.glodblock.github.inventory.item.IWirelessCraftTerminal; -import com.glodblock.github.inventory.item.IWirelessTerminal; - -import appeng.container.ContainerNull; -import appeng.container.slot.SlotCraftingMatrix; -import appeng.container.slot.SlotCraftingTerm; -import appeng.helpers.IContainerCraftingPacket; -import appeng.tile.inventory.AppEngInternalInventory; -import appeng.tile.inventory.IAEAppEngInventory; -import appeng.tile.inventory.InvOperation; - -public class ContainerCraftingWireless extends ContainerItemMonitor - implements IAEAppEngInventory, IContainerCraftingPacket { - - private final IWirelessCraftTerminal it; - private final SlotCraftingMatrix[] craftingSlots = new SlotCraftingMatrix[9]; - private final SlotCraftingTerm outputSlot; - - public ContainerCraftingWireless(final InventoryPlayer ip, final IWirelessTerminal monitorable) { - super(ip, monitorable, false); - this.it = (IWirelessCraftTerminal) monitorable; - final IInventory crafting = this.it.getInventoryByName("crafting"); - for (int y = 0; y < 3; y++) { - for (int x = 0; x < 3; x++) { - this.addSlotToContainer( - this.craftingSlots[x + y * 3] = new SlotCraftingMatrix( - this, - crafting, - x + y * 3, - 37 + x * 18, - -72 + y * 18) { - - @Override - public void onSlotChanged() { - if (this.inventory instanceof ItemBiggerAppEngInventory i) { - i.markDirty(); - } - super.onSlotChanged(); - } - }); - } - } - AppEngInternalInventory output = new AppEngInternalInventory(this, 1); - this.addSlotToContainer( - this.outputSlot = new SlotCraftingTerm( - this.getPlayerInv().player, - this.getActionSource(), - this.getPowerSource(), - monitorable, - crafting, - crafting, - output, - 131, - -72 + 18, - this)); - this.bindPlayerInventory(ip, 0, 0); - this.onCraftMatrixChanged(crafting); - } - - @Override - protected boolean isWirelessTerminal() { - return true; - } - - @Override - public void onCraftMatrixChanged(final IInventory par1IInventory) { - final ContainerNull cn = new ContainerNull(); - final InventoryCrafting ic = new InventoryCrafting(cn, 3, 3); - for (int x = 0; x < 9; x++) { - ic.setInventorySlotContents(x, this.craftingSlots[x].getStack()); - } - this.outputSlot - .putStack(CraftingManager.getInstance().findMatchingRecipe(ic, this.getPlayerInv().player.worldObj)); - } - - @Override - public void saveChanges() { - // NO-OP - } - - @Override - public void onChangeInventory(final IInventory inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { - // NO-OP - } - - @Override - public IInventory getInventoryByName(final String name) { - if (name.equals("player")) { - return this.getInventoryPlayer(); - } - return this.it.getInventoryByName(name); - } - - @Override - public boolean useRealItems() { - return true; - } - -} diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerEssentiaMonitor.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerEssentiaMonitor.java deleted file mode 100644 index 587eb23d..00000000 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerEssentiaMonitor.java +++ /dev/null @@ -1,159 +0,0 @@ -package com.glodblock.github.client.gui.container; - -import java.util.HashMap; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -import org.apache.commons.lang3.tuple.MutablePair; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.crossmod.thaumcraft.AspectUtil; -import com.glodblock.github.inventory.item.IWirelessTerminal; -import com.glodblock.github.network.CPacketFluidUpdate; -import com.glodblock.github.network.SPacketFluidUpdate; -import com.glodblock.github.util.Util; - -import appeng.api.config.Actionable; -import appeng.api.storage.data.IAEFluidStack; -import appeng.container.slot.SlotPlayerHotBar; -import appeng.container.slot.SlotPlayerInv; -import appeng.util.Platform; - -public class ContainerEssentiaMonitor extends ContainerFluidPortableCell { - - public ContainerEssentiaMonitor(InventoryPlayer ip, IWirelessTerminal monitorable) { - super(ip, monitorable); - } - - @Override - public ItemStack transferStackInSlot(final EntityPlayer p, final int idx) { - if (Platform.isClient()) { - Slot clickSlot = (Slot) this.inventorySlots.get(idx); - if ((clickSlot instanceof SlotPlayerInv || clickSlot instanceof SlotPlayerHotBar) && clickSlot.getHasStack() - && AspectUtil.isEssentiaContainer(clickSlot.getStack())) { - int index = Util.findItemInPlayerInvSlot(p, clickSlot.getStack()); - FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidUpdate(index)); - } - } - return super.transferStackInSlot(p, idx); - } - - @Override - public void postChange(IAEFluidStack clientSelectedFluid, EntityPlayer player, int slotIndex, boolean shift) { - ItemStack targetStack; - if (slotIndex == -1) { - targetStack = player.inventory.getItemStack(); - } else { - targetStack = player.inventory.getStackInSlot(slotIndex); - } - final int containersRequested = shift ? targetStack.stackSize : 1; - - IAEFluidStack storedFluid = this.monitor.getStorageList().findPrecise(clientSelectedFluid); - ItemStack out = targetStack.copy(); - out.stackSize = 1; - if (AspectUtil.isEmptyEssentiaContainer(targetStack) && AspectUtil.isEssentiaGas(storedFluid)) { - // add essentia to jars - if (storedFluid.getStackSize() / AspectUtil.R <= 0) { - return; - } - final IAEFluidStack toExtract = storedFluid.copy(); - MutablePair fillStack = AspectUtil.fillEssentiaFromGas(out, toExtract.getFluidStack()); - if (fillStack == null || fillStack.right == null || fillStack.left <= 0) { - return; - } - toExtract.setStackSize((long) fillStack.left * containersRequested); - IAEFluidStack tmp = this.host.getFluidInventory() - .extractItems(toExtract, Actionable.SIMULATE, this.getActionSource()); - if (tmp == null) { - return; - } - fillStack.right.stackSize = (int) (tmp.getStackSize() / fillStack.left); - this.dropItem(fillStack.right); - out.stackSize = fillStack.right.stackSize; - if (AspectUtil.isEssentiaContainer(fillStack.right)) { - this.host.getFluidInventory().extractItems(toExtract, Actionable.MODULATE, this.getActionSource()); - if ((int) (tmp.getStackSize() % fillStack.left) / AspectUtil.R > 0) { - this.dropItem( - AspectUtil.setAspectAmount( - fillStack.right, - (int) (tmp.getStackSize() % fillStack.left) / AspectUtil.R, - AspectUtil.getAspectFromGas(toExtract)), - 1); - out.stackSize++; - } - } - } else if (!AspectUtil.isEmptyEssentiaContainer(targetStack)) { - // add essentia to ae network - ItemStack containerStack = targetStack.copy(); - containerStack.stackSize = containersRequested; - IAEFluidStack fluidStack = AspectUtil.getAEGasFromContainer(containerStack); - if (fluidStack == null) { - return; - } - final IAEFluidStack aeFluidStack = fluidStack.copy(); - // simulate result is incorrect. so I'm using other solution and ec2 both mod have same issues - final IAEFluidStack notInserted = this.host.getFluidInventory() - .injectItems(aeFluidStack, Actionable.MODULATE, this.getActionSource()); - MutablePair drainStack = AspectUtil - .drainEssentiaFromGas(out.copy(), aeFluidStack.getFluidStack()); - if (notInserted != null && notInserted.getStackSize() > 0 && drainStack != null) { - if (fluidStack.getStackSize() == notInserted.getStackSize()) { - return; - } - aeFluidStack.decStackSize(notInserted.getStackSize()); - - if (drainStack.left > aeFluidStack.getStackSize() && AspectUtil.isEssentiaContainer(drainStack.right)) { - aeFluidStack.setStackSize(drainStack.left - aeFluidStack.getStackSize()); - this.host.getFluidInventory() - .extractItems(aeFluidStack, Actionable.MODULATE, this.getActionSource()); - return; - } - - // drop empty item - this.dropItem(drainStack.right, (int) (aeFluidStack.getStackSize() / drainStack.left)); - out.stackSize = (int) (notInserted.getStackSize() / drainStack.left); - if (AspectUtil.isEssentiaContainer(drainStack.right)) { - if (notInserted.getStackSize() % drainStack.left > 0) { - fluidStack.setStackSize((notInserted.getStackSize() % drainStack.left)); - AspectUtil.fillEssentiaFromGas(drainStack.right, fluidStack.getFluidStack()); - this.dropItem(drainStack.right, 1); - } - } - if (slotIndex == -1) out.stackSize = targetStack.stackSize - out.stackSize; - } else if (drainStack != null) { - if (slotIndex == -1) { - out.stackSize = targetStack.stackSize; - } else { - out.stackSize = (int) (targetStack.stackSize - (aeFluidStack.getStackSize() / drainStack.left)); - } - this.dropItem(drainStack.right, targetStack.stackSize); // drop empty item - } - } else { - return; - } - if (slotIndex == -1) { - player.inventory.getItemStack().stackSize = player.inventory.getItemStack().stackSize - out.stackSize; - if (player.inventory.getItemStack().stackSize > 0) { - FluidCraft.proxy.netHandler.sendTo( - new SPacketFluidUpdate(new HashMap<>(), player.inventory.getItemStack()), - (EntityPlayerMP) player); - } else { - player.inventory.setItemStack(null); - FluidCraft.proxy.netHandler.sendTo(new SPacketFluidUpdate(new HashMap<>()), (EntityPlayerMP) player); - } - } else { - player.inventory.setInventorySlotContents(slotIndex, out.stackSize > 0 ? out : null); - } - this.detectAndSendChanges(); - } - - @Override - protected boolean isEssentiaMode() { - return true; - } - -} diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidCraftConfirm.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidCraftConfirm.java deleted file mode 100644 index 2a858683..00000000 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidCraftConfirm.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.glodblock.github.client.gui.container; - -import java.util.Objects; - -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; - -import com.glodblock.github.common.item.ItemBaseWirelessTerminal; -import com.glodblock.github.common.parts.PartFluidPatternTerminal; -import com.glodblock.github.common.parts.PartFluidPatternTerminalEx; -import com.glodblock.github.common.parts.PartLevelTerminal; -import com.glodblock.github.inventory.InventoryHandler; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.IWirelessTerminal; -import com.glodblock.github.util.BlockPos; - -import appeng.api.networking.IGrid; -import appeng.api.networking.security.IActionHost; -import appeng.api.storage.ITerminalHost; -import appeng.container.implementations.ContainerCraftConfirm; -import appeng.container.implementations.ContainerOptimizePatterns; -import appeng.crafting.v2.CraftingJobV2; -import appeng.tile.misc.TilePatternOptimizationMatrix; - -public class ContainerFluidCraftConfirm extends ContainerCraftConfirm { - - public ContainerFluidCraftConfirm(final InventoryPlayer ip, final ITerminalHost te) { - super(ip, te); - } - - @Override - public void switchToOriginalGUI() { - GuiType originalGui = null; - - final IActionHost ah = this.getActionHost(); - if (ah instanceof PartFluidPatternTerminal) { - originalGui = GuiType.FLUID_PATTERN_TERMINAL; - } - if (ah instanceof PartFluidPatternTerminalEx) { - originalGui = GuiType.FLUID_PATTERN_TERMINAL_EX; - } - if (ah instanceof PartLevelTerminal) { - originalGui = GuiType.LEVEL_TERMINAL; - } - if (ah instanceof IWirelessTerminal) { - ItemStack terminal = ((IWirelessTerminal) ah).getItemStack(); - if (terminal.getItem() instanceof ItemBaseWirelessTerminal) { - originalGui = ((ItemBaseWirelessTerminal) terminal.getItem()).guiGuiType(terminal); - } - } - if (ah instanceof IWirelessTerminal) { - InventoryHandler.openGui( - this.getInventoryPlayer().player, - getWorld(), - new BlockPos(((IWirelessTerminal) ah).getInventorySlot(), 0, 0), - ForgeDirection.UNKNOWN, - originalGui); - } else if (this.getOpenContext() != null) { - InventoryHandler.openGui( - this.getInventoryPlayer().player, - getWorld(), - new BlockPos(this.getOpenContext().getTile()), - Objects.requireNonNull(this.getOpenContext().getSide()), - originalGui); - } - } - - @Override - public void optimizePatterns() { - // only V2 supported - IGrid grid = this.getGrid(); - - if (result instanceof CraftingJobV2 && !this.isSimulation() - && grid != null - && !grid.getMachines(TilePatternOptimizationMatrix.class).isEmpty()) { - final IActionHost ah = this.getActionHost(); - if (ah instanceof IWirelessTerminal) { - InventoryHandler.openGui( - this.getInventoryPlayer().player, - getWorld(), - new BlockPos(((IWirelessTerminal) ah).getInventorySlot(), 0, 0), - ForgeDirection.UNKNOWN, - GuiType.FLUID_OPTIMIZE_PATTERNS_ITEM); - } else if (this.getOpenContext() != null) { - InventoryHandler.openGui( - this.getInventoryPlayer().player, - getWorld(), - new BlockPos(this.getOpenContext().getTile()), - Objects.requireNonNull(this.getOpenContext().getSide()), - GuiType.FLUID_OPTIMIZE_PATTERNS); - } - if (this.getPlayerInv().player.openContainer instanceof ContainerOptimizePatterns cop) { - cop.setResult(result); - } - } - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java deleted file mode 100644 index 34188bd4..00000000 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java +++ /dev/null @@ -1,560 +0,0 @@ -package com.glodblock.github.client.gui.container; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidContainerItem; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.client.gui.container.base.FCContainerMonitor; -import com.glodblock.github.common.item.ItemFluidPacket; -import com.glodblock.github.network.CPacketFluidUpdate; -import com.glodblock.github.network.SPacketFluidUpdate; -import com.glodblock.github.network.SPacketMEUpdateBuffer; -import com.glodblock.github.util.Util; - -import appeng.api.AEApi; -import appeng.api.config.Actionable; -import appeng.api.implementations.tiles.IViewCellStorage; -import appeng.api.networking.IGrid; -import appeng.api.networking.IGridHost; -import appeng.api.networking.IGridNode; -import appeng.api.networking.energy.IEnergyGrid; -import appeng.api.networking.energy.IEnergySource; -import appeng.api.networking.security.BaseActionSource; -import appeng.api.networking.storage.IBaseMonitor; -import appeng.api.networking.storage.IStorageGrid; -import appeng.api.storage.ITerminalHost; -import appeng.api.storage.data.IAEFluidStack; -import appeng.api.storage.data.IAEStack; -import appeng.api.storage.data.IItemList; -import appeng.container.slot.SlotPlayerHotBar; -import appeng.container.slot.SlotPlayerInv; -import appeng.container.slot.SlotRestrictedInput; -import appeng.me.helpers.ChannelPowerSrc; -import appeng.util.Platform; -import appeng.util.item.AEFluidStack; - -public class ContainerFluidMonitor extends FCContainerMonitor { - - protected final IItemList fluids = AEApi.instance().storage().createFluidList(); - /** - * Index of tuple which indicates remaining tanks that are remaining (not emptied/filled) - */ - protected static final int REM_IDX = 0; - /** - * Index of tuple which indicates remaining tanks that are acted upon (emptied/filled) - */ - protected static final int ACT_IDX = 1; - /** - * Index of tuple which indicates tanks that are partially emptied/filled - */ - protected static final int PARTIAL_IDX = 2; - - public ContainerFluidMonitor(final InventoryPlayer ip, final ITerminalHost monitorable) { - this(ip, monitorable, true); - } - - protected ContainerFluidMonitor(final InventoryPlayer ip, final ITerminalHost monitorable, - final boolean bindInventory) { - super(ip, monitorable, bindInventory); - if (Platform.isServer()) { - this.serverCM = monitorable.getConfigManager(); - if (monitorable instanceof IGridHost) { - final IGridNode node = ((IGridHost) monitorable).getGridNode(ForgeDirection.UNKNOWN); - if (node != null) { - this.networkNode = node; - final IGrid g = node.getGrid(); - if (g != null) { - this.setPowerSource(new ChannelPowerSrc(this.networkNode, g.getCache(IEnergyGrid.class))); - IStorageGrid storageGrid = g.getCache(IStorageGrid.class); - this.monitor = storageGrid.getFluidInventory(); - if (this.monitor == null) { - this.setValidContainer(false); - } else { - this.monitor.addListener(this, null); - } - } - } else { - this.setValidContainer(false); - } - } else { - this.monitor = monitorable.getFluidInventory(); - this.monitor.addListener(this, null); - this.setPowerSource((IEnergySource) monitorable); - } - } else { - this.monitor = null; - } - - this.canAccessViewCells = false; - if (monitorable instanceof IViewCellStorage) { - for (int y = 0; y < 5; y++) { - this.cellView[y] = new SlotRestrictedInput( - SlotRestrictedInput.PlacableItemType.VIEW_CELL, - ((IViewCellStorage) monitorable).getViewCellStorage(), - y, - 206, - y * 18 + 8, - this.getInventoryPlayer()); - this.cellView[y].setAllowEdit(this.canAccessViewCells); - this.addSlotToContainer(this.cellView[y]); - } - } - - if (bindInventory) { - this.bindPlayerInventory(ip, 0, 0); - } - } - - @Override - public ItemStack transferStackInSlot(final EntityPlayer p, final int idx) { - if (Platform.isClient() && !isEssentiaMode()) { - Slot clickSlot = (Slot) this.inventorySlots.get(idx); - if ((clickSlot instanceof SlotPlayerInv || clickSlot instanceof SlotPlayerHotBar) && clickSlot.getHasStack() - && Util.FluidUtil.isFluidContainer(clickSlot.getStack())) { - int index = Util.findItemInPlayerInvSlot(p, clickSlot.getStack()); - FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidUpdate(index)); - } - } - return super.transferStackInSlot(p, idx); - } - - @Override - protected void processItemList() { - if (!this.fluids.isEmpty()) { - final IItemList monitorCache = this.monitor.getStorageList(); - List toSend = new ArrayList<>(); - for (final IAEFluidStack is : this.fluids) { - final IAEFluidStack send = monitorCache.findPrecise(is); - if (send != null) { - toSend.add(send); - } else { - is.setStackSize(0); - toSend.add(is); - } - } - for (final Object c : this.crafters) { - if (c instanceof EntityPlayerMP) { - SPacketMEUpdateBuffer.scheduleFluidUpdate((EntityPlayerMP) c, toSend); - } - } - this.fluids.resetStatus(); - } - } - - @Override - protected void queueInventory(final ICrafting c) { - if (Platform.isServer() && c instanceof EntityPlayerMP && this.monitor != null) { - final IItemList monitorCache = this.monitor.getStorageList(); - List toSend = new ArrayList<>(); - for (final IAEFluidStack is : monitorCache) { - toSend.add(is); - } - SPacketMEUpdateBuffer.scheduleFluidUpdate((EntityPlayerMP) c, toSend); - } - } - - @Override - public void postChange(IBaseMonitor monitor, Iterable> change, BaseActionSource actionSource) { - for (final IAEStack is : change) { - this.fluids.add((IAEFluidStack) is); - } - } - - protected void dropItem(ItemStack is) { - if (is == null || is.stackSize <= 0) return; - ItemStack itemStack = is.copy(); - int i = itemStack.getMaxStackSize(); - while (itemStack.stackSize > 0) { - if (i > itemStack.stackSize) { - if (!getPlayerInv().addItemStackToInventory(itemStack.copy())) { - getPlayerInv().player.entityDropItem(itemStack.copy(), 0); - } - break; - } else { - itemStack.stackSize -= i; - ItemStack item = itemStack.copy(); - item.stackSize = i; - if (!getPlayerInv().addItemStackToInventory(item)) { - getPlayerInv().player.entityDropItem(item, 0); - } - } - } - } - - protected void dropItem(ItemStack itemStack, int stackSize) { - if (itemStack == null || itemStack.stackSize <= 0) return; - ItemStack is = itemStack.copy(); - is.stackSize = stackSize; - this.dropItem(is); - } - - /** - * Two operations, insert and extract. - * - * @param slotIndex The slot. If index == -1, the cursor held itemstack. Else, slotIndex indicates which slot was - * shift clicked on. - */ - public void postChange(IAEFluidStack fluid, EntityPlayer player, int slotIndex, boolean shift) { - ItemStack targetStack; - if (slotIndex == -1) { - targetStack = player.inventory.getItemStack(); - } else { - targetStack = player.inventory.getStackInSlot(slotIndex); - } - // The primary output itemstack - if (Util.FluidUtil.isEmpty(targetStack) && fluid != null) { - // Situation 1.a: Empty fluid container, and nonnull slot - extractFluid(fluid, player, slotIndex, shift); - } else if (!Util.FluidUtil.isEmpty(targetStack)) { - // Situation 2.a: We are holding a non-empty container. - insertFluid(player, slotIndex, shift); - // End of situation 2.a - } - // No op (Any other situation) - this.detectAndSendChanges(); - } - - /** - * The insert operation. For input, we have a filled container stack. For outputs, we have the following: - *
    - *
  1. Leftover filled container stack
  2. - *
  3. Empty containers
  4. - *
  5. Partially filled container x1
  6. - *
- * In order above, the itemstack at `slotIndex` is transformed into the output. - */ - private void insertFluid(EntityPlayer player, int slotIndex, boolean shift) { - final ItemStack targetStack; - if (slotIndex == -1) { - targetStack = player.inventory.getItemStack(); - } else { - targetStack = player.inventory.getStackInSlot(slotIndex); - } - final int containersRequestedToInsert = shift ? targetStack.stackSize : 1; - - // Step 1: Determine container characteristics and verify fluid to be extractable - final int fluidPerContainer; - final FluidStack fluidStackPerContainer; - final boolean partialInsertSupported; - if (targetStack.getItem() instanceof IFluidContainerItem fcItem) { - ItemStack test = targetStack.copy(); - test.stackSize = 1; - fluidStackPerContainer = fcItem.drain(test, Integer.MAX_VALUE, false); - if (fluidStackPerContainer == null || fluidStackPerContainer.amount == 0) { - return; - } - - fluidPerContainer = fluidStackPerContainer.amount; - partialInsertSupported = true; - } else if (FluidContainerRegistry.isContainer(targetStack)) { - ItemStack emptyTank = FluidContainerRegistry.drainFluidContainer(targetStack); - if (emptyTank == null) { - return; - } - - fluidStackPerContainer = FluidContainerRegistry.getFluidForFilledItem(targetStack); - fluidPerContainer = fluidStackPerContainer.amount; - partialInsertSupported = false; - } else { - return; - } - - // Step 2: determine network capacity - final IAEFluidStack totalFluid = AEFluidStack.create(fluidStackPerContainer); - totalFluid.setStackSize((long) fluidPerContainer * containersRequestedToInsert); - - final IAEFluidStack notInsertable = this.host.getFluidInventory() - .injectItems(totalFluid, Actionable.SIMULATE, this.getActionSource()); - - final long insertableFluid; - if (notInsertable == null || notInsertable.getStackSize() == 0) { - insertableFluid = totalFluid.getStackSize(); - } else { - long insertable = totalFluid.getStackSize() - notInsertable.getStackSize(); - if (partialInsertSupported) { - insertableFluid = insertable; - } else { - // avoid remainder - insertableFluid = insertable - (insertable % fluidPerContainer); - } - } - totalFluid.setStackSize(insertableFluid); - - // Step 3: perform insert - final long totalInserted; - final IAEFluidStack notInserted = this.host.getFluidInventory() - .injectItems(totalFluid, Actionable.MODULATE, this.getActionSource()); - if (notInserted != null && notInserted.getStackSize() > 0) { - // User has a setup that causes discrepancy between simulation and modulation. Likely double storage bus. - long total = totalFluid.getStackSize() - notInserted.getStackSize(); - if (partialInsertSupported) { - totalInserted = total; - } else { - // We cant have partially filled containers -> user will receive a fluid packet as last resort - long overflowAmount = fluidPerContainer - (total % fluidPerContainer); - IAEFluidStack overflow = AEFluidStack.create(fluidStackPerContainer); - overflow.setStackSize(overflowAmount); - dropItem(ItemFluidPacket.newStack(overflow)); - totalInserted = total + overflowAmount; - } - } else { - totalInserted = totalFluid.getStackSize(); - } - - // Step 4: calculate outputs - final int emptiedTanks; - final int partialDrain; - if (fluidPerContainer > 0) { - emptiedTanks = (int) (totalInserted / fluidPerContainer); - partialDrain = (int) (totalInserted % fluidPerContainer); - } else { - emptiedTanks = containersRequestedToInsert; - partialDrain = 0; - } - final int partialTanks = partialDrain > 0 && partialInsertSupported ? 1 : 0; - final int usedTanks = emptiedTanks + partialTanks; - final int untouchedTanks = targetStack.stackSize - usedTanks; - - final ItemStack emptiedTanksStack; - final ItemStack partialTanksStack; - - if (targetStack.getItem() instanceof IFluidContainerItem fcItem) { - if (emptiedTanks > 0) { - final ItemStack testDrainStack = targetStack.copy(); - testDrainStack.stackSize = 1; - fcItem.drain(testDrainStack, fluidPerContainer, true); - if (testDrainStack.stackSize == 0) { - emptiedTanksStack = null; - } else { - emptiedTanksStack = testDrainStack.copy(); - emptiedTanksStack.stackSize = emptiedTanks; - } - } else { - emptiedTanksStack = null; - } - if (partialTanks > 0) { - partialTanksStack = targetStack.copy(); - partialTanksStack.stackSize = 1; - fcItem.drain(partialTanksStack, partialDrain, true); - } else { - partialTanksStack = null; - } - } else { - if (emptiedTanks > 0) { - emptiedTanksStack = FluidContainerRegistry.drainFluidContainer(targetStack); - emptiedTanksStack.stackSize = emptiedTanks; - } else { - emptiedTanksStack = null; - } - // Not possible > see Step 2 and Step 3 - partialTanksStack = null; - } - - // Done. Put the output in the inventory or ground, and update stack size. - boolean shouldSendStack = true; - if (slotIndex == -1) { - // Item is in mouse hand - if (untouchedTanks > 0) { - targetStack.stackSize = untouchedTanks; - adjustStack(targetStack); - dropItem(emptiedTanksStack); - dropItem(partialTanksStack); - } else if (emptiedTanksStack != null) { - adjustStack(emptiedTanksStack); - player.inventory.setItemStack(emptiedTanksStack); - dropItem(partialTanksStack); - } else if (partialTanksStack != null) { - player.inventory.setItemStack(partialTanksStack); - } else { - player.inventory.setItemStack(null); - shouldSendStack = false; - } - } else { - // Shift clicked in - if (untouchedTanks > 0) { - targetStack.stackSize = untouchedTanks; - adjustStack(targetStack); - dropItem(emptiedTanksStack); - dropItem(partialTanksStack); - } else if (emptiedTanksStack != null) { - adjustStack(emptiedTanksStack); - player.inventory.setInventorySlotContents(slotIndex, emptiedTanksStack); - dropItem(partialTanksStack); - } else if (partialTanksStack != null) { - player.inventory.setInventorySlotContents(slotIndex, partialTanksStack); - } else { - player.inventory.setInventorySlotContents(slotIndex, null); - } - } - if (shouldSendStack) { - FluidCraft.proxy.netHandler.sendTo( - new SPacketFluidUpdate(new HashMap<>(), player.inventory.getItemStack()), - (EntityPlayerMP) player); - } else { - FluidCraft.proxy.netHandler.sendTo(new SPacketFluidUpdate(new HashMap<>()), (EntityPlayerMP) player); - } - } - - /** - * The extract operation. For input, we have an empty container stack. For outputs, we have the following: - *
    - *
  1. Leftover empty container stack
  2. - *
  3. Filled containers (full)
  4. - *
  5. Partially filled container x1
  6. - *
- * In order above, the itemstack at `slotIndex` is transformed into the output. - */ - private void extractFluid(IAEFluidStack clientRequestedFluid, EntityPlayer player, int slotIndex, boolean shift) { - if (slotIndex != -1) { - // shift-click from inventory cant fill fluids - return; - } - final ItemStack targetStack = player.inventory.getItemStack(); - final int containersRequestedToExtract = shift ? targetStack.stackSize : 1; - - final FluidStack clientRequestedFluidStack = clientRequestedFluid.getFluidStack(); - clientRequestedFluidStack.amount = Integer.MAX_VALUE; - - // Step 1: Determine container characteristics and verify fluid to be insertable - final int fluidPerContainer; - final boolean partialInsertSupported; - if (targetStack.getItem() instanceof IFluidContainerItem fcItem) { - ItemStack testStack = targetStack.copy(); - testStack.stackSize = 1; - fluidPerContainer = fcItem.fill(testStack, clientRequestedFluidStack, false); - if (fluidPerContainer == 0) { - return; - } - partialInsertSupported = true; - } else if (FluidContainerRegistry.isContainer(targetStack)) { - fluidPerContainer = FluidContainerRegistry.getContainerCapacity(clientRequestedFluidStack, targetStack); - partialInsertSupported = false; - } else { - return; - } - - // Step 2: determine fluid in network - final IAEFluidStack totalRequestedFluid = clientRequestedFluid.copy(); - totalRequestedFluid.setStackSize((long) fluidPerContainer * containersRequestedToExtract); - - final IAEFluidStack availableFluid = this.host.getFluidInventory() - .extractItems(totalRequestedFluid, Actionable.SIMULATE, this.getActionSource()); - if (availableFluid == null || availableFluid.getStackSize() == 0) { - return; - } - - if (availableFluid.getStackSize() != totalRequestedFluid.getStackSize() && !partialInsertSupported) { - availableFluid.decStackSize(availableFluid.getStackSize() % fluidPerContainer); - } - - // Step 3: perform extract - final IAEFluidStack extracted = this.host.getFluidInventory() - .extractItems(availableFluid, Actionable.MODULATE, this.getActionSource()); - final long totalExtracted = extracted != null ? extracted.getStackSize() : 0; - - // Step 4: calculate outputs - final int filledTanks = (int) (totalExtracted / fluidPerContainer); - final int partialFill = (int) (totalExtracted % fluidPerContainer); - final int partialTanks = partialFill > 0 && partialInsertSupported ? 1 : 0; - final int usedTanks = filledTanks + partialTanks; - final int untouchedTanks = targetStack.stackSize - usedTanks; - - final ItemStack filledTanksStack; - final ItemStack partialTanksStack; - - if (targetStack.getItem() instanceof IFluidContainerItem fcItem) { - if (filledTanks > 0) { - filledTanksStack = targetStack.copy(); - filledTanksStack.stackSize = 1; - FluidStack toInsert = extracted.getFluidStack().copy(); - toInsert.amount = fluidPerContainer; - fcItem.fill(filledTanksStack, toInsert, true); - filledTanksStack.stackSize = filledTanks; - } else { - filledTanksStack = null; - } - if (partialTanks > 0) { - partialTanksStack = targetStack.copy(); - partialTanksStack.stackSize = 1; - FluidStack toInsert = extracted.getFluidStack().copy(); - toInsert.amount = partialFill; - fcItem.fill(partialTanksStack, toInsert, true); - } else { - partialTanksStack = null; - } - } else { - if (filledTanks > 0) { - FluidStack toInsert = extracted.getFluidStack().copy(); - toInsert.amount = fluidPerContainer; - filledTanksStack = FluidContainerRegistry.fillFluidContainer(toInsert, targetStack); - filledTanksStack.stackSize = filledTanks; - } else { - filledTanksStack = null; - } - if (partialFill > 0) { - // User has a setup that causes discrepancy between simulation and modulation. Likely double storage - // bus. - // We cant have partially filled containers -> user will receive a fluid packet as last resort - IAEFluidStack overflow = extracted.copy(); - overflow.setStackSize(partialFill); - dropItem(ItemFluidPacket.newStack(overflow)); - } - partialTanksStack = null; - } - - // Done. Put the output in the inventory or ground, and update stack size. - // We can assume slotIndex == -1, since we don't actually allow extraction via shift click. - boolean shouldSendStack = true; - if (untouchedTanks > 0) { - ItemStack emptyStack = player.inventory.getItemStack(); - emptyStack.stackSize = untouchedTanks; - adjustStack(emptyStack); - dropItem(filledTanksStack); - dropItem(partialTanksStack); - } else if (filledTanksStack != null) { - adjustStack(filledTanksStack); - player.inventory.setItemStack(filledTanksStack); - dropItem(partialTanksStack); - } else if (partialTanksStack != null) { - player.inventory.setItemStack(partialTanksStack); - } else { - player.inventory.setItemStack(null); - shouldSendStack = false; - } - if (shouldSendStack) { - FluidCraft.proxy.netHandler.sendTo( - new SPacketFluidUpdate(new HashMap<>(), player.inventory.getItemStack()), - (EntityPlayerMP) player); - } else { - FluidCraft.proxy.netHandler.sendTo(new SPacketFluidUpdate(new HashMap<>()), (EntityPlayerMP) player); - } - } - - void adjustStack(ItemStack stack) { - if (stack != null && stack.stackSize > stack.getMaxStackSize()) { - dropItem(stack, stack.stackSize - stack.getMaxStackSize()); - stack.stackSize = stack.getMaxStackSize(); - } - } - - protected boolean isEssentiaMode() { - return false; - } - - @Override - protected boolean isWirelessTerminal() { - return false; - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidOptimizePatterns.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidOptimizePatterns.java deleted file mode 100644 index dbe7654d..00000000 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidOptimizePatterns.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.glodblock.github.client.gui.container; - -import java.util.Objects; - -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -import com.glodblock.github.common.item.ItemBaseWirelessTerminal; -import com.glodblock.github.common.parts.PartFluidPatternTerminal; -import com.glodblock.github.common.parts.PartFluidPatternTerminalEx; -import com.glodblock.github.common.parts.PartLevelTerminal; -import com.glodblock.github.inventory.InventoryHandler; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.IWirelessTerminal; -import com.glodblock.github.util.BlockPos; - -import appeng.api.networking.security.IActionHost; -import appeng.api.storage.ITerminalHost; -import appeng.container.implementations.ContainerOptimizePatterns; - -public class ContainerFluidOptimizePatterns extends ContainerOptimizePatterns { - - public ContainerFluidOptimizePatterns(InventoryPlayer ip, ITerminalHost te) { - super(ip, te); - } - - public World getWorld() { - return this.getPlayerInv().player.worldObj; - } - - @Override - public void switchToOriginalGUI() { - GuiType originalGui = null; - - final IActionHost ah = this.getActionHost(); - if (ah instanceof PartFluidPatternTerminal) { - originalGui = GuiType.FLUID_PATTERN_TERMINAL; - } - if (ah instanceof PartFluidPatternTerminalEx) { - originalGui = GuiType.FLUID_PATTERN_TERMINAL_EX; - } - if (ah instanceof PartLevelTerminal) { - originalGui = GuiType.LEVEL_TERMINAL; - } - if (ah instanceof IWirelessTerminal) { - ItemStack terminal = ((IWirelessTerminal) ah).getItemStack(); - if (terminal.getItem() instanceof ItemBaseWirelessTerminal) { - originalGui = ((ItemBaseWirelessTerminal) terminal.getItem()).guiGuiType(terminal); - } - } - if (ah instanceof IWirelessTerminal) { - InventoryHandler.openGui( - this.getInventoryPlayer().player, - getWorld(), - new BlockPos(((IWirelessTerminal) ah).getInventorySlot(), 0, 0), - ForgeDirection.UNKNOWN, - originalGui); - } else if (this.getOpenContext() != null) { - InventoryHandler.openGui( - this.getInventoryPlayer().player, - getWorld(), - new BlockPos(this.getOpenContext().getTile()), - Objects.requireNonNull(this.getOpenContext().getSide()), - originalGui); - } - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternExWireless.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternExWireless.java deleted file mode 100644 index 636ef6c6..00000000 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternExWireless.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.glodblock.github.client.gui.container; - -import net.minecraft.entity.player.InventoryPlayer; - -import com.glodblock.github.inventory.item.IWirelessTerminal; - -public class ContainerFluidPatternExWireless extends ContainerFluidPatternTerminalEx { - - public ContainerFluidPatternExWireless(InventoryPlayer ip, IWirelessTerminal monitorable) { - super(ip, monitorable); - } - - @Override - protected boolean isWirelessTerminal() { - return true; - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminal.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminal.java deleted file mode 100644 index 6988496e..00000000 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminal.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.glodblock.github.client.gui.container; - -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; - -import com.glodblock.github.client.gui.container.base.FCContainerEncodeTerminal; - -import appeng.api.storage.ITerminalHost; -import appeng.container.slot.OptionalSlotFake; -import appeng.container.slot.SlotFakeCraftingMatrix; -import appeng.container.slot.SlotPatternOutputs; -import appeng.container.slot.SlotPatternTerm; -import appeng.util.Platform; - -public class ContainerFluidPatternTerminal extends FCContainerEncodeTerminal { - - public ContainerFluidPatternTerminal(final InventoryPlayer ip, final ITerminalHost monitorable) { - super(ip, monitorable); - final IInventory output = this.patternTerminal.getInventoryByName("output"); - final IInventory patternInv = this.patternTerminal.getInventoryByName("pattern"); - this.craftingSlots = new SlotFakeCraftingMatrix[9]; - this.outputSlots = new OptionalSlotFake[3]; - for (int y = 0; y < 3; y++) { - for (int x = 0; x < 3; x++) { - this.addSlotToContainer( - this.craftingSlots[x + y * 3] = new SlotFakeCraftingMatrix( - this.crafting, - x + y * 3, - 18 + x * 18, - -76 + y * 18)); - } - } - - this.addSlotToContainer( - this.craftSlot = new SlotPatternTerm( - ip.player, - this.getActionSource(), - this.getPowerSource(), - monitorable, - this.crafting, - patternInv, - this.cOut, - 110, - -76 + 18, - this, - 2, - this)); - this.craftSlot.setIIcon(-1); - - for (int y = 0; y < 3; y++) { - this.addSlotToContainer( - this.outputSlots[y] = new SlotPatternOutputs(output, this, y, 110, -76 + y * 18, 0, 0, 1)); - this.outputSlots[y].setRenderDisabled(false); - } - this.updateOrderOfOutputSlots(); - } - - private void updateOrderOfOutputSlots() { - if (!this.isCraftingMode()) { - this.craftSlot.xDisplayPosition = -9000; - for (int y = 0; y < 3; y++) { - this.outputSlots[y].xDisplayPosition = this.outputSlots[y].getX(); - } - } else { - this.craftSlot.xDisplayPosition = this.craftSlot.getX(); - for (int y = 0; y < 3; y++) { - this.outputSlots[y].xDisplayPosition = -9000; - } - } - } - - protected boolean validPatternSlot(Slot slot) { - return slot instanceof SlotFakeCraftingMatrix || slot instanceof SlotPatternOutputs; - } - - @Override - public void putStackInSlot(final int par1, final ItemStack par2ItemStack) { - super.putStackInSlot(par1, par2ItemStack); - this.getAndUpdateOutput(); - } - - @Override - public void putStacksInSlots(final ItemStack[] par1ArrayOfItemStack) { - super.putStacksInSlots(par1ArrayOfItemStack); - this.getAndUpdateOutput(); - } - - private ItemStack getAndUpdateOutput() { - final InventoryCrafting ic = new InventoryCrafting(this, 3, 3); - - for (int x = 0; x < ic.getSizeInventory(); x++) { - ic.setInventorySlotContents(x, this.crafting.getStackInSlot(x)); - } - - final ItemStack is = CraftingManager.getInstance().findMatchingRecipe(ic, this.getPlayerInv().player.worldObj); - this.cOut.setInventorySlotContents(0, is); - return is; - } - - @Override - protected ItemStack[] getOutputs() { - if (this.isCraftingMode()) { - final ItemStack out = this.getAndUpdateOutput(); - if (out != null && out.stackSize > 0) { - return new ItemStack[] { out }; - } - } - return super.getOutputs(); - } - - @Override - public boolean isSlotEnabled(final int idx) { - if (idx == 1) { - return Platform.isServer() ? !this.patternTerminal.isCraftingRecipe() : !this.isCraftingMode(); - } else if (idx == 2) { - return Platform.isServer() ? this.patternTerminal.isCraftingRecipe() : this.isCraftingMode(); - } else { - return false; - } - } - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - if (Platform.isServer()) { - if (this.isCraftingMode() != this.patternTerminal.isCraftingRecipe()) { - this.setCraftingMode(this.patternTerminal.isCraftingRecipe()); - this.updateOrderOfOutputSlots(); - } - } - } - - @Override - public void onUpdate(final String field, final Object oldValue, final Object newValue) { - super.onUpdate(field, oldValue, newValue); - if (field.equals("craftingMode")) { - this.getAndUpdateOutput(); - this.updateOrderOfOutputSlots(); - } - } - - public void clear() { - super.clear(); - this.getAndUpdateOutput(); - } - - private void setCraftingMode(final boolean craftingMode) { - this.craftingMode = craftingMode; - } - - @Override - public void doubleStacks(int val) { - if (!isCraftingMode()) { - super.doubleStacks(val); - } - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminalEx.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminalEx.java deleted file mode 100644 index a2a74702..00000000 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminalEx.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.glodblock.github.client.gui.container; - -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; - -import com.glodblock.github.client.gui.container.base.FCContainerEncodeTerminal; - -import appeng.api.storage.ITerminalHost; -import appeng.container.slot.IOptionalSlotHost; -import appeng.container.slot.OptionalSlotFake; -import appeng.helpers.InventoryAction; -import appeng.util.Platform; - -public class ContainerFluidPatternTerminalEx extends FCContainerEncodeTerminal { - - private static final int CRAFTING_GRID_PAGES = 2; - private static final int CRAFTING_GRID_WIDTH = 4; - private static final int CRAFTING_GRID_HEIGHT = 4; - private static final int CRAFTING_GRID_SLOTS = CRAFTING_GRID_WIDTH * CRAFTING_GRID_HEIGHT; - - public ContainerFluidPatternTerminalEx(final InventoryPlayer ip, final ITerminalHost monitorable) { - super(ip, monitorable); - this.craftingSlots = new ProcessingSlotFake[CRAFTING_GRID_SLOTS * CRAFTING_GRID_PAGES]; - this.outputSlots = new ProcessingSlotFake[CRAFTING_GRID_SLOTS * CRAFTING_GRID_PAGES]; - final IInventory output = this.getPatternTerminal().getInventoryByName("output"); - for (int page = 0; page < CRAFTING_GRID_PAGES; page++) { - for (int y = 0; y < CRAFTING_GRID_HEIGHT; y++) { - for (int x = 0; x < CRAFTING_GRID_WIDTH; x++) { - this.addSlotToContainer( - this.craftingSlots[x + y * CRAFTING_GRID_WIDTH - + page * CRAFTING_GRID_SLOTS] = new ProcessingSlotFake( - crafting, - this, - x + y * CRAFTING_GRID_WIDTH + page * CRAFTING_GRID_SLOTS, - 15, - -83, - x, - y, - x + 4)); - } - } - for (int x = 0; x < CRAFTING_GRID_WIDTH; x++) { - for (int y = 0; y < CRAFTING_GRID_HEIGHT; y++) { - this.addSlotToContainer( - this.outputSlots[x * CRAFTING_GRID_HEIGHT + y - + page * CRAFTING_GRID_SLOTS] = new ProcessingSlotFake( - output, - this, - x * CRAFTING_GRID_HEIGHT + y + page * CRAFTING_GRID_SLOTS, - 112, - -83, - -x, - y, - x)); - } - } - } - this.craftingMode = false; - } - - @Override - public boolean isSlotEnabled(final int idx) { - if (idx < 4) // outputs - { - return inverted || idx == 0; - } else { - return !inverted || idx == 4; - } - } - - protected boolean validPatternSlot(Slot slot) { - return slot instanceof ProcessingSlotFake; - } - - @Override - public void detectAndSendChanges() { - if (Platform.isServer()) { - if (inverted != patternTerminal.isInverted() || activePage != patternTerminal.getActivePage()) { - inverted = patternTerminal.isInverted(); - activePage = patternTerminal.getActivePage(); - offsetSlots(); - } - } - super.detectAndSendChanges(); - } - - private void offsetSlots() { - for (int page = 0; page < CRAFTING_GRID_PAGES; page++) { - for (int y = 0; y < CRAFTING_GRID_HEIGHT; y++) { - for (int x = 0; x < CRAFTING_GRID_WIDTH; x++) { - ((ProcessingSlotFake) this.craftingSlots[x + y * CRAFTING_GRID_WIDTH + page * CRAFTING_GRID_SLOTS]) - .setHidden(page != activePage || x > 0 && inverted); - ((ProcessingSlotFake) this.outputSlots[x * CRAFTING_GRID_HEIGHT + y + page * CRAFTING_GRID_SLOTS]) - .setHidden(page != activePage || x > 0 && !inverted); - } - } - } - } - - @Override - public void onUpdate(String field, Object oldValue, Object newValue) { - super.onUpdate(field, oldValue, newValue); - if (field.equals("inverted") || field.equals("activePage")) { - offsetSlots(); - } - } - - @Override - public void onSlotChange(final Slot s) { - if (s == this.patternSlotOUT && Platform.isServer()) { - inverted = patternTerminal.isInverted(); - } - super.onSlotChange(s); - } - - @Override - public void doAction(EntityPlayerMP player, InventoryAction action, int slotId, long id) { - this.craftingMode = false; - super.doAction(player, action, slotId, id); - } - - @Override - public void encode() { - this.craftingMode = false; - super.encode(); - } - - @Override - public boolean isCraftingMode() { - return false; - } - - private static class ProcessingSlotFake extends OptionalSlotFake { - - private static final int POSITION_SHIFT = 9000; - private boolean hidden = false; - - public ProcessingSlotFake(IInventory inv, IOptionalSlotHost containerBus, int idx, int x, int y, int offX, - int offY, int groupNum) { - super(inv, containerBus, idx, x, y, offX, offY, groupNum); - this.setRenderDisabled(false); - } - - public void setHidden(boolean hide) { - if (this.hidden != hide) { - this.hidden = hide; - this.xDisplayPosition += (hide ? -1 : 1) * POSITION_SHIFT; - } - } - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternWireless.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternWireless.java deleted file mode 100644 index 063e7bdc..00000000 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternWireless.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.glodblock.github.client.gui.container; - -import net.minecraft.entity.player.InventoryPlayer; - -import com.glodblock.github.inventory.item.IWirelessTerminal; - -public class ContainerFluidPatternWireless extends ContainerFluidPatternTerminal { - - public ContainerFluidPatternWireless(InventoryPlayer ip, IWirelessTerminal monitorable) { - super(ip, monitorable); - } - - @Override - protected boolean isWirelessTerminal() { - return true; - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPortableCell.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPortableCell.java deleted file mode 100644 index bb4dde1d..00000000 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPortableCell.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.glodblock.github.client.gui.container; - -import net.minecraft.entity.player.InventoryPlayer; - -import com.glodblock.github.inventory.item.IFluidPortableCell; - -public class ContainerFluidPortableCell extends ContainerFluidMonitor { - - public ContainerFluidPortableCell(final InventoryPlayer ip, final IFluidPortableCell monitorable) { - super(ip, monitorable, false); - this.bindPlayerInventory(ip, 0, 0); - } - - @Override - protected boolean isWirelessTerminal() { - return true; - } - -} diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerInterfaceWireless.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerInterfaceWireless.java deleted file mode 100644 index 1f05b5cd..00000000 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerInterfaceWireless.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.glodblock.github.client.gui.container; - -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.entity.player.InventoryPlayer; - -import com.glodblock.github.client.gui.container.base.FCBaseContainer; -import com.glodblock.github.inventory.item.IWirelessTerminal; - -import appeng.container.implementations.ContainerInterfaceTerminal; -import appeng.helpers.InventoryAction; -import appeng.util.Platform; - -public class ContainerInterfaceWireless extends FCBaseContainer { - - ContainerInterfaceTerminal delegateContainer; - - public ContainerInterfaceWireless(final InventoryPlayer ip, final IWirelessTerminal monitorable) { - super(ip, monitorable); - - delegateContainer = new ContainerInterfaceTerminal(ip, monitorable); - - this.bindPlayerInventory(ip, 14, 3); - } - - @Override - public void detectAndSendChanges() { - if (Platform.isClient()) { - return; - } - super.detectAndSendChanges(); - - delegateContainer.detectAndSendChanges(); - } - - @Override - public void doAction(final EntityPlayerMP player, final InventoryAction action, final int slot, final long id) { - delegateContainer.doAction(player, action, slot, id); - } - - @Override - protected boolean isWirelessTerminal() { - return true; - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerItemMonitor.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerItemMonitor.java deleted file mode 100644 index 6a8e79e0..00000000 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerItemMonitor.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.glodblock.github.client.gui.container; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; -import net.minecraftforge.common.util.ForgeDirection; - -import com.glodblock.github.client.gui.container.base.FCContainerMonitor; -import com.glodblock.github.network.SPacketMEUpdateBuffer; - -import appeng.api.AEApi; -import appeng.api.implementations.tiles.IViewCellStorage; -import appeng.api.networking.IGrid; -import appeng.api.networking.IGridHost; -import appeng.api.networking.IGridNode; -import appeng.api.networking.energy.IEnergyGrid; -import appeng.api.networking.energy.IEnergySource; -import appeng.api.networking.security.BaseActionSource; -import appeng.api.networking.storage.IBaseMonitor; -import appeng.api.networking.storage.IStorageGrid; -import appeng.api.storage.ITerminalHost; -import appeng.api.storage.data.IAEItemStack; -import appeng.api.storage.data.IAEStack; -import appeng.api.storage.data.IItemList; -import appeng.container.slot.SlotRestrictedInput; -import appeng.me.helpers.ChannelPowerSrc; -import appeng.util.Platform; - -public class ContainerItemMonitor extends FCContainerMonitor { - - private final IItemList items = AEApi.instance().storage().createItemList(); - - public ContainerItemMonitor(final InventoryPlayer ip, final ITerminalHost monitorable) { - this(ip, monitorable, true); - } - - protected ContainerItemMonitor(final InventoryPlayer ip, final ITerminalHost monitorable, - final boolean bindInventory) { - super(ip, monitorable, bindInventory); - if (Platform.isServer()) { - this.serverCM = monitorable.getConfigManager(); - if (monitorable instanceof IGridHost) { - final IGridNode node = ((IGridHost) monitorable).getGridNode(ForgeDirection.UNKNOWN); - if (node != null) { - this.networkNode = node; - final IGrid g = node.getGrid(); - if (g != null) { - this.setPowerSource(new ChannelPowerSrc(this.networkNode, g.getCache(IEnergyGrid.class))); - IStorageGrid storageGrid = g.getCache(IStorageGrid.class); - this.monitor = storageGrid.getItemInventory(); - if (this.monitor == null) { - this.setValidContainer(false); - } else { - this.monitor.addListener(this, null); - this.setCellInventory(this.monitor); - } - } - } else { - this.setValidContainer(false); - } - } else { - this.monitor = monitorable.getItemInventory(); - this.monitor.addListener(this, null); - this.setCellInventory(this.monitor); - this.setPowerSource((IEnergySource) monitorable); - } - } else { - this.monitor = null; - } - - this.canAccessViewCells = false; - if (monitorable instanceof IViewCellStorage) { - for (int y = 0; y < 5; y++) { - this.cellView[y] = new SlotRestrictedInput( - SlotRestrictedInput.PlacableItemType.VIEW_CELL, - ((IViewCellStorage) monitorable).getViewCellStorage(), - y, - 206, - y * 18 + 8, - this.getInventoryPlayer()); - this.cellView[y].setAllowEdit(this.canAccessViewCells); - this.addSlotToContainer(this.cellView[y]); - } - } - - if (bindInventory) { - this.bindPlayerInventory(ip, 0, 0); - } - } - - @Override - protected void processItemList() { - if (!this.items.isEmpty()) { - final IItemList monitorCache = this.monitor.getStorageList(); - List toSend = new ArrayList<>(); - for (final IAEItemStack is : this.items) { - final IAEItemStack send = monitorCache.findPrecise(is); - if (send != null) { - toSend.add(send); - } else { - is.setStackSize(0); - toSend.add(is); - } - } - for (final Object c : this.crafters) { - if (c instanceof EntityPlayer) { - SPacketMEUpdateBuffer.scheduleItemUpdate((EntityPlayerMP) c, toSend); - } - } - this.items.resetStatus(); - } - } - - @Override - protected void queueInventory(final ICrafting c) { - if (Platform.isServer() && c instanceof EntityPlayer && this.monitor != null) { - final IItemList monitorCache = this.monitor.getStorageList(); - List toSend = new ArrayList<>(); - for (final IAEItemStack is : monitorCache) { - toSend.add(is); - } - SPacketMEUpdateBuffer.scheduleItemUpdate((EntityPlayerMP) c, toSend); - } - } - - @Override - public void removeCraftingFromCrafters(final ICrafting c) { - super.removeCraftingFromCrafters(c); - if (this.crafters.isEmpty() && this.monitor != null) { - this.monitor.removeListener(this); - if (c instanceof EntityPlayerMP) { - SPacketMEUpdateBuffer.clear((EntityPlayerMP) c); - } - } - } - - @Override - public void postChange(final IBaseMonitor monitor, final Iterable> change, - final BaseActionSource source) { - for (final IAEStack is : change) { - this.items.add((IAEItemStack) is); - } - } - - @Override - protected boolean isWirelessTerminal() { - return false; - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerPatternMulti.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerPatternMulti.java deleted file mode 100644 index 6199ec44..00000000 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerPatternMulti.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.glodblock.github.client.gui.container; - -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.world.World; - -import appeng.api.config.SecurityPermissions; -import appeng.api.networking.IGrid; -import appeng.api.networking.security.BaseActionSource; -import appeng.api.networking.security.IActionHost; -import appeng.api.networking.security.PlayerSource; -import appeng.api.storage.ITerminalHost; -import appeng.container.AEBaseContainer; - -public class ContainerPatternMulti extends AEBaseContainer { - - public ContainerPatternMulti(final InventoryPlayer ip, final ITerminalHost te) { - super(ip, te); - } - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - this.verifyPermissions(SecurityPermissions.CRAFT, false); - } - - public IGrid getGrid() { - final IActionHost h = ((IActionHost) this.getTarget()); - return h.getActionableNode().getGrid(); - } - - public World getWorld() { - return this.getPlayerInv().player.worldObj; - } - - public BaseActionSource getActionSrc() { - return new PlayerSource(this.getPlayerInv().player, (IActionHost) this.getTarget()); - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerPatternValueAmount.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerPatternValueAmount.java deleted file mode 100644 index 27b38762..00000000 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerPatternValueAmount.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.glodblock.github.client.gui.container; - -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; - -import appeng.api.config.SecurityPermissions; -import appeng.container.AEBaseContainer; -import appeng.container.guisync.GuiSync; -import appeng.container.slot.SlotInaccessible; -import appeng.tile.inventory.AppEngInternalInventory; - -public class ContainerPatternValueAmount extends AEBaseContainer { - - private final Slot patternValue; - - @GuiSync(11) - public int valueIndex; - - public ContainerPatternValueAmount(final InventoryPlayer ip, final Object te) { - super(ip, te); - this.patternValue = new SlotInaccessible(new AppEngInternalInventory(null, 1), 0, 34, 53); - this.addSlotToContainer(patternValue); - } - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - this.verifyPermissions(SecurityPermissions.CRAFT, false); - } - - public Slot getPatternValue() { - return patternValue; - } - - public int getValueIndex() { - return valueIndex; - } - - public void setValueIndex(int valueIndex) { - this.valueIndex = valueIndex; - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerRenamer.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerRenamer.java deleted file mode 100644 index 787abc73..00000000 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerRenamer.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.glodblock.github.client.gui.container; - -import net.minecraft.entity.player.InventoryPlayer; - -import appeng.api.storage.ITerminalHost; -import appeng.container.AEBaseContainer; - -public class ContainerRenamer extends AEBaseContainer { - - public ContainerRenamer(InventoryPlayer ip, ITerminalHost monitorable) { - super(ip, monitorable); - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java deleted file mode 100644 index 027b7b0d..00000000 --- a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java +++ /dev/null @@ -1,669 +0,0 @@ -package com.glodblock.github.client.gui.container.base; - -import static appeng.util.Platform.writeStackNBT; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraftforge.fluids.FluidStack; - -import com.glodblock.github.client.gui.container.ContainerItemMonitor; -import com.glodblock.github.common.item.ItemFluidDrop; -import com.glodblock.github.common.item.ItemFluidEncodedPattern; -import com.glodblock.github.common.item.ItemFluidPacket; -import com.glodblock.github.inventory.IPatternConsumer; -import com.glodblock.github.inventory.item.IItemPatternTerminal; -import com.glodblock.github.util.Util; - -import appeng.api.AEApi; -import appeng.api.config.Actionable; -import appeng.api.definitions.IDefinitions; -import appeng.api.implementations.ICraftingPatternItem; -import appeng.api.storage.ITerminalHost; -import appeng.api.storage.data.IAEItemStack; -import appeng.container.guisync.GuiSync; -import appeng.container.slot.IOptionalSlotHost; -import appeng.container.slot.OptionalSlotFake; -import appeng.container.slot.SlotFake; -import appeng.container.slot.SlotFakeCraftingMatrix; -import appeng.container.slot.SlotPatternTerm; -import appeng.container.slot.SlotRestrictedInput; -import appeng.helpers.IContainerCraftingPacket; -import appeng.helpers.InventoryAction; -import appeng.tile.inventory.AppEngInternalInventory; -import appeng.tile.inventory.IAEAppEngInventory; -import appeng.tile.inventory.InvOperation; -import appeng.util.Platform; -import appeng.util.item.AEFluidStack; -import appeng.util.item.AEItemStack; - -public abstract class FCContainerEncodeTerminal extends ContainerItemMonitor - implements IAEAppEngInventory, IOptionalSlotHost, IContainerCraftingPacket, IPatternConsumer { - - public static final int MULTIPLE_OF_BUTTON_CLICK = 2; - public static final int MULTIPLE_OF_BUTTON_CLICK_ON_SHIFT = 8; - protected final IItemPatternTerminal patternTerminal; - protected final AppEngInternalInventory cOut = new AppEngInternalInventory(null, 1); - protected final IInventory crafting; - protected final SlotRestrictedInput patternSlotIN; - protected final SlotRestrictedInput patternSlotOUT; - protected SlotFake[] craftingSlots; - protected OptionalSlotFake[] outputSlots; - protected SlotPatternTerm craftSlot; - - @GuiSync(97) - public boolean craftingMode = true; - - @GuiSync(96) - public boolean substitute = false; - - @GuiSync(95) - public boolean combine = false; - - @GuiSync(94) - public boolean beSubstitute = false; - - @GuiSync(93) - public boolean inverted; - - @GuiSync(92) - public int activePage = 0; - - @GuiSync(91) - public boolean prioritize = false; - - @GuiSync(90) - public boolean autoFillPattern = false; - - public FCContainerEncodeTerminal(final InventoryPlayer ip, final ITerminalHost monitorable) { - super(ip, monitorable); - this.patternTerminal = (IItemPatternTerminal) monitorable; - this.inverted = patternTerminal.isInverted(); - final IInventory patternInv = this.patternTerminal.getInventoryByName("pattern"); - this.crafting = this.patternTerminal.getInventoryByName("crafting"); - this.addSlotToContainer( - this.patternSlotIN = new SlotRestrictedInput( - SlotRestrictedInput.PlacableItemType.BLANK_PATTERN, - patternInv, - 0, - 147, - -72 - 9, - this.getInventoryPlayer())); - this.addSlotToContainer( - this.patternSlotOUT = new SlotRestrictedInput( - SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, - patternInv, - 1, - 147, - -72 + 34, - this.getInventoryPlayer())); - this.patternSlotOUT.setStackLimit(1); - } - - @Override - public void doAction(EntityPlayerMP player, InventoryAction action, int slotId, long id) { - if (this.isCraftingMode()) { - super.doAction(player, action, slotId, id); - return; - } - if (slotId < 0 || slotId >= this.inventorySlots.size()) { - super.doAction(player, action, slotId, id); - return; - } - if (action == InventoryAction.MOVE_REGION) { - super.doAction(player, InventoryAction.MOVE_REGION, slotId, id); - return; - } - if (action == InventoryAction.PICKUP_SINGLE) { - super.doAction(player, InventoryAction.PICKUP_OR_SET_DOWN, slotId, id); - return; - } - Slot slot = getSlot(slotId); - ItemStack stack = player.inventory.getItemStack(); - FluidStack fluid = Util.getFluidFromItem(stack); - - if (fluid == null || fluid.amount <= 0) { - super.doAction(player, action, slotId, id); - return; - } - - if (validPatternSlot(slot)) { - - switch (action) { - case PICKUP_OR_SET_DOWN -> { - slot.putStack(ItemFluidPacket.newStack(fluid)); - return; - } - case SPLIT_OR_PLACE_SINGLE -> { - fluid = Util.getFluidFromItem(Util.copyStackWithSize(stack, 1)); - FluidStack origin = ItemFluidPacket.getFluidStack(slot.getStack()); - if (fluid != null && fluid.equals(origin)) { - fluid.amount += origin.amount; - if (fluid.amount <= 0) fluid = null; - } - slot.putStack(ItemFluidPacket.newStack(fluid)); - return; - } - default -> {} - } - - } - super.doAction(player, action, slotId, id); - } - - protected abstract boolean validPatternSlot(Slot slot); - - @Override - public ItemStack transferStackInSlot(EntityPlayer p, int idx) { - Slot clickSlot = (Slot) this.inventorySlots.get(idx); - ItemStack is = clickSlot.getStack(); - if (is != null && !patternSlotOUT.getHasStack() - && is.stackSize == 1 - && is.getItem() instanceof ICraftingPatternItem) { - ItemStack output = is.copy(); - patternSlotOUT.putStack(output); - p.inventory.setInventorySlotContents(clickSlot.getSlotIndex(), null); - this.detectAndSendChanges(); - return null; - } else { - return super.transferStackInSlot(p, idx); - } - } - - public IItemPatternTerminal getPatternTerminal() { - return this.patternTerminal; - } - - protected static boolean canDoubleStacks(SlotFake[] slots) { - List enabledSlots = Arrays.stream(slots).filter(SlotFake::isEnabled).collect(Collectors.toList()); - long emptySlots = enabledSlots.stream().filter(s -> s.getStack() == null).count(); - long fullSlots = enabledSlots.stream().filter(s -> s.getStack() != null && s.getStack().stackSize * 2 > 127) - .count(); - return fullSlots <= emptySlots; - } - - protected static void doubleStacksInternal(SlotFake[] slots) { - List overFlowStacks = new ArrayList<>(); - List enabledSlots = Arrays.stream(slots).filter(SlotFake::isEnabled).collect(Collectors.toList()); - for (final Slot s : enabledSlots) { - ItemStack st = s.getStack(); - if (st == null) continue; - if (Util.isFluidPacket(st)) { - FluidStack fluidStack = ItemFluidPacket.getFluidStack(st); - if (fluidStack != null) { - fluidStack = ItemFluidPacket.getFluidStack(st).copy(); - if (fluidStack.amount < Integer.MAX_VALUE / 2) fluidStack.amount *= 2; - } - s.putStack(ItemFluidPacket.newStack(fluidStack)); - } else if (st.stackSize * 2 > 127) { - overFlowStacks.add(st.copy()); - } else { - st.stackSize *= 2; - s.putStack(st); - } - } - Iterator ow = overFlowStacks.iterator(); - for (final Slot s : enabledSlots) { - if (!ow.hasNext()) break; - if (s.getStack() != null) continue; - s.putStack(ow.next()); - } - assert !ow.hasNext(); - } - - protected static boolean containsItem(SlotFake[] slots) { - List enabledSlots = Arrays.stream(slots).filter(SlotFake::isEnabled).collect(Collectors.toList()); - long item = enabledSlots.stream().filter(s -> s.getStack() != null && !Util.isFluidPacket(s.getStack())) - .count(); - return item > 0; - } - - protected static boolean containsFluid(SlotFake[] slots) { - List enabledSlots = Arrays.stream(slots).filter(SlotFake::isEnabled).collect(Collectors.toList()); - long fluid = enabledSlots.stream().filter(s -> Util.isFluidPacket(s.getStack())).count(); - return fluid > 0; - } - - protected static boolean nonNullSlot(SlotFake[] slots) { - List enabledSlots = Arrays.stream(slots).filter(SlotFake::isEnabled).collect(Collectors.toList()); - long object = enabledSlots.stream().filter(s -> s.getStack() != null).count(); - return object > 0; - } - - protected ItemStack stampAuthor(ItemStack patternStack) { - if (patternStack.stackTagCompound == null) { - patternStack.stackTagCompound = new NBTTagCompound(); - } - patternStack.stackTagCompound.setString("author", getPlayerInv().player.getCommandSenderName()); - return patternStack; - } - - protected void encodeFluidPattern() { - ItemStack patternStack = AEApi.instance().definitions().items().encodedUltimatePattern().maybeStack(1).orNull(); - if (patternStack != null) { - final NBTTagCompound encodedValue = new NBTTagCompound(); - - final ItemStack[] in = this.getInputs(); - final ItemStack[] out = this.getOutputs(); - - final NBTTagList tagIn = new NBTTagList(); - final NBTTagList tagOut = new NBTTagList(); - - for (final ItemStack i : in) { - if (i != null) { - if (i.getItem() instanceof ItemFluidPacket) { - tagIn.appendTag( - writeStackNBT( - AEFluidStack.create(ItemFluidPacket.getFluidStack(i)), - new NBTTagCompound(), - true)); - } else { - tagIn.appendTag(writeStackNBT(AEItemStack.create(i), new NBTTagCompound(), true)); - } - } - } - - for (final ItemStack i : out) { - if (i != null) { - if (i.getItem() instanceof ItemFluidPacket) { - tagOut.appendTag( - writeStackNBT( - AEFluidStack.create(ItemFluidPacket.getFluidStack(i)), - new NBTTagCompound(), - true)); - } else { - tagOut.appendTag(writeStackNBT(AEItemStack.create(i), new NBTTagCompound(), true)); - } - } - } - - encodedValue.setTag("in", tagIn); - encodedValue.setTag("out", tagOut); - encodedValue.setBoolean("substitute", substitute); - encodedValue.setBoolean("beSubstitute", beSubstitute); - encodedValue.setString("author", this.getPlayerInv().player.getCommandSenderName()); - patternStack.setTagCompound(encodedValue); - patternSlotOUT.putStack(patternStack); - } - } - - protected static IAEItemStack[] collectInventory(Slot[] slots) { - IAEItemStack[] stacks = new IAEItemStack[slots.length]; - for (int i = 0; i < stacks.length; i++) { - ItemStack stack = slots[i].getStack(); - if (stack != null) { - if (stack.getItem() instanceof ItemFluidPacket) { - IAEItemStack dropStack = ItemFluidDrop.newAeStack(ItemFluidPacket.getFluidStack(stack)); - if (dropStack != null) { - stacks[i] = dropStack; - continue; - } - } - } - IAEItemStack aeStack = AEItemStack.create(stack); - stacks[i] = aeStack; - } - return stacks; - } - - @Override - public void saveChanges() { - // NO-OP - } - - public void clear() { - for (final Slot s : this.craftingSlots) { - s.putStack(null); - } - for (final Slot s : this.outputSlots) { - s.putStack(null); - } - this.detectAndSendChanges(); - } - - @Override - public void onChangeInventory(final IInventory inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { - // NO-OP - } - - public void encodeAndMoveToInventory() { - encode(); - ItemStack output = this.patternSlotOUT.getStack(); - if (output != null) { - if (!getPlayerInv().addItemStackToInventory(output)) { - getPlayerInv().player.entityDropItem(output, 0); - } - this.patternSlotOUT.putStack(null); - } - fillPattern(); - } - - public void encodeAllItemAndMoveToInventory() { - encode(); - ItemStack output = this.patternSlotOUT.getStack(); - if (output != null) { - if (this.patternSlotIN.getStack() != null) output.stackSize += this.patternSlotIN.getStack().stackSize; - if (!getPlayerInv().addItemStackToInventory(output)) { - getPlayerInv().player.entityDropItem(output, 0); - } - this.patternSlotOUT.putStack(null); - this.patternSlotIN.putStack(null); - } - fillPattern(); - } - - private void fillPattern() { - if (this.autoFillPattern && this.getHost().getItemInventory() != null) { - // try to use me network item to fill pattern input slot - final IDefinitions definitions = AEApi.instance().definitions(); - int fillStackSize = this.patternSlotIN.getHasStack() ? 64 - this.patternSlotIN.getStack().stackSize : 64; - if (fillStackSize == 0) return; - for (ItemStack blankPattern : definitions.materials().blankPattern().maybeStack(fillStackSize).asSet()) { - IAEItemStack iBlankPattern = AEApi.instance().storage().createItemStack(blankPattern); - if (this.patternSlotIN.getHasStack() && !iBlankPattern.isSameType(this.patternSlotIN.getStack())) - continue; - IAEItemStack out = this.getHost().getItemInventory() - .extractItems(iBlankPattern, Actionable.MODULATE, this.getActionSource()); - if (out != null) { - ItemStack outPattern; - if (this.patternSlotIN.getHasStack()) { - outPattern = this.patternSlotIN.getStack().copy(); - outPattern.stackSize += out.getItemStack().stackSize; - } else { - outPattern = out.getItemStack(); - } - this.patternSlotIN.putStack(outPattern); - return; - } - } - } - } - - public void encode() { - if (getInputs() != null && getOutputs() != null) { - fillPattern(); - if (isCraftingMode()) { - encodeItemPattern(); - return; - } - ItemStack stack = this.patternSlotOUT.getStack(); - if (stack == null) { - stack = this.patternSlotIN.getStack(); - if (notPattern(stack)) { - return; - } - if (stack.stackSize == 1) { - this.patternSlotIN.putStack(null); - } else { - stack.stackSize--; - } - encodeFluidPattern(); - } else if (!notPattern(stack)) { - encodeFluidPattern(); - } - } - } - - public void encodeItemPattern() { - ItemStack output = this.patternSlotOUT.getStack(); - final ItemStack[] in = this.getInputs(); - final ItemStack[] out = this.getOutputs(); - - // first check the output slots, should either be null, or a pattern - if (output != null && this.notPattern(output)) { - return; - } // if nothing is there we should snag a new pattern. - else if (output == null) { - output = this.patternSlotIN.getStack(); - if (this.notPattern(output)) { - return; // no blanks. - } - - // remove one, and clear the input slot. - output.stackSize--; - if (output.stackSize == 0) { - this.patternSlotIN.putStack(null); - } - - // add a new encoded pattern. - for (final ItemStack encodedPatternStack : AEApi.instance().definitions().items().encodedPattern() - .maybeStack(1).asSet()) { - output = encodedPatternStack; - } - } else if (output.getItem() instanceof ItemFluidEncodedPattern) { - for (final ItemStack encodedPatternStack : AEApi.instance().definitions().items().encodedPattern() - .maybeStack(1).asSet()) { - output = encodedPatternStack; - } - } - - // encode the slot. - final NBTTagCompound encodedValue = new NBTTagCompound(); - - final NBTTagList tagIn = new NBTTagList(); - final NBTTagList tagOut = new NBTTagList(); - - for (final ItemStack i : in) { - tagIn.appendTag(this.createItemTag(i)); - } - - for (final ItemStack i : out) { - tagOut.appendTag(this.createItemTag(i)); - } - - encodedValue.setTag("in", tagIn); - encodedValue.setTag("out", tagOut); - encodedValue.setBoolean("crafting", this.craftingMode); - encodedValue.setBoolean("substitute", this.substitute); - encodedValue.setBoolean("beSubstitute", this.beSubstitute); - encodedValue.setBoolean("prioritize", this.prioritize); - output.setTagCompound(encodedValue); - stampAuthor(output); - this.patternSlotOUT.putStack(output); - } - - protected ItemStack[] getInputs() { - final ArrayList input = new ArrayList<>(); - for (SlotFake craftingSlot : this.craftingSlots) { - input.add(craftingSlot.getStack()); - } - if (input.stream().anyMatch(Objects::nonNull)) { - return input.toArray(new ItemStack[0]); - } - return null; - } - - protected ItemStack[] getOutputs() { - final ArrayList output = new ArrayList<>(); - for (final SlotFake outputSlot : this.outputSlots) { - output.add(outputSlot.getStack()); - } - if (output.stream().anyMatch(Objects::nonNull)) { - return output.toArray(new ItemStack[0]); - } - return null; - } - - protected boolean notPattern(final ItemStack output) { - if (output == null) { - return true; - } - if (output.getItem() instanceof ItemFluidEncodedPattern) { - return false; - } - final IDefinitions definitions = AEApi.instance().definitions(); - - boolean isPattern = definitions.items().encodedPattern().isSameAs(output); - isPattern |= definitions.materials().blankPattern().isSameAs(output); - - boolean isUltimatePattern = definitions.items().encodedUltimatePattern().isSameAs(output); - isUltimatePattern |= definitions.materials().blankPattern().isSameAs(output); - - return !isPattern && !isUltimatePattern; - } - - protected NBTBase createItemTag(final ItemStack i) { - final NBTTagCompound c = new NBTTagCompound(); - if (i != null) { - Util.writeItemStackToNBT(i, c); - } - return c; - } - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - if (Platform.isServer()) { - this.substitute = this.patternTerminal.isSubstitution(); - this.combine = this.patternTerminal.shouldCombine(); - this.beSubstitute = this.patternTerminal.canBeSubstitute(); - this.prioritize = this.patternTerminal.isPrioritize(); - this.autoFillPattern = this.patternTerminal.isAutoFillPattern(); - } - } - - @Override - public void onSlotChange(final Slot s) { - if (s == this.patternSlotOUT && Platform.isServer()) { - for (final Object crafter : this.crafters) { - final ICrafting icrafting = (ICrafting) crafter; - - for (final Object g : this.inventorySlots) { - if (g instanceof OptionalSlotFake || g instanceof SlotFakeCraftingMatrix) { - final Slot sri = (Slot) g; - icrafting.sendSlotContents(this, sri.slotNumber, sri.getStack()); - } - } - ((EntityPlayerMP) icrafting).isChangingQuantityOnly = false; - } - this.detectAndSendChanges(); - } - } - - @Override - public IInventory getInventoryByName(final String name) { - if (name.equals("player")) { - return this.getInventoryPlayer(); - } - return this.patternTerminal.getInventoryByName(name); - } - - @Override - public boolean useRealItems() { - return false; - } - - public void doubleStacks(int val) { - multiplyOrDivideStacks( - ((val & 1) != 0 ? MULTIPLE_OF_BUTTON_CLICK_ON_SHIFT : MULTIPLE_OF_BUTTON_CLICK) - * ((val & 2) != 0 ? -1 : 1)); - } - - static boolean canMultiplyOrDivide(SlotFake[] slots, int mult) { - if (mult > 0) { - for (Slot s : slots) { - ItemStack st = s.getStack(); - if (st == null) continue; - final long count; - if (st.getItem() instanceof ItemFluidPacket) { - count = ItemFluidPacket.getFluidAmount(st); - } else { - count = s.getStack().stackSize; - } - long result = count * mult; - if (result > Integer.MAX_VALUE) { - return false; - } - } - return true; - } else if (mult < 0) { - mult = Math.abs(mult); - for (Slot s : slots) { - ItemStack st = s.getStack(); - if (st == null) continue; - final long count; - if (st.getItem() instanceof ItemFluidPacket) { - count = ItemFluidPacket.getFluidAmount(st); - } else { - count = s.getStack().stackSize; - } - if (count % mult != 0) { - return false; - } - } - return true; - } - return false; - } - - static void multiplyOrDivideStacksInternal(SlotFake[] slots, int mult) { - List enabledSlots = Arrays.stream(slots).filter(SlotFake::isEnabled).collect(Collectors.toList()); - if (mult > 0) { - for (final Slot s : enabledSlots) { - ItemStack st = s.getStack(); - if (st != null) { - if (st.getItem() instanceof ItemFluidPacket) { - ItemFluidPacket.setFluidAmount(st, ItemFluidPacket.getFluidAmount(st) * mult); - } else { - st.stackSize *= mult; - s.putStack(st); - } - } - } - } else if (mult < 0) { - mult = Math.abs(mult); - for (final Slot s : enabledSlots) { - ItemStack st = s.getStack(); - if (st != null) { - if (st.getItem() instanceof ItemFluidPacket) { - ItemFluidPacket.setFluidAmount(st, ItemFluidPacket.getFluidAmount(st) / mult); - } else { - st.stackSize /= mult; - s.putStack(st); - } - } - } - } - } - - /** - * Multiply or divide a number - * - * @param multi Positive numbers are multiplied and negative numbers are divided - */ - public void multiplyOrDivideStacks(int multi) { - if (!isCraftingMode()) { - if (canMultiplyOrDivide(this.craftingSlots, multi) && canMultiplyOrDivide(this.outputSlots, multi)) { - multiplyOrDivideStacksInternal(this.craftingSlots, multi); - multiplyOrDivideStacksInternal(this.outputSlots, multi); - } - this.detectAndSendChanges(); - } - } - - @Override - public void acceptPattern(IAEItemStack[] inputs, IAEItemStack[] outputs) { - if (this.patternTerminal != null) { - this.patternTerminal.onChangeCrafting(inputs, outputs); - } - } - - public boolean isCraftingMode() { - return this.craftingMode; - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java deleted file mode 100644 index 97b6d0c1..00000000 --- a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.glodblock.github.client.gui.container.base; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; -import net.minecraft.item.ItemStack; - -import com.glodblock.github.inventory.item.BaseWirelessInventory; -import com.glodblock.github.inventory.item.IWirelessTerminal; -import com.glodblock.github.network.SPacketMEUpdateBuffer; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; - -import appeng.api.config.Actionable; -import appeng.api.config.CraftingAllow; -import appeng.api.config.PinsState; -import appeng.api.config.PowerMultiplier; -import appeng.api.config.SecurityPermissions; -import appeng.api.config.Settings; -import appeng.api.config.SortDir; -import appeng.api.config.SortOrder; -import appeng.api.config.TypeFilter; -import appeng.api.config.ViewItems; -import appeng.api.networking.IGridNode; -import appeng.api.networking.crafting.ICraftingCPU; -import appeng.api.networking.crafting.ICraftingGrid; -import appeng.api.networking.energy.IEnergyGrid; -import appeng.api.networking.security.PlayerSource; -import appeng.api.storage.IMEMonitor; -import appeng.api.storage.IMEMonitorHandlerReceiver; -import appeng.api.storage.ITerminalHost; -import appeng.api.storage.ITerminalPins; -import appeng.api.storage.StorageChannel; -import appeng.api.storage.data.IAEStack; -import appeng.api.util.IConfigManager; -import appeng.api.util.IConfigurableObject; -import appeng.container.guisync.GuiSync; -import appeng.container.slot.SlotRestrictedInput; -import appeng.core.AELog; -import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketValueConfig; -import appeng.helpers.IPinsHandler; -import appeng.helpers.WirelessTerminalGuiObject; -import appeng.items.contents.PinsHandler; -import appeng.util.ConfigManager; -import appeng.util.IConfigManagerHost; -import appeng.util.Platform; - -public abstract class FCContainerMonitor> extends FCBaseContainer - implements IConfigManagerHost, IConfigurableObject, IMEMonitorHandlerReceiver, IPinsHandler { - - protected final SlotRestrictedInput[] cellView = new SlotRestrictedInput[5]; - protected final IConfigManager clientCM; - protected final ITerminalHost host; - - protected PinsHandler pinsHandler = null; - - @GuiSync(99) - public boolean canAccessViewCells = false; - - @GuiSync(98) - public boolean hasPower = false; - - protected IConfigManagerHost gui; - protected IConfigManager serverCM; - protected IGridNode networkNode; - protected IMEMonitor monitor; - - public FCContainerMonitor(final InventoryPlayer ip, final ITerminalHost monitorable) { - this(ip, monitorable, true); - } - - protected FCContainerMonitor(final InventoryPlayer ip, final ITerminalHost monitorable, - final boolean bindInventory) { - super(ip, monitorable); - this.host = monitorable; - this.clientCM = new ConfigManager(this); - this.clientCM.registerSetting(Settings.SORT_BY, SortOrder.NAME); - this.clientCM.registerSetting(Settings.VIEW_MODE, ViewItems.ALL); - this.clientCM.registerSetting(Settings.SORT_DIRECTION, SortDir.ASCENDING); - this.clientCM.registerSetting(Settings.TYPE_FILTER, TypeFilter.ALL); - this.clientCM.registerSetting(Settings.PINS_STATE, PinsState.DISABLED); // use for GUI - - if (Platform.isServer()) { - if (monitorable instanceof ITerminalPins t && !(monitorable instanceof BaseWirelessInventory bwi - && bwi.getChannel() == StorageChannel.FLUIDS)) { - pinsHandler = t.getPinsHandler(ip.player); - } - } - } - - public IMEMonitor getMonitor() { - return this.monitor; - } - - public IGridNode getNetworkNode() { - return this.networkNode; - } - - @Override - public void detectAndSendChanges() { - if (Platform.isServer()) { - if (isInvalid()) { - this.setValidContainer(false); - } - if (this.serverCM != null) { - for (final Settings set : this.serverCM.getSettings()) { - final Enum sideLocal = this.serverCM.getSetting(set); - final Enum sideRemote = this.clientCM.getSetting(set); - - if (sideLocal != sideRemote) { - this.clientCM.putSetting(set, sideLocal); - for (final Object crafter : this.crafters) { - try { - NetworkHandler.instance.sendTo( - new PacketValueConfig(set.name(), sideLocal.name()), - (EntityPlayerMP) crafter); - } catch (final IOException e) { - AELog.debug(e); - } - } - } - } - } - - if (pinsHandler != null) { - if (clientCM.getSetting(Settings.PINS_STATE) != pinsHandler.getPinsState()) { - this.clientCM.putSetting(Settings.PINS_STATE, pinsHandler.getPinsState()); - updatePins(true); - } else { - updatePins(false); - } - } - - processItemList(); - this.updatePowerStatus(); - final boolean oldAccessible = this.canAccessViewCells; - this.canAccessViewCells = this.host instanceof WirelessTerminalGuiObject - || this.host instanceof IWirelessTerminal - || this.hasAccess(SecurityPermissions.BUILD, false); - if (this.canAccessViewCells != oldAccessible) { - for (int y = 0; y < 5; y++) { - if (this.cellView[y] != null) { - this.cellView[y].setAllowEdit(this.canAccessViewCells); - } - } - } - super.detectAndSendChanges(); - } - } - - private int lastUpdate = 0; - - public void updatePins(boolean forceUpdate) { - if (pinsHandler == null || !(host instanceof ITerminalPins itp)) return; - - boolean isActive = pinsHandler.getPinsState() != PinsState.DISABLED; - ++lastUpdate; - if (!forceUpdate && lastUpdate <= 20) return; - lastUpdate = 0; - if (isActive) { - final ICraftingGrid cc = itp.getGrid().getCache(ICraftingGrid.class); - final ImmutableList cpuList = cc.getCpus().asList(); - - List> craftedItems = new ArrayList<>(); - - // fetch the first available crafting output - for (int i = 0; i < cpuList.size(); i++) { - ICraftingCPU cpu = cpuList.get(i); - if (cpu.getCraftingAllowMode() != CraftingAllow.ONLY_NONPLAYER && cpu.getFinalOutput() != null - && cpu.getCurrentJobSource() instanceof PlayerSource src - && src.player == pinsHandler.getPlayer()) { - if (craftedItems.contains(cpu.getFinalOutput())) { - continue; // skip if already added - } - if (cpu.isBusy()) craftedItems.add(0, cpu.getFinalOutput().copy()); - else craftedItems.add(cpu.getFinalOutput().copy()); - } - } - - pinsHandler.addItemsToPins(craftedItems); - } - pinsHandler.update(forceUpdate); - onListUpdate(); // notify the repo that the pins have changed - } - - @Override - public void setPin(IAEStack is, int idx) { - if (pinsHandler == null || !(host instanceof ITerminalPins itp)) return; - - if (is == null) { - final ICraftingGrid cc = itp.getGrid().getCache(ICraftingGrid.class); - final ImmutableSet cpuSet = cc.getCpus(); - for (ICraftingCPU cpu : cpuSet) { - if (cpu.getCraftingAllowMode() != CraftingAllow.ONLY_NONPLAYER && cpu.getFinalOutput() != null - && cpu.getFinalOutput().isSameType(getPin(idx))) { - if (!cpu.isBusy()) { - cpu.resetFinalOutput(); - } else { - return; - } - } - } - } - pinsHandler.setPin(idx, is); - updatePins(true); - } - - @Override - public IAEStack getPin(int idx) { - if (pinsHandler == null) return null; - return pinsHandler.getPin(idx); - } - - public void setPinsState(PinsState pinsState) { - if (pinsHandler == null) return; - clientCM.putSetting(Settings.PINS_STATE, pinsState); - pinsHandler.setPinsState(pinsState); - updatePins(true); - } - - public PinsState getPinsState() { - return pinsHandler != null ? pinsHandler.getPinsState() : PinsState.DISABLED; - } - - public PinsHandler getPinsHandler() { - return pinsHandler; - } - - protected abstract void processItemList(); - - protected boolean isInvalid() { - return this.monitor == null; - } - - protected void updatePowerStatus() { - try { - if (this.networkNode != null) { - this.setPowered(this.networkNode.isActive()); - } else if (this.getPowerSource() instanceof IEnergyGrid) { - this.setPowered(((IEnergyGrid) this.getPowerSource()).isNetworkPowered()); - } else { - this.setPowered( - this.getPowerSource().extractAEPower(1, Actionable.SIMULATE, PowerMultiplier.CONFIG) > 0.8); - } - } catch (final Throwable ignore) {} - } - - @Override - public void onUpdate(final String field, final Object oldValue, final Object newValue) { - if (field.equals("canAccessViewCells")) { - for (int y = 0; y < 5; y++) { - if (this.cellView[y] != null) { - this.cellView[y].setAllowEdit(this.canAccessViewCells); - } - } - } - super.onUpdate(field, oldValue, newValue); - } - - @Override - public void addCraftingToCrafters(final ICrafting c) { - super.addCraftingToCrafters(c); - this.queueInventory(c); - } - - protected abstract void queueInventory(final ICrafting c); - - @Override - public void onContainerClosed(final EntityPlayer player) { - super.onContainerClosed(player); - if (this.monitor != null) { - this.monitor.removeListener(this); - if (player instanceof EntityPlayerMP && Platform.isServer()) { - SPacketMEUpdateBuffer.clear((EntityPlayerMP) player); - } - - } - } - - @Override - public IConfigManager getConfigManager() { - if (Platform.isServer()) { - return this.serverCM; - } - return this.clientCM; - } - - public ItemStack[] getViewCells() { - final ItemStack[] list = new ItemStack[this.cellView.length]; - for (int x = 0; x < this.cellView.length; x++) { - list[x] = this.cellView[x].getStack(); - } - return list; - } - - public SlotRestrictedInput getCellViewSlot(final int index) { - return this.cellView[index]; - } - - public boolean isPowered() { - return this.hasPower; - } - - protected void setPowered(final boolean isPowered) { - this.hasPower = isPowered; - } - - protected IConfigManagerHost getGui() { - return this.gui; - } - - public void setGui(@Nonnull final IConfigManagerHost gui) { - this.gui = gui; - } - - @Override - public boolean isValid(Object verificationToken) { - return true; - } - - @Override - public void onListUpdate() { - for (final Object c : this.crafters) { - if (c instanceof final ICrafting cr) { - this.queueInventory(cr); - } - } - } - - @Override - public void updateSetting(final IConfigManager manager, @SuppressWarnings("rawtypes") final Enum settingName, - @SuppressWarnings("rawtypes") final Enum newValue) { - if (this.getGui() != null) { - this.getGui().updateSetting(manager, settingName, newValue); - } - } -} diff --git a/src/main/java/com/glodblock/github/common/item/ItemBaseWirelessTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemBaseWirelessTerminal.java index 219fe7f2..2d51d5c9 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemBaseWirelessTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemBaseWirelessTerminal.java @@ -7,6 +7,8 @@ import static com.glodblock.github.util.Util.hasInfinityBoosterCard; import java.util.List; +import appeng.api.implementations.guiobjects.IGuiItem; +import appeng.api.implementations.guiobjects.IGuiItemObject; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -27,6 +29,7 @@ import appeng.api.features.ILocatable; import appeng.api.features.IWirelessTermHandler; import appeng.api.features.IWirelessTermRegistry; import appeng.core.localization.PlayerMessages; +import appeng.core.sync.GuiBridge; import appeng.items.tools.powered.ToolWirelessTerminal; import appeng.util.Platform; import cpw.mods.fml.relauncher.Side; @@ -34,12 +37,12 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemBaseWirelessTerminal extends ToolWirelessTerminal implements IItemInventory { - protected GuiType type; + protected Object type; public static String infinityBoosterCard = "infinityBoosterCard"; public static String infinityEnergyCard = "InfinityEnergyCard"; public static String restockItems = "restock"; - public ItemBaseWirelessTerminal(GuiType t) { + public ItemBaseWirelessTerminal(Object t) { super(); this.type = t; } @@ -70,12 +73,17 @@ public class ItemBaseWirelessTerminal extends ToolWirelessTerminal implements II return item; } if (handler.hasPower(player, 0.5, item)) { - InventoryHandler.openGui( - player, - w, - new BlockPos(player.inventory.currentItem, 0, 0), - ForgeDirection.UNKNOWN, - this.guiGuiType(item)); + Object gui = this.guiGuiType(item); + if (gui instanceof GuiType gt) { + InventoryHandler.openGui( + player, + w, + new BlockPos(player.inventory.currentItem, 0, 0), + ForgeDirection.UNKNOWN, + gt); + } else if (gui instanceof GuiBridge gb) { + Platform.openGUI(player, null, null, gb); + } } else { player.addChatMessage(PlayerMessages.DeviceNotPowered.toChat()); } @@ -129,7 +137,7 @@ public class ItemBaseWirelessTerminal extends ToolWirelessTerminal implements II return null; } - public GuiType guiGuiType(ItemStack stack) { + public Object guiGuiType(ItemStack stack) { return this.type; } diff --git a/src/main/java/com/glodblock/github/common/item/ItemPortableFluidCell.java b/src/main/java/com/glodblock/github/common/item/ItemPortableFluidCell.java index 6cec6095..d7cfe191 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemPortableFluidCell.java +++ b/src/main/java/com/glodblock/github/common/item/ItemPortableFluidCell.java @@ -11,7 +11,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import com.glodblock.github.FluidCraft; import com.glodblock.github.api.FluidCraftAPI; @@ -21,12 +20,9 @@ import com.glodblock.github.common.storage.IFluidCellInventoryHandler; import com.glodblock.github.common.storage.IStorageFluidCell; import com.glodblock.github.common.tabs.FluidCraftingTabs; import com.glodblock.github.inventory.FluidCellConfig; -import com.glodblock.github.inventory.InventoryHandler; -import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.inventory.item.IItemInventory; import com.glodblock.github.inventory.item.PortableFluidCellInventory; import com.glodblock.github.loader.IRegister; -import com.glodblock.github.util.BlockPos; import com.glodblock.github.util.NameConst; import com.glodblock.github.util.RenderUtil; import com.google.common.base.Optional; @@ -57,12 +53,10 @@ public class ItemPortableFluidCell extends AEBasePoweredItem @Override public ItemStack onItemRightClick(final ItemStack item, final World w, final EntityPlayer player) { - InventoryHandler.openGui( - player, - w, - new BlockPos(player.inventory.currentItem, 0, 0), - ForgeDirection.UNKNOWN, - GuiType.PORTABLE_FLUID_CELL); + /* + * InventoryHandler.openGui( player, w, new BlockPos(player.inventory.currentItem, 0, 0), + * ForgeDirection.UNKNOWN, GuiType.PORTABLE_FLUID_CELL); + */ return item; } diff --git a/src/main/java/com/glodblock/github/common/item/ItemWirelessFluidTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessFluidTerminal.java deleted file mode 100644 index cc2a1348..00000000 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessFluidTerminal.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.glodblock.github.common.item; - -import java.util.EnumSet; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.common.tabs.FluidCraftingTabs; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.WirelessFluidTerminalInventory; -import com.glodblock.github.loader.IRegister; -import com.glodblock.github.util.NameConst; -import com.glodblock.github.util.Util; - -import appeng.api.AEApi; -import appeng.api.networking.IGridNode; -import appeng.core.features.AEFeature; -import appeng.core.localization.PlayerMessages; -import cpw.mods.fml.common.registry.GameRegistry; - -public class ItemWirelessFluidTerminal extends ItemBaseWirelessTerminal - implements IRegister { - - public ItemWirelessFluidTerminal() { - super(GuiType.WIRELESS_FLUID_TERMINAL); - AEApi.instance().registries().wireless().registerWirelessHandler(this); - this.setFeature(EnumSet.of(AEFeature.WirelessAccessTerminal, AEFeature.PoweredTools)); - setUnlocalizedName(NameConst.ITEM_WIRELESS_FLUID_TERMINAL); - setTextureName(FluidCraft.resource(NameConst.ITEM_WIRELESS_FLUID_TERMINAL).toString()); - } - - @Override - public ItemWirelessFluidTerminal register() { - GameRegistry.registerItem(this, NameConst.ITEM_WIRELESS_FLUID_TERMINAL, FluidCraft.MODID); - setCreativeTab(FluidCraftingTabs.INSTANCE); - return this; - } - - @Override - public Object getInventory(ItemStack stack, World world, int x, int y, int z, EntityPlayer player) { - try { - IGridNode gridNode = Util.getWirelessGrid(stack); - return new WirelessFluidTerminalInventory(stack, x, gridNode, player); - } catch (Exception e) { - player.addChatMessage(PlayerMessages.OutOfRange.toChat()); - } - return null; - } - -} diff --git a/src/main/java/com/glodblock/github/common/item/ItemWirelessInterfaceTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessInterfaceTerminal.java index 4b159406..2f196144 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessInterfaceTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessInterfaceTerminal.java @@ -8,7 +8,6 @@ import net.minecraft.world.World; import com.glodblock.github.FluidCraft; import com.glodblock.github.common.tabs.FluidCraftingTabs; -import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.inventory.item.WirelessInterfaceTerminalInventory; import com.glodblock.github.loader.IRegister; import com.glodblock.github.util.NameConst; @@ -18,13 +17,14 @@ import appeng.api.AEApi; import appeng.api.networking.IGridNode; import appeng.core.features.AEFeature; import appeng.core.localization.PlayerMessages; +import appeng.core.sync.GuiBridge; import cpw.mods.fml.common.registry.GameRegistry; public class ItemWirelessInterfaceTerminal extends ItemBaseWirelessTerminal implements IRegister { public ItemWirelessInterfaceTerminal() { - super(GuiType.WIRELESS_INTERFACE_TERMINAL); + super(GuiBridge.GUI_INTERFACE_TERMINAL); AEApi.instance().registries().wireless().registerWirelessHandler(this); this.setFeature(EnumSet.of(AEFeature.WirelessAccessTerminal, AEFeature.PoweredTools)); setUnlocalizedName(NameConst.ITEM_WIRELESS_INTERFACE_TERMINAL); diff --git a/src/main/java/com/glodblock/github/common/item/ItemWirelessPatternTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessPatternTerminal.java index 28b50edd..acba6689 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessPatternTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessPatternTerminal.java @@ -8,8 +8,6 @@ import net.minecraft.world.World; import com.glodblock.github.FluidCraft; import com.glodblock.github.common.tabs.FluidCraftingTabs; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory; import com.glodblock.github.loader.IRegister; import com.glodblock.github.util.NameConst; import com.glodblock.github.util.Util; @@ -18,13 +16,14 @@ import appeng.api.AEApi; import appeng.api.networking.IGridNode; import appeng.core.features.AEFeature; import appeng.core.localization.PlayerMessages; +import appeng.core.sync.GuiBridge; import cpw.mods.fml.common.registry.GameRegistry; public class ItemWirelessPatternTerminal extends ItemBaseWirelessTerminal implements IRegister { public ItemWirelessPatternTerminal() { - super(GuiType.WIRELESS_FLUID_PATTERN_TERMINAL); + super(GuiBridge.GUI_PATTERN_TERMINAL); AEApi.instance().registries().wireless().registerWirelessHandler(this); this.setFeature(EnumSet.of(AEFeature.WirelessAccessTerminal, AEFeature.PoweredTools)); setUnlocalizedName(NameConst.ITEM_WIRELESS_FLUID_PATTERN_TERMINAL); @@ -42,7 +41,7 @@ public class ItemWirelessPatternTerminal extends ItemBaseWirelessTerminal public Object getInventory(ItemStack stack, World world, int x, int y, int z, EntityPlayer player) { try { IGridNode gridNode = Util.getWirelessGrid(stack); - return new WirelessPatternTerminalInventory(stack, x, gridNode, player); + // return new WirelessPatternTerminalInventory(stack, x, gridNode, player); } catch (Exception e) { player.addChatMessage(PlayerMessages.OutOfRange.toChat()); } diff --git a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java index 35110c3d..e548c96b 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java @@ -7,7 +7,11 @@ import java.util.Arrays; import java.util.EnumSet; import java.util.List; -import appeng.core.sync.GuiBridge; +import com.glodblock.github.inventory.item.WirelessCraftingTerminalInventory; +import com.glodblock.github.inventory.item.WirelessFluidTerminalInventory; +import com.glodblock.github.inventory.item.WirelessInterfaceTerminalInventory; +import com.glodblock.github.inventory.item.WirelessPatternTerminalExInventory; +import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -24,14 +28,9 @@ import com.glodblock.github.FluidCraft; import com.glodblock.github.common.tabs.FluidCraftingTabs; import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.WirelessCraftingTerminalInventory; -import com.glodblock.github.inventory.item.WirelessFluidTerminalInventory; -import com.glodblock.github.inventory.item.WirelessInterfaceTerminalInventory; import com.glodblock.github.inventory.item.WirelessLevelTerminalInventory; import com.glodblock.github.inventory.item.WirelessMagnet; import com.glodblock.github.inventory.item.WirelessMagnetCardFilterInventory; -import com.glodblock.github.inventory.item.WirelessPatternTerminalExInventory; -import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory; import com.glodblock.github.loader.IRegister; import com.glodblock.github.network.CPacketSwitchGuis; import com.glodblock.github.util.BlockPos; @@ -43,6 +42,7 @@ import appeng.api.AEApi; import appeng.api.networking.IGridNode; import appeng.core.features.AEFeature; import appeng.core.localization.PlayerMessages; +import appeng.core.sync.GuiBridge; import appeng.util.Platform; import baubles.api.BaubleType; import baubles.api.BaublesApi; @@ -71,7 +71,7 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal guis.add(GuiBridge.GUI_INTERFACE_TERMINAL); guis.add(GuiType.WIRELESS_LEVEL_TERMINAL); if (ModAndClassUtil.ThE) { - guis.add(GuiType.WIRELESS_ESSENTIA_TERMINAL); + // guis.add(GuiType.WIRELESS_ESSENTIA_TERMINAL); } } @@ -106,7 +106,7 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal public Object getInventory(ItemStack stack, World world, int x, int y, int z, EntityPlayer player) { try { IGridNode gridNode = Util.getWirelessGrid(stack); - final GuiType gui; + final Object gui; if (Util.GuiHelper.decodeType(y).getLeft() == Util.GuiHelper.GuiType.ITEM && z == -1) { gui = GuiType.WIRELESS_MAGNET_FILTER; } else if (Util.GuiHelper.decodeType(y).getLeft() == Util.GuiHelper.GuiType.ITEM && z > 0) { @@ -114,7 +114,7 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal } else { gui = readMode(stack); } - if (gui == GuiType.WIRELESS_FLUID_PATTERN_TERMINAL) { + /*if (gui == GuiType.WIRELESS_FLUID_PATTERN_TERMINAL) { return new WirelessPatternTerminalInventory(stack, x, gridNode, player); } else if (gui == GuiType.WIRELESS_CRAFTING_TERMINAL) { return new WirelessCraftingTerminalInventory(stack, x, gridNode, player); @@ -133,7 +133,7 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal } else { this.setMode(GuiType.WIRELESS_FLUID_TERMINAL, stack); // set as default mode return new WirelessFluidTerminalInventory(stack, x, gridNode, player); - } + }*/ } catch (Exception e) { player.addChatMessage(PlayerMessages.OutOfRange.toChat()); } @@ -150,23 +150,23 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal return super.onItemRightClick(item, w, player); } - public static GuiType readMode(ItemStack stack) { + public static Object readMode(ItemStack stack) { NBTTagCompound data = Platform.openNbtData(stack); if (data.hasKey(MODE)) { String GUI = data.getString(MODE); try { return GuiType.valueOf(GUI); } catch (IllegalArgumentException e) { - return GuiType.WIRELESS_CRAFTING_TERMINAL; + return GuiBridge.GUI_ME; } } else { - return GuiType.WIRELESS_CRAFTING_TERMINAL; + return GuiBridge.GUI_ME; } } - public void setNext(GuiType type, ItemStack stack) { + public void setNext(Object type, ItemStack stack) { boolean f = false; - for (GuiType g : guis) { + for (Object g : guis) { if (f) { setMode(g.toString(), stack); return; @@ -183,11 +183,11 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal data.setString(MODE, mode); } - public void setMode(GuiType mode, ItemStack stack) { + public void setMode(Object mode, ItemStack stack) { this.setMode(mode.toString(), stack); } - public static void switchTerminal(EntityPlayer player, GuiType guiType) { + public static void switchTerminal(EntityPlayer player, Object guiType) { ImmutablePair term = Util.getUltraWirelessTerm(player); if (term == null) return; if (term.getRight().getItem() instanceof ItemWirelessUltraTerminal) { @@ -196,17 +196,21 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal if (Platform.isClient()) { FluidCraft.proxy.netHandler.sendToServer(new CPacketSwitchGuis(guiType, true)); } else { - InventoryHandler.openGui( - player, - player.worldObj, - new BlockPos( - term.getLeft(), - Util.GuiHelper.encodeType( - guis.indexOf(GuiType.valueOf(guiType.toString())), - Util.GuiHelper.GuiType.ITEM), - 1), - ForgeDirection.UNKNOWN, - guiType); + if (guiType instanceof GuiType gt) { + InventoryHandler.openGui( + player, + player.worldObj, + new BlockPos( + term.getLeft(), + Util.GuiHelper.encodeType( + guis.indexOf(GuiType.valueOf(guiType.toString())), + Util.GuiHelper.GuiType.ITEM), + 1), + ForgeDirection.UNKNOWN, + gt); + } else if (guiType instanceof GuiBridge gb) { + Platform.openGUI(player, null, null, gb); + } } } @@ -219,12 +223,12 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal return false; } - public static List getGuis() { + public static List getGuis() { return guis; } @Override - public GuiType guiGuiType(ItemStack stack) { + public Object guiGuiType(ItemStack stack) { return readMode(stack); } diff --git a/src/main/java/com/glodblock/github/common/storage/FluidCellHandler.java b/src/main/java/com/glodblock/github/common/storage/FluidCellHandler.java index eb0784e2..b7831ab3 100644 --- a/src/main/java/com/glodblock/github/common/storage/FluidCellHandler.java +++ b/src/main/java/com/glodblock/github/common/storage/FluidCellHandler.java @@ -5,10 +5,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; -import com.glodblock.github.inventory.InventoryHandler; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.util.BlockPos; - import appeng.api.implementations.tiles.IChestOrDrive; import appeng.api.storage.ICellHandler; import appeng.api.storage.IMEInventory; @@ -55,8 +51,8 @@ public class FluidCellHandler implements ICellHandler { final StorageChannel chan) { if (chan == StorageChannel.FLUIDS) { if (chest instanceof TileEntity te) { - InventoryHandler - .openGui(player, te.getWorldObj(), new BlockPos(te), chest.getUp(), GuiType.FLUID_TERMINAL); + // InventoryHandler.openGui(player, te.getWorldObj(), new BlockPos(te), chest.getUp(), + // GuiType.FLUID_TERMINAL); } } } diff --git a/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooks.java b/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooks.java index 4130ce06..7a98dd7b 100644 --- a/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooks.java +++ b/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooks.java @@ -4,7 +4,6 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import com.glodblock.github.client.gui.GuiFluidCraftConfirm; import com.glodblock.github.common.item.ItemFluidDrop; import com.glodblock.github.common.item.ItemFluidPacket; @@ -26,11 +25,4 @@ public class CoreModHooks { } return null; } - - public static boolean shouldShowTooltip(GuiContainer gui) { - if (gui instanceof GuiFluidCraftConfirm guiCraftConfirm) { - return guiCraftConfirm.getHoveredStack() == null; - } - return true; - } } diff --git a/src/main/java/com/glodblock/github/crossmod/extracells/ItemReplacements.java b/src/main/java/com/glodblock/github/crossmod/extracells/ItemReplacements.java index 26eda941..86cf8bdb 100644 --- a/src/main/java/com/glodblock/github/crossmod/extracells/ItemReplacements.java +++ b/src/main/java/com/glodblock/github/crossmod/extracells/ItemReplacements.java @@ -87,7 +87,6 @@ public class ItemReplacements { GameRegistry.registerItem(voidCell, "ec2placeholder.storage.physical.void"); registry.put("extracells:storage.physical.void", voidCell); deprecateItem("pattern.fluid", ItemAndBlockHolder.PATTERN); - deprecateWireless("terminal.fluid.wireless", ItemAndBlockHolder.WIRELESS_FLUID_TERM); /* Storage casings */ deprecateItem("storage.casing", 0, AEApi.instance().definitions().materials().emptyAdvancedStorageCell()); diff --git a/src/main/java/com/glodblock/github/inventory/InventoryHandler.java b/src/main/java/com/glodblock/github/inventory/InventoryHandler.java index 045ed173..384f953c 100644 --- a/src/main/java/com/glodblock/github/inventory/InventoryHandler.java +++ b/src/main/java/com/glodblock/github/inventory/InventoryHandler.java @@ -11,6 +11,7 @@ import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.network.CPacketSwitchGuis; import com.glodblock.github.util.BlockPos; +import appeng.core.sync.GuiBridge; import appeng.util.Platform; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.relauncher.Side; @@ -18,21 +19,26 @@ import cpw.mods.fml.relauncher.SideOnly; public class InventoryHandler implements IGuiHandler { - public static void switchGui(GuiType guiType) { + public static void switchGui(Object guiType) { FluidCraft.proxy.netHandler.sendToServer(new CPacketSwitchGuis(guiType)); } - public static void openGui(EntityPlayer player, World world, BlockPos pos, ForgeDirection face, GuiType guiType) { + public static void openGui(EntityPlayer player, World world, BlockPos pos, ForgeDirection face, Object guiType) { if (Platform.isClient()) { return; } - player.openGui( - FluidCraft.INSTANCE, - (guiType.ordinal() << 3) | face.ordinal(), - world, - pos.getX(), - pos.getY(), - pos.getZ()); + + if (guiType instanceof GuiType gt) { + player.openGui( + FluidCraft.INSTANCE, + (gt.ordinal() << 3) | face.ordinal(), + world, + pos.getX(), + pos.getY(), + pos.getZ()); + } else if (guiType instanceof GuiBridge gb) { + Platform.openGUI(player, world.getTileEntity(pos.getX(), pos.getY(), pos.getZ()), face, gb); + } } @Nullable diff --git a/src/main/java/com/glodblock/github/inventory/ItemBiggerAppEngInventory.java b/src/main/java/com/glodblock/github/inventory/ItemBiggerAppEngInventory.java index 0ae64bea..f3d28d18 100644 --- a/src/main/java/com/glodblock/github/inventory/ItemBiggerAppEngInventory.java +++ b/src/main/java/com/glodblock/github/inventory/ItemBiggerAppEngInventory.java @@ -2,8 +2,6 @@ package com.glodblock.github.inventory; import net.minecraft.item.ItemStack; -import com.glodblock.github.inventory.gui.GuiType; - import appeng.tile.inventory.BiggerAppEngInventory; import appeng.util.Platform; @@ -29,19 +27,6 @@ public class ItemBiggerAppEngInventory extends BiggerAppEngInventory { @Override public void markDirty() { - boolean isCraft = Platform.openNbtData(is).getBoolean("craftingMode"); - boolean isCraftingTerm = Platform.openNbtData(is).getString("mode_main") - .equals(GuiType.WIRELESS_CRAFTING_TERMINAL.toString()); - boolean isExPattern = Platform.openNbtData(is).getString("mode_main") - .equals(GuiType.WIRELESS_FLUID_PATTERN_TERMINAL_EX.toString()); - if (!isCraftingTerm && !isExPattern && isCraft) { - for (int x = 0; x < this.getSizeInventory(); x++) { - final ItemStack is = this.getStackInSlot(x); - if (is != null) { - is.stackSize = 1; - } - } - } this.writeToNBT(Platform.openNbtData(is), this.name); } 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 2959f71e..90360e04 100644 --- a/src/main/java/com/glodblock/github/inventory/gui/GuiType.java +++ b/src/main/java/com/glodblock/github/inventory/gui/GuiType.java @@ -5,75 +5,42 @@ 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; -import com.glodblock.github.client.gui.GuiEssentiaTerminal; import com.glodblock.github.client.gui.GuiFCPriority; import com.glodblock.github.client.gui.GuiFluidAutoFiller; -import com.glodblock.github.client.gui.GuiFluidCraftAmount; -import com.glodblock.github.client.gui.GuiFluidCraftConfirm; -import com.glodblock.github.client.gui.GuiFluidCraftingWireless; import com.glodblock.github.client.gui.GuiFluidIO; import com.glodblock.github.client.gui.GuiFluidInterface; import com.glodblock.github.client.gui.GuiFluidLevelEmitter; -import com.glodblock.github.client.gui.GuiFluidOptimizePatterns; import com.glodblock.github.client.gui.GuiFluidPacketDecoder; import com.glodblock.github.client.gui.GuiFluidPatternEncoder; -import com.glodblock.github.client.gui.GuiFluidPatternExWireless; -import com.glodblock.github.client.gui.GuiFluidPatternTerminal; -import com.glodblock.github.client.gui.GuiFluidPatternTerminalEx; -import com.glodblock.github.client.gui.GuiFluidPatternWireless; -import com.glodblock.github.client.gui.GuiFluidPortableCell; import com.glodblock.github.client.gui.GuiFluidStorageBus; -import com.glodblock.github.client.gui.GuiFluidTerminal; import com.glodblock.github.client.gui.GuiIngredientBuffer; -import com.glodblock.github.client.gui.GuiInterfaceWireless; import com.glodblock.github.client.gui.GuiLargeIngredientBuffer; import com.glodblock.github.client.gui.GuiLevelMaintainer; import com.glodblock.github.client.gui.GuiLevelTerminal; import com.glodblock.github.client.gui.GuiLevelWireless; import com.glodblock.github.client.gui.GuiMagnetFilter; import com.glodblock.github.client.gui.GuiOCPatternEditor; -import com.glodblock.github.client.gui.GuiPatternItemRenamer; -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.GuiSuperStockReplenisher; -import com.glodblock.github.client.gui.container.ContainerCraftingWireless; import com.glodblock.github.client.gui.container.ContainerDualInterface; -import com.glodblock.github.client.gui.container.ContainerEssentiaMonitor; import com.glodblock.github.client.gui.container.ContainerFluidAutoFiller; -import com.glodblock.github.client.gui.container.ContainerFluidCraftConfirm; import com.glodblock.github.client.gui.container.ContainerFluidIO; import com.glodblock.github.client.gui.container.ContainerFluidInterface; import com.glodblock.github.client.gui.container.ContainerFluidLevelEmitter; -import com.glodblock.github.client.gui.container.ContainerFluidMonitor; -import com.glodblock.github.client.gui.container.ContainerFluidOptimizePatterns; import com.glodblock.github.client.gui.container.ContainerFluidPacketDecoder; import com.glodblock.github.client.gui.container.ContainerFluidPatternEncoder; -import com.glodblock.github.client.gui.container.ContainerFluidPatternExWireless; -import com.glodblock.github.client.gui.container.ContainerFluidPatternTerminal; -import com.glodblock.github.client.gui.container.ContainerFluidPatternTerminalEx; -import com.glodblock.github.client.gui.container.ContainerFluidPatternWireless; -import com.glodblock.github.client.gui.container.ContainerFluidPortableCell; import com.glodblock.github.client.gui.container.ContainerFluidStorageBus; import com.glodblock.github.client.gui.container.ContainerIngredientBuffer; -import com.glodblock.github.client.gui.container.ContainerInterfaceWireless; import com.glodblock.github.client.gui.container.ContainerLargeIngredientBuffer; import com.glodblock.github.client.gui.container.ContainerLevelMaintainer; import com.glodblock.github.client.gui.container.ContainerLevelTerminal; 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.ContainerPatternMulti; -import com.glodblock.github.client.gui.container.ContainerPatternValueAmount; -import com.glodblock.github.client.gui.container.ContainerRenamer; import com.glodblock.github.client.gui.container.ContainerSuperStockReplenisher; import com.glodblock.github.common.parts.PartFluidLevelEmitter; import com.glodblock.github.common.parts.PartFluidStorageBus; -import com.glodblock.github.common.parts.base.FCPart; import com.glodblock.github.common.parts.base.FCSharedFluidBus; import com.glodblock.github.common.tile.TileFluidAutoFiller; import com.glodblock.github.common.tile.TileFluidPacketDecoder; @@ -84,32 +51,16 @@ import com.glodblock.github.common.tile.TileLevelMaintainer; import com.glodblock.github.common.tile.TileOCPatternEditor; import com.glodblock.github.common.tile.TileSuperStockReplenisher; import com.glodblock.github.inventory.IDualHost; -import com.glodblock.github.inventory.item.IFluidPortableCell; import com.glodblock.github.inventory.item.IWirelessTerminal; import com.google.common.collect.ImmutableList; import appeng.api.storage.ITerminalHost; -import appeng.container.implementations.ContainerCraftAmount; -import appeng.container.implementations.ContainerCraftingStatus; -import appeng.container.implementations.ContainerPatternItemRenamer; import appeng.container.implementations.ContainerPriority; import appeng.helpers.IInterfaceHost; import appeng.helpers.IPriorityHost; public enum GuiType { - RENAMER(new PartOrItemGuiFactory<>(ITerminalHost.class) { - - @Override - protected Object createServerGui(EntityPlayer player, ITerminalHost inv) { - return new ContainerRenamer(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, ITerminalHost inv) { - return new GuiRenamer(player.inventory, inv); - } - }), FLUID_AUTO_FILLER(new TileGuiFactory<>(TileFluidAutoFiller.class) { @Override @@ -253,32 +204,6 @@ public enum GuiType { } }), - CRAFTING_STATUS(new PartOrItemGuiFactory<>(ITerminalHost.class) { - - @Override - protected Object createServerGui(EntityPlayer player, ITerminalHost inv) { - return new ContainerCraftingStatus(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, ITerminalHost inv) { - return new GuiCraftingStatus(player.inventory, inv); - } - }), - - FLUID_TERMINAL(new TileOrPartGuiFactory<>(ITerminalHost.class) { - - @Override - protected Object createServerGui(EntityPlayer player, ITerminalHost inv) { - return new ContainerFluidMonitor(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, ITerminalHost inv) { - return new GuiFluidTerminal(player.inventory, inv); - } - }), - LEVEL_TERMINAL(new TileOrPartGuiFactory<>(ITerminalHost.class) { @Override @@ -292,82 +217,6 @@ public enum GuiType { } }), - PORTABLE_FLUID_CELL(new ItemGuiFactory<>(IFluidPortableCell.class) { - - @Override - protected Object createServerGui(EntityPlayer player, IFluidPortableCell inv) { - return new ContainerFluidPortableCell(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, IFluidPortableCell inv) { - return new GuiFluidPortableCell(player.inventory, inv); - } - }), - - WIRELESS_FLUID_TERMINAL(new ItemGuiFactory<>(IWirelessTerminal.class) { - - @Override - protected Object createServerGui(EntityPlayer player, IWirelessTerminal inv) { - return new ContainerFluidPortableCell(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, IWirelessTerminal inv) { - return new GuiFluidPortableCell(player.inventory, inv); - } - }), - - WIRELESS_ESSENTIA_TERMINAL(new ItemGuiFactory<>(IWirelessTerminal.class) { - - @Override - protected Object createServerGui(EntityPlayer player, IWirelessTerminal inv) { - return new ContainerEssentiaMonitor(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, IWirelessTerminal inv) { - return new GuiEssentiaTerminal(player.inventory, inv); - } - }), - - WIRELESS_FLUID_PATTERN_TERMINAL(new ItemGuiFactory<>(IWirelessTerminal.class) { - - @Override - protected Object createServerGui(EntityPlayer player, IWirelessTerminal inv) { - return new ContainerFluidPatternWireless(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, IWirelessTerminal inv) { - return new GuiFluidPatternWireless(player.inventory, inv); - } - }), - WIRELESS_FLUID_PATTERN_TERMINAL_EX(new ItemGuiFactory<>(IWirelessTerminal.class) { - - @Override - protected Object createServerGui(EntityPlayer player, IWirelessTerminal inv) { - return new ContainerFluidPatternExWireless(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, IWirelessTerminal inv) { - return new GuiFluidPatternExWireless(player.inventory, inv); - } - }), - WIRELESS_INTERFACE_TERMINAL(new ItemGuiFactory<>(IWirelessTerminal.class) { - - @Override - protected Object createServerGui(EntityPlayer player, IWirelessTerminal inv) { - return new ContainerInterfaceWireless(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, IWirelessTerminal inv) { - return new GuiInterfaceWireless(player.inventory, inv); - } - }), - WIRELESS_LEVEL_TERMINAL(new ItemGuiFactory<>(IWirelessTerminal.class) { @Override @@ -381,45 +230,6 @@ public enum GuiType { } }), - WIRELESS_CRAFTING_TERMINAL(new ItemGuiFactory<>(IWirelessTerminal.class) { - - @Override - protected Object createServerGui(EntityPlayer player, IWirelessTerminal inv) { - return new ContainerCraftingWireless(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, IWirelessTerminal inv) { - return new GuiFluidCraftingWireless(player.inventory, inv); - } - }), - - FLUID_PATTERN_TERMINAL(new PartGuiFactory<>(ITerminalHost.class) { - - @Override - protected Object createServerGui(EntityPlayer player, ITerminalHost inv) { - return new ContainerFluidPatternTerminal(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, ITerminalHost inv) { - return new GuiFluidPatternTerminal(player.inventory, inv); - } - }), - - FLUID_PATTERN_TERMINAL_EX(new PartGuiFactory<>(ITerminalHost.class) { - - @Override - protected Object createServerGui(EntityPlayer player, ITerminalHost inv) { - return new ContainerFluidPatternTerminalEx(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, ITerminalHost inv) { - return new GuiFluidPatternTerminalEx(player.inventory, inv); - } - }), - FLUID_PATTERN_ENCODER(new TileGuiFactory<>(TileFluidPatternEncoder.class) { @Override @@ -433,71 +243,6 @@ public enum GuiType { } }), - FLUID_CRAFTING_CONFIRM(new PartGuiFactory<>(FCPart.class) { - - @Override - protected Object createServerGui(EntityPlayer player, FCPart inv) { - return new ContainerFluidCraftConfirm(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, FCPart inv) { - return new GuiFluidCraftConfirm(player.inventory, inv); - } - }), - - FLUID_CRAFTING_CONFIRM_ITEM(new ItemGuiFactory<>(IWirelessTerminal.class) { - - @Override - protected Object createServerGui(EntityPlayer player, IWirelessTerminal inv) { - return new ContainerFluidCraftConfirm(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, IWirelessTerminal inv) { - return new GuiFluidCraftConfirm(player.inventory, inv); - } - }), - - FLUID_OPTIMIZE_PATTERNS(new PartGuiFactory<>(FCPart.class) { - - @Override - protected Object createServerGui(EntityPlayer player, FCPart inv) { - return new ContainerFluidOptimizePatterns(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, FCPart inv) { - return new GuiFluidOptimizePatterns(player.inventory, inv); - } - }), - - FLUID_OPTIMIZE_PATTERNS_ITEM(new ItemGuiFactory<>(IWirelessTerminal.class) { - - @Override - protected Object createServerGui(EntityPlayer player, IWirelessTerminal inv) { - return new ContainerFluidOptimizePatterns(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, IWirelessTerminal inv) { - return new GuiFluidOptimizePatterns(player.inventory, inv); - } - }), - - FLUID_CRAFTING_AMOUNT(new PartOrItemGuiFactory<>(ITerminalHost.class) { - - @Override - protected Object createServerGui(EntityPlayer player, ITerminalHost inv) { - return new ContainerCraftAmount(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, ITerminalHost inv) { - return new GuiFluidCraftAmount(player.inventory, inv); - } - }), - FLUID_PACKET_DECODER(new TileGuiFactory<>(TileFluidPacketDecoder.class) { @Override @@ -511,57 +256,6 @@ public enum GuiType { } }), - PATTERN_VALUE_SET(new PartOrItemGuiFactory<>(ITerminalHost.class) { - - @Override - protected Object createServerGui(EntityPlayer player, ITerminalHost inv) { - return new ContainerPatternValueAmount(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, ITerminalHost inv) { - 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) { - - @Override - protected Object createServerGui(EntityPlayer player, ITerminalHost inv) { - return new ContainerPatternMulti(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, ITerminalHost inv) { - return new GuiPatternMulti(player.inventory, inv); - } - }), - - GUI_PATTERN_ITEM_RENAMER(new PartOrItemGuiFactory<>(ITerminalHost.class) { - - @Override - protected Object createServerGui(EntityPlayer player, ITerminalHost inv) { - return new ContainerPatternItemRenamer(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, ITerminalHost inv) { - return new GuiPatternItemRenamer(player.inventory, inv); - } - }), - WIRELESS_MAGNET_FILTER(new ItemGuiFactory<>(ITerminalHost.class) { @Override diff --git a/src/main/java/com/glodblock/github/loader/ChannelLoader.java b/src/main/java/com/glodblock/github/loader/ChannelLoader.java index 04a9d0aa..9ba5891e 100644 --- a/src/main/java/com/glodblock/github/loader/ChannelLoader.java +++ b/src/main/java/com/glodblock/github/loader/ChannelLoader.java @@ -5,30 +5,16 @@ import net.minecraft.network.Packet; import net.minecraft.world.World; import com.glodblock.github.FluidCraft; -import com.glodblock.github.network.CPacketCraftRequest; import com.glodblock.github.network.CPacketDumpTank; -import com.glodblock.github.network.CPacketEncodePattern; import com.glodblock.github.network.CPacketFluidPatternTermBtns; -import com.glodblock.github.network.CPacketFluidUpdate; -import com.glodblock.github.network.CPacketInventoryAction; import com.glodblock.github.network.CPacketLevelMaintainer; import com.glodblock.github.network.CPacketLevelTerminalCommands; -import com.glodblock.github.network.CPacketPatternMultiSet; -import com.glodblock.github.network.CPacketPatternValueSet; -import com.glodblock.github.network.CPacketRenamer; import com.glodblock.github.network.CPacketSwitchGuis; -import com.glodblock.github.network.CPacketTransferRecipe; import com.glodblock.github.network.CPacketValueConfig; import com.glodblock.github.network.SPacketFluidUpdate; import com.glodblock.github.network.SPacketLevelMaintainerGuiUpdate; import com.glodblock.github.network.SPacketLevelTerminalUpdate; -import com.glodblock.github.network.SPacketMEFluidInvUpdate; -import com.glodblock.github.network.SPacketMEItemInvUpdate; -import com.glodblock.github.network.SPacketPatternItemRenamer; -import com.glodblock.github.network.SPacketSetItemAmount; -import com.glodblock.github.network.SPacketStringUpdate; import com.glodblock.github.network.SPacketSuperStockReplenisherUpdate; -import com.glodblock.github.network.SPacketSwitchBack; import com.glodblock.github.network.wrapper.FCNetworkWrapper; import cpw.mods.fml.relauncher.Side; @@ -47,19 +33,7 @@ public class ChannelLoader implements Runnable { CPacketFluidPatternTermBtns.class, id++, Side.SERVER); - netHandler.registerMessage(new CPacketEncodePattern.Handler(), CPacketEncodePattern.class, id++, Side.SERVER); - netHandler - .registerMessage(new SPacketMEItemInvUpdate.Handler(), SPacketMEItemInvUpdate.class, id++, Side.CLIENT); - netHandler.registerMessage( - new SPacketMEFluidInvUpdate.Handler(), - SPacketMEFluidInvUpdate.class, - id++, - Side.CLIENT); - netHandler.registerMessage(new CPacketCraftRequest.Handler(), CPacketCraftRequest.class, id++, Side.SERVER); - netHandler - .registerMessage(new CPacketInventoryAction.Handler(), CPacketInventoryAction.class, id++, Side.SERVER); netHandler.registerMessage(new CPacketSwitchGuis.Handler(), CPacketSwitchGuis.class, id++, Side.CLIENT); - netHandler.registerMessage(new CPacketTransferRecipe.Handler(), CPacketTransferRecipe.class, id++, Side.SERVER); netHandler.registerMessage(new CPacketDumpTank.Handler(), CPacketDumpTank.class, id++, Side.SERVER); netHandler.registerMessage(new SPacketFluidUpdate.Handler(), SPacketFluidUpdate.class, id++, Side.CLIENT); netHandler.registerMessage( @@ -67,16 +41,9 @@ public class ChannelLoader implements Runnable { SPacketSuperStockReplenisherUpdate.class, id++, Side.CLIENT); - netHandler - .registerMessage(new CPacketPatternValueSet.Handler(), CPacketPatternValueSet.class, id++, Side.SERVER); netHandler.registerMessage(new CPacketValueConfig.Handler(), CPacketValueConfig.class, id++, Side.SERVER); - netHandler.registerMessage(new CPacketFluidUpdate.Handler(), CPacketFluidUpdate.class, id++, Side.SERVER); netHandler .registerMessage(new CPacketLevelMaintainer.Handler(), CPacketLevelMaintainer.class, id++, Side.SERVER); - netHandler.registerMessage(new SPacketSetItemAmount.Handler(), SPacketSetItemAmount.class, id++, Side.CLIENT); - netHandler.registerMessage(new CPacketRenamer.Handler(), CPacketRenamer.class, id++, Side.SERVER); - netHandler.registerMessage(new SPacketStringUpdate.Handler(), SPacketStringUpdate.class, id++, Side.CLIENT); - netHandler.registerMessage(new SPacketSwitchBack.Handler(), SPacketSwitchBack.class, id++, Side.CLIENT); netHandler.registerMessage( new SPacketLevelTerminalUpdate.Handler(), SPacketLevelTerminalUpdate.class, @@ -87,13 +54,6 @@ public class ChannelLoader implements Runnable { CPacketLevelTerminalCommands.class, id++, Side.SERVER); - netHandler - .registerMessage(new CPacketPatternMultiSet.Handler(), CPacketPatternMultiSet.class, id++, Side.SERVER); - netHandler.registerMessage( - new SPacketPatternItemRenamer.Handler(), - SPacketPatternItemRenamer.class, - id++, - Side.SERVER); netHandler.registerMessage( new SPacketLevelMaintainerGuiUpdate.Handler(), SPacketLevelMaintainerGuiUpdate.class, diff --git a/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java b/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java index 98c9054f..b6a8461c 100644 --- a/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java +++ b/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java @@ -42,7 +42,6 @@ import com.glodblock.github.common.item.ItemPartFluidTerminal; import com.glodblock.github.common.item.ItemPartLevelTerminal; import com.glodblock.github.common.item.ItemPortableFluidCell; import com.glodblock.github.common.item.ItemQuantumBridgeCard; -import com.glodblock.github.common.item.ItemWirelessFluidTerminal; import com.glodblock.github.common.item.ItemWirelessInterfaceTerminal; import com.glodblock.github.common.item.ItemWirelessLevelTerminal; import com.glodblock.github.common.item.ItemWirelessPatternTerminal; @@ -82,7 +81,6 @@ public class ItemAndBlockHolder { public static ItemFluidStorageMonitor FLUID_STORAGE_MONITOR = new ItemFluidStorageMonitor().register(); public static ItemFluidConversionMonitor FLUID_CONVERSION_MONITOR = new ItemFluidConversionMonitor().register(); public static ItemPortableFluidCell PORTABLE_FLUID_CELL = new ItemPortableFluidCell().register(); - public static ItemWirelessFluidTerminal WIRELESS_FLUID_TERM = new ItemWirelessFluidTerminal().register(); public static ItemWirelessLevelTerminal WIRELESS_LEVEL_TERM = new ItemWirelessLevelTerminal().register(); public static ItemWirelessPatternTerminal WIRELESS_PATTERN_TERM = new ItemWirelessPatternTerminal().register(); public static ItemWirelessUltraTerminal WIRELESS_ULTRA_TERM = new ItemWirelessUltraTerminal().register(); diff --git a/src/main/java/com/glodblock/github/loader/RecipeLoader.java b/src/main/java/com/glodblock/github/loader/RecipeLoader.java index bb5198eb..681e15a1 100644 --- a/src/main/java/com/glodblock/github/loader/RecipeLoader.java +++ b/src/main/java/com/glodblock/github/loader/RecipeLoader.java @@ -51,7 +51,6 @@ import static com.glodblock.github.loader.ItemAndBlockHolder.QUANTUM_BRIDGE_CARD import static com.glodblock.github.loader.ItemAndBlockHolder.QUANTUM_CELL; import static com.glodblock.github.loader.ItemAndBlockHolder.SINGULARITY_CELL; import static com.glodblock.github.loader.ItemAndBlockHolder.WALRUS; -import static com.glodblock.github.loader.ItemAndBlockHolder.WIRELESS_FLUID_TERM; import static com.glodblock.github.loader.ItemAndBlockHolder.WIRELESS_INTERFACE_TERM; import static com.glodblock.github.loader.ItemAndBlockHolder.WIRELESS_LEVEL_TERM; import static com.glodblock.github.loader.ItemAndBlockHolder.WIRELESS_PATTERN_TERM; @@ -235,8 +234,7 @@ public class RecipeLoader implements Runnable { GameRegistry.addShapelessRecipe(FLUID_INTERFACE_P2P.stack(), AE2_P2P_ME, FLUID_INTERFACE.stack()); } GameRegistry.addShapelessRecipe(INTERFACE.stack(), FLUID_INTERFACE.stack()); - GameRegistry.addShapelessRecipe(WIRELESS_FLUID_TERM.stack(), AE2_WIRELESS_TERMINAL, BUCKET); - GameRegistry.addShapelessRecipe(WIRELESS_PATTERN_TERM.stack(), WIRELESS_FLUID_TERM, FLUID_TERMINAL); + GameRegistry.addShapelessRecipe(WIRELESS_PATTERN_TERM.stack(), FLUID_TERMINAL); GameRegistry.addShapelessRecipe(WIRELESS_INTERFACE_TERM.stack(), AE2_WIRELESS_TERMINAL, AE2_INTERFACE_TERMINAL); GameRegistry.addShapelessRecipe(WIRELESS_LEVEL_TERM.stack(), AE2_WIRELESS_TERMINAL, LEVEL_MAINTAINER); GameRegistry @@ -751,8 +749,8 @@ public class RecipeLoader implements Runnable { } public static void runTerminalRecipe() { - ItemStack[] fc2Terms = { WIRELESS_ULTRA_TERM.stack(), WIRELESS_FLUID_TERM.stack(), - WIRELESS_PATTERN_TERM.stack(), WIRELESS_INTERFACE_TERM.stack(), WIRELESS_LEVEL_TERM.stack() }; + ItemStack[] fc2Terms = { WIRELESS_ULTRA_TERM.stack(), WIRELESS_PATTERN_TERM.stack(), + WIRELESS_INTERFACE_TERM.stack(), WIRELESS_LEVEL_TERM.stack() }; for (ItemStack fc2term : fc2Terms) { if (fc2term != null) { @@ -764,8 +762,8 @@ public class RecipeLoader implements Runnable { } } - ItemStack[] term = { AE2_WIRELESS_TERMINAL, WIRELESS_FLUID_TERM.stack(), WIRELESS_PATTERN_TERM.stack(), - WIRELESS_INTERFACE_TERM.stack(), WIRELESS_LEVEL_TERM.stack(), THE_WIRELESS_TERM, WCT_WIRELESS_TERM }; + ItemStack[] term = { AE2_WIRELESS_TERMINAL, WIRELESS_PATTERN_TERM.stack(), WIRELESS_INTERFACE_TERM.stack(), + WIRELESS_LEVEL_TERM.stack(), THE_WIRELESS_TERM, WCT_WIRELESS_TERM }; GameRegistry.addShapelessRecipe( WIRELESS_ULTRA_TERM.stack(), Arrays.stream(term).filter(Objects::nonNull).toArray()); diff --git a/src/main/java/com/glodblock/github/nei/AE2FC_NEIGuiHandler.java b/src/main/java/com/glodblock/github/nei/AE2FC_NEIGuiHandler.java index 0aaa48e4..f2af3371 100644 --- a/src/main/java/com/glodblock/github/nei/AE2FC_NEIGuiHandler.java +++ b/src/main/java/com/glodblock/github/nei/AE2FC_NEIGuiHandler.java @@ -3,8 +3,6 @@ package com.glodblock.github.nei; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; -import com.glodblock.github.client.gui.GuiFluidMonitor; -import com.glodblock.github.client.gui.GuiItemMonitor; import com.glodblock.github.client.gui.GuiLevelMaintainer; import codechicken.nei.api.INEIGuiAdapter; @@ -13,11 +11,6 @@ public class AE2FC_NEIGuiHandler extends INEIGuiAdapter { @Override public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h) { - if (gui instanceof GuiItemMonitor) { - return ((GuiItemMonitor) gui).hideItemPanelSlot(x, y, w, h); - } else if (gui instanceof GuiFluidMonitor) { - return ((GuiFluidMonitor) gui).hideItemPanelSlot(x, y, w, h); - } return false; } diff --git a/src/main/java/com/glodblock/github/nei/FluidCraftingTransferHandler.java b/src/main/java/com/glodblock/github/nei/FluidCraftingTransferHandler.java deleted file mode 100644 index 65657662..00000000 --- a/src/main/java/com/glodblock/github/nei/FluidCraftingTransferHandler.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.glodblock.github.nei; - -import java.io.IOException; -import java.util.LinkedList; -import java.util.List; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - -import com.glodblock.github.client.gui.GuiFluidCraftingWireless; - -import appeng.container.slot.SlotCraftingMatrix; -import appeng.container.slot.SlotFakeCraftingMatrix; -import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketNEIRecipe; -import appeng.util.Platform; -import codechicken.nei.PositionedStack; -import codechicken.nei.api.IOverlayHandler; -import codechicken.nei.recipe.IRecipeHandler; - -public class FluidCraftingTransferHandler implements IOverlayHandler { - - public static final FluidCraftingTransferHandler INSTANCE = new FluidCraftingTransferHandler(); - - @Override - public void overlayRecipe(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex, boolean shift) { - try { - final List ingredients = recipe.getIngredientStacks(recipeIndex); - if (firstGui instanceof GuiFluidCraftingWireless - && FluidPatternTerminalRecipeTransferHandler.craftSet.contains(recipe.getOverlayIdentifier())) { - PacketNEIRecipe packet = new PacketNEIRecipe(packIngredients(firstGui, ingredients)); - NetworkHandler.instance.sendToServer(packet); - } - } catch (final Exception | Error ignored) { - // NO-OP - } - } - - private NBTTagCompound packIngredients(GuiContainer gui, List ingredients) throws IOException { - final NBTTagCompound recipe = new NBTTagCompound(); - for (final PositionedStack positionedStack : ingredients) { - final int col = (positionedStack.relx - 25) / 18; - final int row = (positionedStack.rely - 6) / 18; - if (positionedStack.items != null && positionedStack.items.length > 0) { - for (final Object o : gui.inventorySlots.inventorySlots) { - if (o instanceof SlotCraftingMatrix || o instanceof SlotFakeCraftingMatrix) { - Slot slot = (Slot) o; - if (slot.getSlotIndex() == col + row * 3) { - final NBTTagList tags = new NBTTagList(); - final List list = new LinkedList<>(); - // prefer pure crystals. - for (int x = 0; x < positionedStack.items.length; x++) { - if (Platform.isRecipePrioritized(positionedStack.items[x])) { - list.add(0, positionedStack.items[x]); - } else { - list.add(positionedStack.items[x]); - } - } - for (final ItemStack is : list) { - final NBTTagCompound tag = new NBTTagCompound(); - is.writeToNBT(tag); - tags.appendTag(tag); - } - recipe.setTag("#" + slot.getSlotIndex(), tags); - break; - } - } - } - } - } - return recipe; - } -} diff --git a/src/main/java/com/glodblock/github/nei/FluidPatternTerminalRecipeTransferHandler.java b/src/main/java/com/glodblock/github/nei/FluidPatternTerminalRecipeTransferHandler.java deleted file mode 100644 index d13d3c7e..00000000 --- a/src/main/java/com/glodblock/github/nei/FluidPatternTerminalRecipeTransferHandler.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.glodblock.github.nei; - -import java.util.HashSet; -import java.util.List; - -import net.minecraft.client.gui.inventory.GuiContainer; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.client.gui.base.FCGuiEncodeTerminal; -import com.glodblock.github.nei.object.OrderStack; -import com.glodblock.github.nei.recipes.FluidRecipe; -import com.glodblock.github.network.CPacketTransferRecipe; - -import codechicken.nei.api.IOverlayHandler; -import codechicken.nei.recipe.IRecipeHandler; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class FluidPatternTerminalRecipeTransferHandler implements IOverlayHandler { - - public static final FluidPatternTerminalRecipeTransferHandler INSTANCE = new FluidPatternTerminalRecipeTransferHandler(); - public static final HashSet notOtherSet = new HashSet<>(); - public static final HashSet craftSet = new HashSet<>(); - - static { - notOtherSet.add("smelting"); - notOtherSet.add("brewing"); - craftSet.add("crafting"); - craftSet.add("crafting2x2"); - } - - @Override - public void overlayRecipe(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex, boolean shift) { - if (firstGui instanceof FCGuiEncodeTerminal) { - boolean priority = ((FCGuiEncodeTerminal) firstGui).container.prioritize; - List> in = FluidRecipe.getPackageInputs(recipe, recipeIndex, priority); - List> out = FluidRecipe.getPackageOutputs(recipe, recipeIndex, !notUseOther(recipe)); - boolean craft = shouldCraft(recipe); - FluidCraft.proxy.netHandler.sendToServer(new CPacketTransferRecipe(in, out, craft, shift)); - } - } - - private boolean notUseOther(IRecipeHandler recipeHandler) { - TemplateRecipeHandler tRecipe = (TemplateRecipeHandler) recipeHandler; - return notOtherSet.contains(tRecipe.getOverlayIdentifier()); - } - - private boolean shouldCraft(IRecipeHandler recipeHandler) { - TemplateRecipeHandler tRecipe = (TemplateRecipeHandler) recipeHandler; - return craftSet.contains(tRecipe.getOverlayIdentifier()); - } -} diff --git a/src/main/java/com/glodblock/github/nei/NEI_FC_Config.java b/src/main/java/com/glodblock/github/nei/NEI_FC_Config.java deleted file mode 100644 index 1a586139..00000000 --- a/src/main/java/com/glodblock/github/nei/NEI_FC_Config.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.glodblock.github.nei; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.client.gui.GuiFluidCraftingWireless; -import com.glodblock.github.client.gui.GuiFluidPatternExWireless; -import com.glodblock.github.client.gui.GuiFluidPatternTerminal; -import com.glodblock.github.client.gui.GuiFluidPatternTerminalEx; -import com.glodblock.github.client.gui.GuiFluidPatternWireless; -import com.glodblock.github.nei.recipes.FluidRecipe; -import com.glodblock.github.util.ModAndClassUtil; - -import codechicken.nei.api.API; -import codechicken.nei.api.IConfigureNEI; - -@SuppressWarnings("unused") -public class NEI_FC_Config implements IConfigureNEI { - - @Override - public void loadConfig() { - API.registerNEIGuiHandler(new AE2FC_NEIGuiHandler()); - API.addSearchProvider(new NEISearchFilter()); - API.registerStackStringifyHandler(new FCStackStringifyHandler()); - API.registerUsageHandler(new NEICellViewHandler()); - - if (ModAndClassUtil.AVARITIA) { - API.registerGuiOverlay(GuiFluidPatternWireless.class, "extreme", null); - API.registerGuiOverlay(GuiFluidPatternExWireless.class, "extreme", null); - API.registerGuiOverlay(GuiFluidPatternTerminal.class, "extreme", null); - API.registerGuiOverlay(GuiFluidPatternTerminalEx.class, "extreme", null); - } - - for (String identifier : FluidRecipe.getSupportRecipes()) { - // that NEE handlers take priority - if (!API.hasGuiOverlayHandler(GuiFluidCraftingWireless.class, identifier)) { - API.registerGuiOverlayHandler( - GuiFluidCraftingWireless.class, - FluidCraftingTransferHandler.INSTANCE, - identifier); - } - if (!API.hasGuiOverlayHandler(GuiFluidPatternWireless.class, identifier)) { - API.registerGuiOverlayHandler( - GuiFluidPatternWireless.class, - FluidPatternTerminalRecipeTransferHandler.INSTANCE, - identifier); - } - if (!API.hasGuiOverlayHandler(GuiFluidPatternExWireless.class, identifier)) { - API.registerGuiOverlayHandler( - GuiFluidPatternExWireless.class, - FluidPatternTerminalRecipeTransferHandler.INSTANCE, - identifier); - } - if (!API.hasGuiOverlayHandler(GuiFluidPatternTerminal.class, identifier)) { - API.registerGuiOverlayHandler( - GuiFluidPatternTerminal.class, - FluidPatternTerminalRecipeTransferHandler.INSTANCE, - identifier); - } - if (!API.hasGuiOverlayHandler(GuiFluidPatternTerminalEx.class, identifier)) { - API.registerGuiOverlayHandler( - GuiFluidPatternTerminalEx.class, - FluidPatternTerminalRecipeTransferHandler.INSTANCE, - identifier); - } - } - } - - @Override - public String getName() { - return FluidCraft.MODNAME; - } - - @Override - public String getVersion() { - return FluidCraft.VERSION; - } -} diff --git a/src/main/java/com/glodblock/github/network/CPacketCraftRequest.java b/src/main/java/com/glodblock/github/network/CPacketCraftRequest.java deleted file mode 100644 index 3805757d..00000000 --- a/src/main/java/com/glodblock/github/network/CPacketCraftRequest.java +++ /dev/null @@ -1,145 +0,0 @@ -package com.glodblock.github.network; - -import java.util.Objects; -import java.util.concurrent.Future; - -import javax.annotation.Nullable; - -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; - -import com.glodblock.github.inventory.InventoryHandler; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.IWirelessTerminal; -import com.glodblock.github.util.BlockPos; - -import appeng.api.config.CraftingMode; -import appeng.api.networking.IGrid; -import appeng.api.networking.IGridHost; -import appeng.api.networking.IGridNode; -import appeng.api.networking.crafting.ICraftingGrid; -import appeng.api.networking.crafting.ICraftingJob; -import appeng.container.ContainerOpenContext; -import appeng.container.implementations.ContainerCraftAmount; -import appeng.container.implementations.ContainerCraftConfirm; -import appeng.core.AELog; -import appeng.me.cache.CraftingGridCache; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - -public class CPacketCraftRequest implements IMessage { - - private long amount; - private boolean heldShift; - - private CraftingMode craftingMode; - - public CPacketCraftRequest() {} - - public CPacketCraftRequest(final int craftAmt, final boolean shift) { - this(craftAmt, shift, CraftingMode.STANDARD); - } - - public CPacketCraftRequest(final int craftAmt, final boolean shift, final CraftingMode craftingMode) { - amount = craftAmt; - heldShift = shift; - this.craftingMode = craftingMode; - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeLong(amount); - buf.writeBoolean(heldShift); - buf.writeBoolean(this.craftingMode == CraftingMode.STANDARD); - } - - @Override - public void fromBytes(ByteBuf buf) { - amount = buf.readLong(); - heldShift = buf.readBoolean(); - craftingMode = buf.readBoolean() ? CraftingMode.STANDARD : CraftingMode.IGNORE_MISSING; - } - - public static class Handler implements IMessageHandler { - - @Nullable - @Override - public IMessage onMessage(CPacketCraftRequest message, MessageContext ctx) { - if (ctx.getServerHandler().playerEntity.openContainer instanceof final ContainerCraftAmount cca) { - EntityPlayerMP player = ctx.getServerHandler().playerEntity; - final Object target = cca.getTarget(); - if (target instanceof final IGridHost gh) { - final IGridNode gn = gh.getGridNode(ForgeDirection.UNKNOWN); - - if (gn == null) { - return null; - } - - final IGrid g = gn.getGrid(); - if (g == null || cca.getItemToCraft() == null) { - return null; - } - - cca.getItemToCraft().setStackSize(message.amount); - - Future futureJob = null; - try { - final ICraftingGrid cg = g.getCache(ICraftingGrid.class); - if(cg instanceof CraftingGridCache cgc) { - futureJob = cgc.beginCraftingJob( - cca.getWorld(), - cca.getGrid(), - cca.getActionSrc(), - cca.getItemToCraft(), - message.craftingMode, - null); - }else { - futureJob = cg.beginCraftingJob( - cca.getWorld(), - cca.getGrid(), - cca.getActionSrc(), - cca.getItemToCraft(), - null); - } - - final ContainerOpenContext context = cca.getOpenContext(); - if (context != null) { - final TileEntity te = context.getTile(); - if (te != null) { - InventoryHandler.openGui( - player, - player.worldObj, - new BlockPos(te), - Objects.requireNonNull(context.getSide()), - GuiType.FLUID_CRAFTING_CONFIRM); - } else if (target instanceof IWirelessTerminal) { - InventoryHandler.openGui( - player, - player.worldObj, - new BlockPos(((IWirelessTerminal) target).getInventorySlot(), 0, 0), - Objects.requireNonNull(context.getSide()), - GuiType.FLUID_CRAFTING_CONFIRM_ITEM); - } - - if (player.openContainer instanceof final ContainerCraftConfirm ccc) { - ccc.setItemToCraft(cca.getItemToCraft()); - ccc.setAutoStart(message.heldShift); - ccc.setJob(futureJob); - cca.detectAndSendChanges(); - } - } - } catch (final Throwable e) { - if (futureJob != null) { - futureJob.cancel(true); - } - AELog.debug(e); - } - } - } - return null; - } - } -} diff --git a/src/main/java/com/glodblock/github/network/CPacketEncodePattern.java b/src/main/java/com/glodblock/github/network/CPacketEncodePattern.java deleted file mode 100644 index 8d0882c5..00000000 --- a/src/main/java/com/glodblock/github/network/CPacketEncodePattern.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.glodblock.github.network; - -import javax.annotation.Nullable; - -import net.minecraft.entity.player.EntityPlayerMP; - -import com.glodblock.github.client.gui.container.ContainerFluidPatternEncoder; - -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - -public class CPacketEncodePattern implements IMessage { - - @Override - public void toBytes(ByteBuf buf) { - // NO-OP - } - - @Override - public void fromBytes(ByteBuf buf) { - // NO-OP - } - - public static class Handler implements IMessageHandler { - - @Nullable - @Override - public IMessage onMessage(CPacketEncodePattern message, MessageContext ctx) { - EntityPlayerMP player = ctx.getServerHandler().playerEntity; - if (player.openContainer instanceof ContainerFluidPatternEncoder) { - ((ContainerFluidPatternEncoder) player.openContainer).encodePattern(); - } - return null; - } - } -} diff --git a/src/main/java/com/glodblock/github/network/CPacketFluidPatternTermBtns.java b/src/main/java/com/glodblock/github/network/CPacketFluidPatternTermBtns.java index 98a49ad8..7cd5da5a 100644 --- a/src/main/java/com/glodblock/github/network/CPacketFluidPatternTermBtns.java +++ b/src/main/java/com/glodblock/github/network/CPacketFluidPatternTermBtns.java @@ -6,7 +6,6 @@ import net.minecraftforge.common.util.ForgeDirection; import com.glodblock.github.client.gui.container.ContainerFluidStorageBus; import com.glodblock.github.client.gui.container.base.FCBaseContainer; -import com.glodblock.github.client.gui.container.base.FCContainerEncodeTerminal; import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.inventory.item.IItemTerminal; @@ -93,14 +92,14 @@ public class CPacketFluidPatternTermBtns implements IMessage { break; case "WirelessTerminal.OpenMagnet": InventoryHandler.openGui( - player, - player.worldObj, - new BlockPos( - cpt.getPortableCell().getInventorySlot(), - Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM), - -1), - ForgeDirection.UNKNOWN, - GuiType.WIRELESS_MAGNET_FILTER); + player, + player.worldObj, + new BlockPos( + cpt.getPortableCell().getInventorySlot(), + Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM), + -1), + ForgeDirection.UNKNOWN, + GuiType.WIRELESS_MAGNET_FILTER); break; case "WirelessTerminal.magnet.NBT": ((IWirelessMagnetFilter) itemTerminal).setNBTMode(Value.equals("1")); @@ -119,42 +118,14 @@ public class CPacketFluidPatternTermBtns implements IMessage { break; case "WirelessTerminal.magnet.FilterMode": ((IWirelessMagnetFilter) itemTerminal).setListMode( - Value.equals("1") ? WirelessMagnet.ListMode.WhiteList - : WirelessMagnet.ListMode.BlackList); + Value.equals("1") ? WirelessMagnet.ListMode.WhiteList + : WirelessMagnet.ListMode.BlackList); break; case "WirelessTerminal.magnet.clear": ((IWirelessMagnetFilter) itemTerminal).clearConfig(); break; } itemTerminal.saveSettings(); - } else if (Name.startsWith("PatternTerminal.") && (c instanceof final FCContainerEncodeTerminal cpt)) { - switch (Name) { - case "PatternTerminal.CraftMode" -> cpt.getPatternTerminal().setCraftingRecipe(Value.equals("1")); - case "PatternTerminal.Encode" -> { - switch (Value) { - case "0" -> cpt.encode(); - case "1" -> cpt.encodeAndMoveToInventory(); - case "3" -> cpt.encodeAllItemAndMoveToInventory(); - } - } - case "PatternTerminal.Clear" -> cpt.clear(); - case "PatternTerminal.Substitute" -> cpt.getPatternTerminal().setSubstitution(Value.equals("1")); - case "PatternTerminal.Invert" -> cpt.getPatternTerminal().setInverted(Value.equals("1")); - case "PatternTerminal.Double" -> cpt.doubleStacks(Integer.parseInt(message.Value)); - case "PatternTerminal.Combine" -> cpt.getPatternTerminal().setCombineMode(Value.equals("1")); - case "PatternTerminal.beSubstitute" -> cpt.getPatternTerminal().setBeSubstitute(Value.equals("1")); - case "PatternTerminal.ActivePage" -> - cpt.getPatternTerminal().setActivePage(Integer.parseInt(Value)); - case "PatternTerminal.Prioritize" -> { - switch (Value) { - case "0", "1" -> cpt.getPatternTerminal().setPrioritization(Value.equals("1")); - case "2" -> cpt.getPatternTerminal().sortCraftingItems(); - } - } - case "PatternTerminal.AutoFillerPattern" -> - cpt.getPatternTerminal().setAutoFillPattern(Value.equals("1")); - } - cpt.getPatternTerminal().saveSettings(); } else if (Name.startsWith("StorageBus.") && c instanceof ContainerFluidStorageBus ccw) { if (Name.equals("StorageBus.Action")) { if (Value.equals("Partition")) { diff --git a/src/main/java/com/glodblock/github/network/CPacketFluidUpdate.java b/src/main/java/com/glodblock/github/network/CPacketFluidUpdate.java deleted file mode 100644 index 6461e24e..00000000 --- a/src/main/java/com/glodblock/github/network/CPacketFluidUpdate.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.glodblock.github.network; - -import java.io.IOException; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; - -import com.glodblock.github.client.gui.container.ContainerFluidMonitor; - -import appeng.api.storage.data.IAEFluidStack; -import appeng.util.item.AEFluidStack; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - -public class CPacketFluidUpdate implements IMessage { - - private IAEFluidStack fluid; - private boolean shift; - private int slotIndex; - - public CPacketFluidUpdate() {} - - /** - * Used by transferStackInSlot. No clicked fluid, always shift. - */ - public CPacketFluidUpdate(int slotIndex) { - this(null, slotIndex, true); - } - - /** - * Used by handleMouseClick. Always uses mouse stack. - */ - public CPacketFluidUpdate(IAEFluidStack fluid, boolean shift) { - this(fluid, -1, shift); - } - - private CPacketFluidUpdate(IAEFluidStack fluid, int slotIndex, boolean shift) { - this.fluid = fluid; - this.slotIndex = slotIndex; - this.shift = shift; - } - - @Override - public void fromBytes(ByteBuf buf) { - try { - if (buf.readBoolean()) { - this.fluid = AEFluidStack.loadFluidStackFromPacket(buf); - } else { - this.fluid = null; - } - this.slotIndex = buf.readInt(); - this.shift = buf.readBoolean(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void toBytes(ByteBuf buf) { - try { - if (fluid == null) { - buf.writeBoolean(false); - } else { - buf.writeBoolean(true); - fluid.writeToPacket(buf); - } - buf.writeInt(this.slotIndex); - buf.writeBoolean(this.shift); - } catch (IOException e) { - e.printStackTrace(); - } - } - - public static class Handler implements IMessageHandler { - - @Override - public IMessage onMessage(CPacketFluidUpdate message, MessageContext ctx) { - Container container = ctx.getServerHandler().playerEntity.openContainer; - EntityPlayer player = ctx.getServerHandler().playerEntity; - if (container instanceof ContainerFluidMonitor) { - ((ContainerFluidMonitor) container).postChange(message.fluid, player, message.slotIndex, message.shift); - } - return null; - } - } -} diff --git a/src/main/java/com/glodblock/github/network/CPacketInventoryAction.java b/src/main/java/com/glodblock/github/network/CPacketInventoryAction.java deleted file mode 100644 index 9fdbe73f..00000000 --- a/src/main/java/com/glodblock/github/network/CPacketInventoryAction.java +++ /dev/null @@ -1,240 +0,0 @@ -package com.glodblock.github.network; - -import java.io.IOException; -import java.util.Objects; - -import javax.annotation.Nullable; - -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.client.gui.container.ContainerPatternMulti; -import com.glodblock.github.client.gui.container.ContainerPatternValueAmount; -import com.glodblock.github.common.item.ItemFluidPacket; -import com.glodblock.github.inventory.InventoryHandler; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.IWirelessTerminal; -import com.glodblock.github.util.BlockPos; -import com.glodblock.github.util.Util; - -import appeng.api.storage.data.IAEItemStack; -import appeng.container.AEBaseContainer; -import appeng.container.ContainerOpenContext; -import appeng.container.implementations.ContainerCraftAmount; -import appeng.container.implementations.ContainerPatternItemRenamer; -import appeng.helpers.InventoryAction; -import appeng.tile.networking.TileCableBus; -import appeng.util.item.AEItemStack; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - -public class CPacketInventoryAction implements IMessage { - - private InventoryAction action; - private int slot; - private long id; - private IAEItemStack stack; - private boolean isEmpty; - - public CPacketInventoryAction() {} - - public CPacketInventoryAction(final InventoryAction action, final int slot, final long id) { - this.action = action; - this.slot = slot; - this.id = id; - this.stack = null; - this.isEmpty = true; - } - - public CPacketInventoryAction(final InventoryAction action, final int slot, final long id, IAEItemStack stack) { - this.action = action; - this.slot = slot; - this.id = id; - this.stack = stack; - this.isEmpty = stack == null; - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(action.ordinal()); - buf.writeInt(slot); - buf.writeLong(id); - buf.writeBoolean(isEmpty); - if (!isEmpty) { - try { - stack.writeToPacket(buf); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - - @Override - public void fromBytes(ByteBuf buf) { - action = InventoryAction.values()[buf.readInt()]; - slot = buf.readInt(); - id = buf.readLong(); - isEmpty = buf.readBoolean(); - if (!isEmpty) { - try { - stack = AEItemStack.loadItemStackFromPacket(buf); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - - public static class Handler implements IMessageHandler { - - @Nullable - @Override - public IMessage onMessage(CPacketInventoryAction message, MessageContext ctx) { - final EntityPlayerMP sender = ctx.getServerHandler().playerEntity; - if (sender.openContainer instanceof final AEBaseContainer baseContainer) { - Object target = baseContainer.getTarget(); - if (message.action == InventoryAction.AUTO_CRAFT) { - final ContainerOpenContext context = baseContainer.getOpenContext(); - if (context != null) { - final TileEntity te = context.getTile(); - if (te != null) { - InventoryHandler.openGui( - sender, - te.getWorldObj(), - new BlockPos(te), - Objects.requireNonNull(baseContainer.getOpenContext().getSide()), - GuiType.FLUID_CRAFTING_AMOUNT); - } else if (target instanceof IWirelessTerminal wt) { - InventoryHandler.openGui( - sender, - sender.worldObj, - new BlockPos( - wt.getInventorySlot(), - Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM), - 0), - ForgeDirection.UNKNOWN, - GuiType.FLUID_CRAFTING_AMOUNT); - } - if (sender.openContainer instanceof final ContainerCraftAmount cca) { - if (baseContainer.getTargetStack() != null) { - cca.getCraftingItem().putStack(baseContainer.getTargetStack().getItemStack()); - cca.setItemToCraft(baseContainer.getTargetStack()); - if (message.id > 0) { - cca.setInitialCraftAmount(message.id); - } - } - cca.detectAndSendChanges(); - } - } - } else if (message.action == InventoryAction.SET_PATTERN_VALUE) { - final ContainerOpenContext context = baseContainer.getOpenContext(); - if (context != null && message.stack != null) { - final TileEntity te = context.getTile(); - if (te != null) { - if (te instanceof TileCableBus) { - InventoryHandler.openGui( - sender, - te.getWorldObj(), - new BlockPos(te), - Objects.requireNonNull(baseContainer.getOpenContext().getSide()), - GuiType.PATTERN_VALUE_SET); - } else { - InventoryHandler.openGui( - sender, - te.getWorldObj(), - new BlockPos(te), - Objects.requireNonNull(baseContainer.getOpenContext().getSide()), - GuiType.PATTERN_VALUE_SET_TILE); - } - } else if (target instanceof IWirelessTerminal wt) { - InventoryHandler.openGui( - sender, - sender.worldObj, - new BlockPos( - wt.getInventorySlot(), - Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM), - 0), - ForgeDirection.UNKNOWN, - GuiType.PATTERN_VALUE_SET); - } - int amt = (int) message.stack.getStackSize(); - if (message.stack.getItem() instanceof ItemFluidPacket) { - FluidStack fluid = ItemFluidPacket.getFluidStack(message.stack); - amt = fluid == null ? 1 : fluid.amount; - } - FluidCraft.proxy.netHandler.sendTo(new SPacketSetItemAmount(amt), sender); - if (sender.openContainer instanceof final ContainerPatternValueAmount cpv) { - if (baseContainer.getTargetStack() != null) { - cpv.setValueIndex(message.slot); - cpv.getPatternValue().putStack(baseContainer.getTargetStack().getItemStack()); - } - cpv.detectAndSendChanges(); - } - } - } else if (message.action == InventoryAction.SET_PATTERN_MULTI) { - final ContainerOpenContext context = baseContainer.getOpenContext(); - if (context != null) { - final TileEntity te = context.getTile(); - if (te != null) { - InventoryHandler.openGui( - sender, - te.getWorldObj(), - new BlockPos(te), - Objects.requireNonNull(baseContainer.getOpenContext().getSide()), - GuiType.GUI_PATTERN_MULTI); - } else if (target instanceof IWirelessTerminal wt) { - InventoryHandler.openGui( - sender, - sender.worldObj, - new BlockPos( - wt.getInventorySlot(), - Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM), - 0), - ForgeDirection.UNKNOWN, - GuiType.GUI_PATTERN_MULTI); - } - if (sender.openContainer instanceof ContainerPatternMulti cpm) { - cpm.detectAndSendChanges(); - } - } - } else if (message.action == InventoryAction.RENAME_PATTERN_ITEM) { - final ContainerOpenContext context = baseContainer.getOpenContext(); - if (context != null) { - final TileEntity te = context.getTile(); - if (te != null) { - InventoryHandler.openGui( - sender, - te.getWorldObj(), - new BlockPos(te), - Objects.requireNonNull(baseContainer.getOpenContext().getSide()), - GuiType.GUI_PATTERN_ITEM_RENAMER); - } else if (target instanceof IWirelessTerminal wt) { - InventoryHandler.openGui( - sender, - sender.worldObj, - new BlockPos( - wt.getInventorySlot(), - Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM), - 0), - ForgeDirection.UNKNOWN, - GuiType.GUI_PATTERN_ITEM_RENAMER); - } - if (sender.openContainer instanceof ContainerPatternItemRenamer cpir) { - if (baseContainer.getTargetStack() != null) { - cpir.getPatternValue().putStack(baseContainer.getTargetStack().getItemStack()); - } - cpir.detectAndSendChanges(); - } - } - }else { - baseContainer.doAction(sender, message.action, message.slot, message.id); - } - } - return null; - } - } -} diff --git a/src/main/java/com/glodblock/github/network/CPacketPatternMultiSet.java b/src/main/java/com/glodblock/github/network/CPacketPatternMultiSet.java deleted file mode 100644 index e3656d2b..00000000 --- a/src/main/java/com/glodblock/github/network/CPacketPatternMultiSet.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.glodblock.github.network; - -import java.util.Objects; - -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; - -import com.glodblock.github.client.gui.container.ContainerPatternMulti; -import com.glodblock.github.client.gui.container.base.FCContainerEncodeTerminal; -import com.glodblock.github.inventory.InventoryHandler; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.IWirelessTerminal; -import com.glodblock.github.util.BlockPos; -import com.glodblock.github.util.Util; - -import appeng.api.networking.IGridHost; -import appeng.container.ContainerOpenContext; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - -public class CPacketPatternMultiSet implements IMessage { - - private static GuiType guiType; - private static int multi; - - public CPacketPatternMultiSet(GuiType guiType, int multi) { - CPacketPatternMultiSet.guiType = guiType; - CPacketPatternMultiSet.multi = multi; - } - - public CPacketPatternMultiSet() { - // NO-OP - } - - @Override - public void fromBytes(ByteBuf byteBuf) { - guiType = GuiType.getByOrdinal(byteBuf.readByte()); - multi = byteBuf.readInt(); - } - - @Override - public void toBytes(ByteBuf byteBuf) { - byteBuf.writeByte(guiType != null ? guiType.ordinal() : 0); - byteBuf.writeInt(multi); - } - - public static class Handler implements IMessageHandler { - - @Override - public IMessage onMessage(CPacketPatternMultiSet message, MessageContext ctx) { - EntityPlayerMP player = ctx.getServerHandler().playerEntity; - if (player.openContainer instanceof ContainerPatternMulti cpv) { - final Object target = cpv.getTarget(); - if (target instanceof IGridHost) { - final ContainerOpenContext context = cpv.getOpenContext(); - if (context != null) { - final TileEntity te = context.getTile(); - if (te != null) { - InventoryHandler.openGui( - player, - te.getWorldObj(), - new BlockPos(te), - Objects.requireNonNull(cpv.getOpenContext().getSide()), - guiType); - } else if (target instanceof IWirelessTerminal wt) { - InventoryHandler.openGui( - player, - player.worldObj, - new BlockPos( - wt.getInventorySlot(), - Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM), - 0), - ForgeDirection.UNKNOWN, - guiType); - } - if (player.openContainer instanceof FCContainerEncodeTerminal cpt) { - cpt.multiplyOrDivideStacks(multi); - } - } - } - } - return null; - } - } - -} diff --git a/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java b/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java deleted file mode 100644 index e17557a9..00000000 --- a/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.glodblock.github.network; - -import java.util.Objects; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fluids.FluidStack; - -import com.glodblock.github.client.gui.container.ContainerPatternValueAmount; -import com.glodblock.github.client.gui.container.ContainerSuperStockReplenisher; -import com.glodblock.github.client.gui.container.base.FCContainerEncodeTerminal; -import com.glodblock.github.common.item.ItemFluidPacket; -import com.glodblock.github.inventory.InventoryHandler; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.gui.PartOrItemGuiFactory; -import com.glodblock.github.inventory.item.IWirelessTerminal; -import com.glodblock.github.util.BlockPos; -import com.glodblock.github.util.Util; - -import appeng.api.networking.IGridHost; -import appeng.container.ContainerOpenContext; -import appeng.container.slot.SlotFake; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - -public class CPacketPatternValueSet implements IMessage { - - private GuiType originGui; - private int amount; - private int valueIndex; - - public CPacketPatternValueSet() { - // NO-OP - } - - public CPacketPatternValueSet(int originalGui, int amount, int valueIndex) { - this.originGui = GuiType.getByOrdinal(originalGui); - this.amount = amount; - this.valueIndex = valueIndex; - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(originGui.ordinal()); - buf.writeInt(amount); - buf.writeInt(valueIndex); - } - - @Override - public void fromBytes(ByteBuf buf) { - this.originGui = GuiType.getByOrdinal(buf.readInt()); - this.amount = buf.readInt(); - this.valueIndex = buf.readInt(); - } - - public static class Handler implements IMessageHandler { - - @Override - public IMessage onMessage(CPacketPatternValueSet message, MessageContext ctx) { - EntityPlayer player = ctx.getServerHandler().playerEntity; - if (player.openContainer instanceof ContainerPatternValueAmount cpv) { - final Object target = cpv.getTarget(); - if (target instanceof IGridHost) { - final ContainerOpenContext context = cpv.getOpenContext(); - if (context != null) { - final TileEntity te = context.getTile(); - if (te != null) { - InventoryHandler.openGui( - player, - player.worldObj, - new BlockPos(te), - Objects.requireNonNull(context.getSide()), - message.originGui); - } else if (message.originGui.guiFactory instanceof PartOrItemGuiFactory) { - InventoryHandler.openGui( - player, - player.worldObj, - new BlockPos( - player.inventory.currentItem, - Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM), - 0), - Objects.requireNonNull(context.getSide()), - message.originGui); - } else if (target instanceof IWirelessTerminal) { - InventoryHandler.openGui( - player, - player.worldObj, - new BlockPos(((IWirelessTerminal) target).getInventorySlot(), 0, 0), - Objects.requireNonNull(context.getSide()), - message.originGui); - } - if (player.openContainer instanceof FCContainerEncodeTerminal - || player.openContainer instanceof ContainerSuperStockReplenisher) { - Slot slot = player.openContainer.getSlot(message.valueIndex); - if (slot instanceof SlotFake) { - ItemStack stack = slot.getStack().copy(); - if (Util.isFluidPacket(stack)) { - FluidStack fluidStack = ItemFluidPacket.getFluidStack(stack); - if (fluidStack != null) { - fluidStack = ItemFluidPacket.getFluidStack(stack).copy(); - fluidStack.amount = message.amount; - } - slot.putStack(ItemFluidPacket.newStack(fluidStack)); - } else { - stack.stackSize = message.amount; - slot.putStack(stack); - } - } - } - } - } - } - return null; - } - } -} diff --git a/src/main/java/com/glodblock/github/network/CPacketRenamer.java b/src/main/java/com/glodblock/github/network/CPacketRenamer.java deleted file mode 100644 index 7acef54f..00000000 --- a/src/main/java/com/glodblock/github/network/CPacketRenamer.java +++ /dev/null @@ -1,187 +0,0 @@ -package com.glodblock.github.network; - -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.DimensionManager; -import net.minecraftforge.common.util.ForgeDirection; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.inventory.InventoryHandler; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.IClickableInTerminal; -import com.glodblock.github.inventory.item.IWirelessTerminal; -import com.glodblock.github.util.BlockPos; -import com.glodblock.github.util.Util; - -import appeng.api.implementations.IUpgradeableHost; -import appeng.container.AEBaseContainer; -import appeng.helpers.ICustomNameObject; -import appeng.tile.networking.TileCableBus; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - -public class CPacketRenamer implements IMessage { - - private int x; - private int y; - private int z; - private int dim; - private ForgeDirection side; - private Action action; - private String text; - - public enum Action { - OPEN, - GET_TEXT, - SET_TEXT, - } - - public CPacketRenamer() {} - - public CPacketRenamer(String text) { - this.action = Action.SET_TEXT; - this.text = text; - } - - public CPacketRenamer(Action a) { - this.action = a; - } - - public CPacketRenamer(int x, int y, int z, int dim, ForgeDirection side) { - this.action = Action.OPEN; - this.x = x; - this.y = y; - this.z = z; - this.dim = dim; - this.side = side; - } - - @Override - public void fromBytes(ByteBuf buf) { - this.action = Action.values()[buf.readInt()]; - if (this.action == Action.OPEN) { - this.x = buf.readInt(); - this.y = buf.readInt(); - this.z = buf.readInt(); - this.dim = buf.readInt(); - this.side = ForgeDirection.getOrientation(buf.readInt()); - } else if (this.action == Action.SET_TEXT) { - int leName = buf.readInt(); - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < leName; i++) { - sb.append(buf.readChar()); - } - this.text = sb.toString(); - } - - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(this.action.ordinal()); - if (this.action == Action.OPEN) { - buf.writeInt(this.x); - buf.writeInt(this.y); - buf.writeInt(this.z); - buf.writeInt(this.dim); - buf.writeInt(side.ordinal()); - } else if (this.action == Action.SET_TEXT) { - buf.writeInt(this.text.length()); - for (int i = 0; i < this.text.length(); i++) { - buf.writeChar(this.text.charAt(i)); - } - } - } - - public static class Handler implements IMessageHandler { - - private String getName(ICustomNameObject obj) { - return obj.hasCustomName() ? obj.getCustomName() : ""; - } - - private String getName(TileEntity tile, ForgeDirection side) { - if (tile instanceof TileCableBus) { - return getName((ICustomNameObject) ((TileCableBus) tile).getPart(side)); - } else { - return getName((ICustomNameObject) tile); - } - } - - private void setName(TileEntity tile, ForgeDirection side, String text) { - if (tile instanceof TileCableBus) { - ((ICustomNameObject) ((TileCableBus) tile).getPart(side)).setCustomName(text); - } else { - ((ICustomNameObject) tile).setCustomName(text); - } - } - - @Override - public IMessage onMessage(CPacketRenamer message, MessageContext ctx) { - EntityPlayerMP player = ctx.getServerHandler().playerEntity; - AEBaseContainer con = (AEBaseContainer) player.openContainer; - switch (message.action) { - case OPEN -> { - if (con.getTarget() instanceof IClickableInTerminal clickableInterface) { - TileEntity tile = DimensionManager.getWorld(message.dim) - .getTileEntity(message.x, message.y, message.z); - if (!(tile instanceof ICustomNameObject)) { - break; - } - - String name = getName(tile, message.side); - clickableInterface.setClickedInterface( - new Util.DimensionalCoordSide( - message.x, - message.y, - message.z, - message.dim, - message.side, - name)); - - if (con.getTarget() instanceof IWirelessTerminal terminal) { - InventoryHandler.openGui( - player, - player.worldObj, - new BlockPos( - terminal.getInventorySlot(), - Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM), - 1), - message.side, - GuiType.RENAMER); - } else if (con.getTarget() instanceof IUpgradeableHost host) { - InventoryHandler.openGui( - player, - player.worldObj, - new BlockPos(host.getTile()), - con.getOpenContext().getSide(), - GuiType.RENAMER); - } - } - } - case GET_TEXT -> { - if (con.getTarget() instanceof IClickableInTerminal clickableInterface) { - Util.DimensionalCoordSide intMsg = clickableInterface.getClickedInterface(); - TileEntity tile = DimensionManager.getWorld(intMsg.getDimension()) - .getTileEntity(intMsg.x, intMsg.y, intMsg.z); - FluidCraft.proxy.netHandler - .sendTo(new SPacketStringUpdate(this.getName(tile, intMsg.getSide())), player); - } - } - case SET_TEXT -> { - if (con.getTarget() instanceof IClickableInTerminal clickableInterface) { - Util.DimensionalCoordSide intMsg = clickableInterface.getClickedInterface(); - TileEntity tile = DimensionManager.getWorld(intMsg.getDimension()) - .getTileEntity(intMsg.x, intMsg.y, intMsg.z); - this.setName(tile, intMsg.getSide(), message.text); - - FluidCraft.proxy.netHandler.sendTo(new SPacketSwitchBack(), player); - } - } - } - return null; - } - - } -} diff --git a/src/main/java/com/glodblock/github/network/CPacketSwitchGuis.java b/src/main/java/com/glodblock/github/network/CPacketSwitchGuis.java index 834a88e0..59a214be 100644 --- a/src/main/java/com/glodblock/github/network/CPacketSwitchGuis.java +++ b/src/main/java/com/glodblock/github/network/CPacketSwitchGuis.java @@ -17,6 +17,8 @@ import com.glodblock.github.util.Util; import appeng.container.AEBaseContainer; import appeng.container.ContainerOpenContext; +import appeng.core.sync.GuiBridge; +import appeng.util.Platform; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; @@ -24,14 +26,14 @@ import io.netty.buffer.ByteBuf; public class CPacketSwitchGuis implements IMessage { - private GuiType guiType; + private Object guiType; private boolean switchTerminal; - public CPacketSwitchGuis(GuiType guiType) { + public CPacketSwitchGuis(Object guiType) { this(guiType, false); } - public CPacketSwitchGuis(GuiType guiType, boolean switchTerminal) { + public CPacketSwitchGuis(Object guiType, boolean switchTerminal) { this.guiType = guiType; this.switchTerminal = switchTerminal; } @@ -42,13 +44,25 @@ public class CPacketSwitchGuis implements IMessage { @Override public void fromBytes(ByteBuf byteBuf) { - guiType = GuiType.getByOrdinal(byteBuf.readByte()); + switch (byteBuf.readByte()) { + case 0 -> { + guiType = GuiType.getByOrdinal(byteBuf.readByte()); + } + case 1 -> { + guiType = GuiBridge.values()[(byteBuf.readByte())]; + } + } switchTerminal = byteBuf.readBoolean(); } @Override public void toBytes(ByteBuf byteBuf) { - byteBuf.writeByte(guiType != null ? guiType.ordinal() : 0); + if (guiType instanceof GuiType) { + byteBuf.writeByte(0); + } else if (guiType instanceof GuiBridge) { + byteBuf.writeByte(1); + } + byteBuf.writeByte(guiType != null ? ((Enum) guiType).ordinal() : 0); byteBuf.writeBoolean(this.switchTerminal); } @@ -78,22 +92,30 @@ public class CPacketSwitchGuis implements IMessage { } TileEntity te = context.getTile(); if (te != null) { - InventoryHandler.openGui( - player, - player.worldObj, - new BlockPos(te), - Objects.requireNonNull(context.getSide()), - message.guiType); + if (message.guiType instanceof GuiType gt) { + InventoryHandler.openGui( + player, + player.worldObj, + new BlockPos(te), + Objects.requireNonNull(context.getSide()), + gt); + } else if (message.guiType instanceof GuiBridge gb) { + Platform.openGUI(player, te, context.getSide(), gb); + } } else if (((AEBaseContainer) cont).getTarget() instanceof IWirelessTerminal) { - InventoryHandler.openGui( - player, - player.worldObj, - new BlockPos( - ((IWirelessTerminal) ((AEBaseContainer) cont).getTarget()).getInventorySlot(), - Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM), - 0), - Objects.requireNonNull(context.getSide()), - message.guiType); + if (message.guiType instanceof GuiType gt) { + InventoryHandler.openGui( + player, + player.worldObj, + new BlockPos( + ((IWirelessTerminal) ((AEBaseContainer) cont).getTarget()).getInventorySlot(), + Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM), + 0), + Objects.requireNonNull(context.getSide()), + gt); + } else if (message.guiType instanceof GuiBridge gb) { + Platform.openGUI(player, null, null, gb); + } } } return null; diff --git a/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java b/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java deleted file mode 100644 index 77917c8f..00000000 --- a/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java +++ /dev/null @@ -1,169 +0,0 @@ -package com.glodblock.github.network; - -import java.util.LinkedList; -import java.util.List; - -import javax.annotation.Nullable; - -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.FluidStack; - -import com.glodblock.github.client.gui.container.ContainerItemMonitor; -import com.glodblock.github.client.gui.container.base.FCContainerEncodeTerminal; -import com.glodblock.github.common.item.ItemFluidPacket; -import com.glodblock.github.nei.NEIUtils; -import com.glodblock.github.nei.object.OrderStack; - -import appeng.api.AEApi; -import appeng.api.storage.IMEMonitor; -import appeng.api.storage.data.IAEItemStack; -import appeng.api.storage.data.IItemList; -import cpw.mods.fml.common.network.ByteBufUtils; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - -public class CPacketTransferRecipe implements IMessage { - - private List> inputs; - private List> outputs; - private boolean isCraft; - private static final int MAX_INDEX = 81; - private static final int MAX_SLOTS_INDEX = 32; - private boolean shift; - - public CPacketTransferRecipe() {} - - public CPacketTransferRecipe(List> IN, List> OUT, boolean craft) { - this(IN, OUT, craft, false); - } - - public CPacketTransferRecipe(List> IN, List> OUT, boolean craft, boolean shift) { - this.inputs = IN; - this.outputs = OUT; - this.isCraft = craft; - this.shift = shift; - } - - // TODO: this should use GZIP to compress the message - // NBT to ByteBuf has a compress stream - @Override - public void toBytes(ByteBuf buf) { - buf.writeBoolean(isCraft); - buf.writeBoolean(shift); - NBTTagCompound nbt_m = new NBTTagCompound(); - NBTTagCompound nbt_i = new NBTTagCompound(); - NBTTagCompound nbt_o = new NBTTagCompound(); - for (OrderStack stack : inputs) { - stack.writeToNBT(nbt_i); - } - for (OrderStack stack : outputs) { - stack.writeToNBT(nbt_o); - } - nbt_m.setTag("i", nbt_i); - nbt_m.setTag("o", nbt_o); - ByteBufUtils.writeTag(buf, nbt_m); - } - - @Override - public void fromBytes(ByteBuf buf) { - isCraft = buf.readBoolean(); - shift = buf.readBoolean(); - inputs = new LinkedList<>(); - outputs = new LinkedList<>(); - NBTTagCompound nbt_m = ByteBufUtils.readTag(buf); - NBTTagCompound nbt_i = nbt_m.getCompoundTag("i"); - NBTTagCompound nbt_o = nbt_m.getCompoundTag("o"); - for (int i = 0; i < MAX_INDEX; i++) { - OrderStack tmp = OrderStack.readFromNBT(nbt_i, null, i); - if (tmp != null && inputs.size() < MAX_SLOTS_INDEX) inputs.add(tmp); - } - for (int i = 0; i < MAX_INDEX; i++) { - OrderStack tmp = OrderStack.readFromNBT(nbt_o, null, i); - if (tmp != null && inputs.size() < MAX_SLOTS_INDEX) outputs.add(tmp); - } - } - - public static class Handler implements IMessageHandler { - - @Nullable - @Override - @SuppressWarnings("unchecked") - public IMessage onMessage(CPacketTransferRecipe message, MessageContext ctx) { - Container c = ctx.getServerHandler().playerEntity.openContainer; - if (c instanceof ContainerItemMonitor) { - IMEMonitor monitor = ((ContainerItemMonitor) c).getMonitor(); - IItemList storageList = AEApi.instance().storage().createItemList(); - if (monitor != null) { - storageList = monitor.getStorageList(); - } - if (c instanceof FCContainerEncodeTerminal cf) { - // pattern terminal only - - boolean combine = cf.combine; - cf.getPatternTerminal().setCraftingRecipe(message.isCraft); - IInventory inputSlot = cf.getInventoryByName("crafting"); - IInventory outputSlot = cf.getInventoryByName("output"); - for (int i = 0; i < inputSlot.getSizeInventory(); i++) { - inputSlot.setInventorySlotContents(i, null); - } - for (int i = 0; i < outputSlot.getSizeInventory(); i++) { - outputSlot.setInventorySlotContents(i, null); - } - - if (!message.isCraft) { - if (combine) { - message.inputs = NEIUtils.compress(message.inputs); - message.outputs = NEIUtils.compress(message.outputs); - } - message.inputs = NEIUtils.clearNull(message.inputs); - message.outputs = NEIUtils.clearNull(message.outputs); - } - // using exists item to fill slot - if (message.shift && !storageList.isEmpty()) { - for (@SuppressWarnings("rawtypes") - OrderStack stack : message.inputs) { - if (stack.getStack() instanceof FluidStack || stack.getItems() == null) continue; - IAEItemStack iaeItemStack = AEApi.instance().storage() - .createItemStack((ItemStack) stack.getStack()); - if (storageList.findPrecise(iaeItemStack) == null) { - // try to replace item - for (ItemStack replaceItemStack : stack.getItems()) { - if (storageList.findPrecise( - AEApi.instance().storage().createItemStack(replaceItemStack)) != null) { - stack.putStack(replaceItemStack); - } - } - } - } - } - transferPack(message.inputs, inputSlot); - transferPack(message.outputs, outputSlot); - c.onCraftMatrixChanged(inputSlot); - c.onCraftMatrixChanged(outputSlot); - } - } - - return null; - } - - private void transferPack(List> packs, IInventory inv) { - for (OrderStack stack : packs) { - if (stack != null) { - int index = stack.getIndex(); - ItemStack stack1; - if (stack.getStack() instanceof ItemStack) { - stack1 = ((ItemStack) stack.getStack()).copy(); - } else if (stack.getStack() instanceof FluidStack) { - stack1 = ItemFluidPacket.newStack((FluidStack) stack.getStack()); - } else throw new UnsupportedOperationException("Trying to get an unsupported item!"); - if (index < inv.getSizeInventory()) inv.setInventorySlotContents(index, stack1); - } - } - } - } -} diff --git a/src/main/java/com/glodblock/github/network/SPacketFluidUpdate.java b/src/main/java/com/glodblock/github/network/SPacketFluidUpdate.java index 0ff0601b..618ba002 100644 --- a/src/main/java/com/glodblock/github/network/SPacketFluidUpdate.java +++ b/src/main/java/com/glodblock/github/network/SPacketFluidUpdate.java @@ -8,12 +8,10 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.item.ItemStack; -import com.glodblock.github.client.gui.GuiEssentiaTerminal; import com.glodblock.github.client.gui.GuiFluidIO; import com.glodblock.github.client.gui.GuiFluidInterface; import com.glodblock.github.client.gui.GuiFluidLevelEmitter; import com.glodblock.github.client.gui.GuiFluidStorageBus; -import com.glodblock.github.client.gui.GuiFluidTerminal; import com.glodblock.github.client.gui.GuiIngredientBuffer; import com.glodblock.github.client.gui.GuiLargeIngredientBuffer; import com.glodblock.github.util.Util; @@ -98,18 +96,6 @@ public class SPacketFluidUpdate implements IMessage { for (Map.Entry e : message.list.entrySet()) { ((GuiFluidInterface) gs).update(e.getKey(), e.getValue()); } - } else if (gs instanceof GuiFluidTerminal) { - if (message.itemStack != null) { - ((GuiFluidTerminal) gs).update(message.itemStack.getItemStack()); - } else { - ((GuiFluidTerminal) gs).update(null); - } - } else if (gs instanceof GuiEssentiaTerminal) { - if (message.itemStack != null) { - ((GuiEssentiaTerminal) gs).update(message.itemStack.getItemStack()); - } else { - ((GuiEssentiaTerminal) gs).update(null); - } } else if (gs instanceof GuiFluidStorageBus) { for (Map.Entry e : message.list.entrySet()) ((GuiFluidStorageBus) gs).update(e.getKey(), e.getValue()); diff --git a/src/main/java/com/glodblock/github/network/SPacketMEFluidInvUpdate.java b/src/main/java/com/glodblock/github/network/SPacketMEFluidInvUpdate.java deleted file mode 100644 index caef56ea..00000000 --- a/src/main/java/com/glodblock/github/network/SPacketMEFluidInvUpdate.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.glodblock.github.network; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; - -import com.glodblock.github.client.gui.GuiFluidCraftConfirm; -import com.glodblock.github.client.gui.GuiFluidMonitor; - -import appeng.api.storage.data.IAEFluidStack; -import appeng.util.item.AEFluidStack; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - -/** - * Dedicated packet for fluid updates. - */ -public class SPacketMEFluidInvUpdate implements IMessage { - - private List list = new ArrayList<>(); - private byte ref = (byte) 0; - private boolean resort = true; - - public SPacketMEFluidInvUpdate() {} - - /** - * Used for the GUI to confirm crafting. 0 = available 1 = pending 2 = missing - */ - public SPacketMEFluidInvUpdate(byte b) { - ref = b; - } - - /** - * If resort, call "updateView()". Used when multiple packets are sent to open an inventory; only the last packet - * should resort - * - * @param resort whether this packet should resort the term or not - */ - public SPacketMEFluidInvUpdate(boolean resort) { - this.resort = resort; - } - - @Override - public void fromBytes(ByteBuf buf) { - ref = buf.readByte(); - resort = buf.readBoolean(); - int amount = buf.readInt(); - list = new ArrayList<>(amount); - try { - for (int i = 0; i < amount; i++) { - list.add(AEFluidStack.loadFluidStackFromPacket(buf)); - } - } catch (Exception io) { - System.out.println("Error handling payload w/ " + amount + " items."); - io.printStackTrace(); - } - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeByte(ref); - buf.writeBoolean(resort); - buf.writeInt(list.size()); - try { - for (IAEFluidStack is : list) { - is.writeToPacket(buf); - } - } catch (IOException io) { - io.printStackTrace(); - } - } - - public void setResort(boolean resort) { - this.resort = resort; - } - - public void appendFluid(final IAEFluidStack is) { - list.add(is); - } - - public boolean isEmpty() { - return this.list.isEmpty(); - } - - public static class Handler implements IMessageHandler { - - @Override - @SuppressWarnings({ "unchecked", "rawtypes" }) - public IMessage onMessage(SPacketMEFluidInvUpdate message, MessageContext ctx) { - final GuiScreen gs = Minecraft.getMinecraft().currentScreen; - if (gs instanceof GuiFluidMonitor) { - ((GuiFluidMonitor) gs).postUpdate(message.list, message.resort); - } else if (gs instanceof GuiFluidCraftConfirm) { - ((GuiFluidCraftConfirm) gs).postUpdate((List) message.list, message.ref); - } - return null; - } - } -} diff --git a/src/main/java/com/glodblock/github/network/SPacketMEItemInvUpdate.java b/src/main/java/com/glodblock/github/network/SPacketMEItemInvUpdate.java deleted file mode 100644 index 59435f02..00000000 --- a/src/main/java/com/glodblock/github/network/SPacketMEItemInvUpdate.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.glodblock.github.network; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; - -import com.glodblock.github.client.gui.GuiFluidCraftConfirm; -import com.glodblock.github.client.gui.GuiItemMonitor; - -import appeng.api.storage.data.IAEItemStack; -import appeng.util.item.AEItemStack; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - -/** - * Packet dedicated to item inventory update. - */ -public class SPacketMEItemInvUpdate implements IMessage { - - private List list = new ArrayList<>(); - private byte ref = (byte) 0; - private boolean resort = true; - - public SPacketMEItemInvUpdate() {} - - /** - * Used for the GUI to confirm crafting. 0 = available 1 = pending 2 = missing - */ - public SPacketMEItemInvUpdate(byte b) { - ref = b; - } - - /** - * If resort, call "updateView()". Used when multiple packets are sent to open an inventory; only the last packet - * should resort. - * - * @param resort whether this packet should resort the term or not - */ - public SPacketMEItemInvUpdate(boolean resort) { - this.resort = resort; - } - - @Override - public void fromBytes(ByteBuf buf) { - ref = buf.readByte(); - resort = buf.readBoolean(); - int amount = buf.readInt(); - list = new ArrayList<>(amount); - try { - for (int i = 0; i < amount; i++) { - list.add(AEItemStack.loadItemStackFromPacket(buf)); - } - } catch (Exception io) { - System.out.println("Error handling payload w/ " + amount + " items."); - io.printStackTrace(); - } - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeByte(ref); - buf.writeBoolean(resort); - buf.writeInt(list.size()); - try { - for (IAEItemStack is : list) { - is.writeToPacket(buf); - } - } catch (IOException io) { - io.printStackTrace(); - } - } - - public void setResort(boolean resort) { - this.resort = resort; - } - - public void appendItem(final IAEItemStack is) { - list.add(is); - } - - public boolean isEmpty() { - return this.list.isEmpty(); - } - - public static class Handler implements IMessageHandler { - - @Override - public IMessage onMessage(SPacketMEItemInvUpdate message, MessageContext ctx) { - final GuiScreen gs = Minecraft.getMinecraft().currentScreen; - if (gs instanceof GuiItemMonitor) { - ((GuiItemMonitor) gs).postUpdate(message.list, message.resort); - } else if (gs instanceof GuiFluidCraftConfirm) {} - return null; - } - } -} diff --git a/src/main/java/com/glodblock/github/network/SPacketMEUpdateBuffer.java b/src/main/java/com/glodblock/github/network/SPacketMEUpdateBuffer.java deleted file mode 100644 index e7c5aefa..00000000 --- a/src/main/java/com/glodblock/github/network/SPacketMEUpdateBuffer.java +++ /dev/null @@ -1,137 +0,0 @@ -package com.glodblock.github.network; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; - -import net.minecraft.entity.player.EntityPlayerMP; - -import com.glodblock.github.FluidCraft; -import com.glodblock.github.common.Config; - -import appeng.api.storage.data.IAEFluidStack; -import appeng.api.storage.data.IAEItemStack; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; - -/** - * Only should exist on the server side! Schedules packets to be sent every `packetRate` ms. - */ -public class SPacketMEUpdateBuffer { - - private static ScheduledExecutorService executor; - private static ScheduledFuture task; - - private static final Map> itemBuffer = new HashMap<>(); - - private static final Map> fluidBuffer = new HashMap<>(); - - public static void init() { - executor = Executors.newSingleThreadScheduledExecutor(r -> { - Thread thread = new Thread(r); - thread.setName("AE2FC Network worker"); - thread.setDaemon(true); - thread.setPriority(6); - return thread; - }); - task = executor - .scheduleAtFixedRate(SPacketMEUpdateBuffer::sendBuffer, 0, Config.packetRate, TimeUnit.MILLISECONDS); - } - - public static void disable() { - if (task != null) { - task.cancel(false); - } - if (executor != null) { - executor.shutdown(); - } - } - - public static void scheduleItemUpdate(EntityPlayerMP player, List stacks) { - synchronized (itemBuffer) { - if (!itemBuffer.containsKey(player)) { - itemBuffer.put(player, new LinkedHashSet<>(1024)); - } - LinkedHashSet buffer = itemBuffer.get(player); - stacks.forEach(s -> buffer.add(s.copy())); - } - } - - public static void scheduleFluidUpdate(EntityPlayerMP player, List stacks) { - synchronized (itemBuffer) { - if (!fluidBuffer.containsKey(player)) { - fluidBuffer.put(player, new LinkedHashSet<>(1024)); - } - LinkedHashSet buffer = fluidBuffer.get(player); - stacks.forEach(s -> buffer.add(s.copy())); - } - } - - public static void sendBuffer() { - synchronized (itemBuffer) { - itemBuffer.forEach((player, updates) -> { - if (updates.isEmpty()) return; - int i = 0; - SPacketMEItemInvUpdate packet = new SPacketMEItemInvUpdate(false); - Iterator it = updates.iterator(); - while (it.hasNext()) { - if (i < Config.packetSize) { - packet.appendItem(it.next()); - it.remove(); - i++; - } else { - FluidCraft.proxy.netHandler.sendTo(packet, player); - packet = new SPacketMEItemInvUpdate(false); - i = 0; - } - } - packet.setResort(true); - FluidCraft.proxy.netHandler.sendTo(packet, player); - }); - fluidBuffer.forEach((player, updates) -> { - if (updates.isEmpty()) return; - int i = 0; - SPacketMEFluidInvUpdate packet = new SPacketMEFluidInvUpdate(false); - Iterator it = updates.iterator(); - while (it.hasNext()) { - if (i < Config.packetSize) { - packet.appendFluid(it.next()); - it.remove(); - i++; - } else { - FluidCraft.proxy.netHandler.sendTo(packet, player); - packet = new SPacketMEFluidInvUpdate(false); - i = 0; - } - } - packet.setResort(true); - FluidCraft.proxy.netHandler.sendTo(packet, player); - }); - - } - } - - public static void clear(EntityPlayerMP player) { - synchronized (itemBuffer) { - if (itemBuffer.containsKey(player)) { - itemBuffer.get(player).clear(); - } - if (fluidBuffer.containsKey(player)) { - fluidBuffer.get(player).clear(); - } - } - } - - @SubscribeEvent - public void onPlayerLeave(PlayerEvent.PlayerLoggedOutEvent event) { - if (event.player instanceof EntityPlayerMP) { - clear((EntityPlayerMP) event.player); - } - } -} diff --git a/src/main/java/com/glodblock/github/network/SPacketPatternItemRenamer.java b/src/main/java/com/glodblock/github/network/SPacketPatternItemRenamer.java deleted file mode 100644 index d222cfe5..00000000 --- a/src/main/java/com/glodblock/github/network/SPacketPatternItemRenamer.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.glodblock.github.network; - -import java.util.Objects; - -import javax.annotation.Nullable; - -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; - -import com.glodblock.github.client.gui.container.base.FCContainerEncodeTerminal; -import com.glodblock.github.inventory.InventoryHandler; -import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.IWirelessTerminal; -import com.glodblock.github.util.BlockPos; -import com.glodblock.github.util.Util; - -import appeng.container.ContainerOpenContext; -import appeng.container.implementations.ContainerPatternItemRenamer; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - -public class SPacketPatternItemRenamer implements IMessage { - - private GuiType guiType; - private String name = ""; - private int valueIndex; - - public SPacketPatternItemRenamer() {} - - public SPacketPatternItemRenamer(GuiType guiType, String text, int valIndex) { - this.guiType = guiType; - name = text; - valueIndex = valIndex; - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeByte(guiType != null ? guiType.ordinal() : 0); - buf.writeInt(valueIndex); - - buf.writeInt(name.length()); - for (int i = 0; i < name.length(); i++) { - buf.writeChar(name.charAt(i)); - } - } - - @Override - public void fromBytes(ByteBuf buf) { - guiType = GuiType.getByOrdinal(buf.readByte()); - valueIndex = buf.readInt(); - - int leName = buf.readInt(); - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < leName; i++) { - sb.append(buf.readChar()); - } - name = sb.toString(); - } - - public static class Handler implements IMessageHandler { - - @Nullable - @Override - public IMessage onMessage(SPacketPatternItemRenamer message, MessageContext ctx) { - EntityPlayerMP player = ctx.getServerHandler().playerEntity; - if (player.openContainer instanceof ContainerPatternItemRenamer cpv) { - ContainerOpenContext context = cpv.getOpenContext(); - if (context == null) { - return null; - } - TileEntity te = context.getTile(); - if (te != null) { - InventoryHandler.openGui( - player, - player.worldObj, - new BlockPos(te), - Objects.requireNonNull(context.getSide()), - message.guiType); - } else if (cpv.getTarget() instanceof IWirelessTerminal iwt) { - InventoryHandler.openGui( - player, - player.worldObj, - new BlockPos( - iwt.getInventorySlot(), - Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM), - 0), - Objects.requireNonNull(context.getSide()), - message.guiType); - } - if (player.openContainer instanceof FCContainerEncodeTerminal) { - Slot slot = player.openContainer.getSlot(message.valueIndex); - if (slot != null && slot.getHasStack()) { - ItemStack nextStack = slot.getStack().copy(); - nextStack.setStackDisplayName(message.name); - slot.putStack(nextStack); - } - } - } - return null; - } - } -} diff --git a/src/main/java/com/glodblock/github/network/SPacketSetItemAmount.java b/src/main/java/com/glodblock/github/network/SPacketSetItemAmount.java deleted file mode 100644 index 53c18234..00000000 --- a/src/main/java/com/glodblock/github/network/SPacketSetItemAmount.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.glodblock.github.network; - -import javax.annotation.Nullable; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; - -import com.glodblock.github.client.gui.GuiPatternValueAmount; - -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - -public class SPacketSetItemAmount implements IMessage { - - private int amount; - - public SPacketSetItemAmount() { - // NO-OP - } - - public SPacketSetItemAmount(int amount) { - this.amount = amount; - } - - @Override - public void fromBytes(ByteBuf buf) { - amount = buf.readInt(); - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(amount); - } - - public static class Handler implements IMessageHandler { - - @Nullable - @Override - public IMessage onMessage(SPacketSetItemAmount message, MessageContext ctx) { - final GuiScreen gs = Minecraft.getMinecraft().currentScreen; - if (gs instanceof GuiPatternValueAmount) { - ((GuiPatternValueAmount) gs).setAmount(message.amount); - } - return null; - } - } -} diff --git a/src/main/java/com/glodblock/github/network/SPacketStringUpdate.java b/src/main/java/com/glodblock/github/network/SPacketStringUpdate.java deleted file mode 100644 index 30698892..00000000 --- a/src/main/java/com/glodblock/github/network/SPacketStringUpdate.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.glodblock.github.network; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; - -import com.glodblock.github.client.gui.GuiRenamer; - -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - -public class SPacketStringUpdate implements IMessage { - - private String text; - private int slot; - - public SPacketStringUpdate() {} - - public SPacketStringUpdate(String text, int slot) { - this.text = text; - this.slot = slot; - } - - public SPacketStringUpdate(String text) { - this.text = text; - this.slot = 0; - } - - @Override - public void fromBytes(ByteBuf buf) { - this.slot = buf.readInt(); - int leName = buf.readInt(); - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < leName; i++) { - sb.append(buf.readChar()); - } - this.text = sb.toString(); - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(this.slot); - buf.writeInt(this.text.length()); - for (int i = 0; i < this.text.length(); i++) { - buf.writeChar(this.text.charAt(i)); - } - } - - public static class Handler implements IMessageHandler { - - @Override - public IMessage onMessage(SPacketStringUpdate message, MessageContext ctx) { - final GuiScreen gs = Minecraft.getMinecraft().currentScreen; - if (gs instanceof GuiRenamer) { - ((GuiRenamer) gs).postUpdate(message.text); - } - return null; - } - } -} diff --git a/src/main/java/com/glodblock/github/network/SPacketSwitchBack.java b/src/main/java/com/glodblock/github/network/SPacketSwitchBack.java deleted file mode 100644 index 8cb61a01..00000000 --- a/src/main/java/com/glodblock/github/network/SPacketSwitchBack.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.glodblock.github.network; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; - -import com.glodblock.github.client.gui.GuiRenamer; - -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - -public class SPacketSwitchBack implements IMessage { - - public SPacketSwitchBack() {} - - @Override - public void fromBytes(ByteBuf buf) {} - - @Override - public void toBytes(ByteBuf buf) {} - - public static class Handler implements IMessageHandler { - - @Override - public IMessage onMessage(SPacketSwitchBack message, MessageContext ctx) { - final GuiScreen gs = Minecraft.getMinecraft().currentScreen; - if (gs instanceof GuiRenamer) { - ((GuiRenamer) gs).switchGui(); - } - return null; - } - } -} diff --git a/src/main/java/com/glodblock/github/proxy/CommonProxy.java b/src/main/java/com/glodblock/github/proxy/CommonProxy.java index 2e859460..28373ffd 100644 --- a/src/main/java/com/glodblock/github/proxy/CommonProxy.java +++ b/src/main/java/com/glodblock/github/proxy/CommonProxy.java @@ -23,7 +23,6 @@ import com.glodblock.github.inventory.item.WirelessMagnet; import com.glodblock.github.inventory.item.WirelessMagnetCardFilterInventory; import com.glodblock.github.inventory.item.WirelessMagnetCardFilterInventory.FilterCache; import com.glodblock.github.loader.ItemAndBlockHolder; -import com.glodblock.github.network.SPacketMEUpdateBuffer; import com.glodblock.github.network.wrapper.FCNetworkWrapper; import com.glodblock.github.util.ModAndClassUtil; import com.glodblock.github.util.Util; @@ -91,7 +90,6 @@ public class CommonProxy { public void init(FMLInitializationEvent event) { this.registerMovables(); - FMLCommonHandler.instance().bus().register(new SPacketMEUpdateBuffer()); if (ModAndClassUtil.ThE) { AspectUtil.init(); }