From dbbaea9235ce7f15f217662e3cb6ef09bf26fde6 Mon Sep 17 00:00:00 2001 From: vfyjxf <2331007009@qq.com> Date: Sun, 14 Aug 2022 00:44:55 +0800 Subject: [PATCH 1/3] Allows the use of the middle mouse button to modify the number of items in the pattern. --- .../gui/GuiBaseFluidPatternTerminal.java | 2 - .../gui/GuiBaseFluidPatternTerminalEx.java | 1 - .../github/client/gui/GuiFCBaseMonitor.java | 20 +- .../github/client/gui/GuiFCPriority.java | 1 - .../client/gui/GuiFluidCraftAmount.java | 5 + .../client/gui/GuiFluidPatternEncoder.java | 1 - ...GuiFluidPatternTerminalCraftingStatus.java | 1 - .../client/gui/GuiFluidPatternTerminalEx.java | 1 - .../client/gui/GuiIngredientBuffer.java | 1 - .../client/gui/GuiPatternValueAmount.java | 253 ++++++++++++++++++ .../ContainerPatternValueAmount.java | 45 ++++ .../gui/container/FCBasePartContainerEx.java | 5 +- .../common/block/BlockFluidInterface.java | 1 - .../common/parts/PartFluidInterface.java | 1 - .../parts/PartFluidPatternTerminal.java | 6 +- .../parts/PartFluidPatternTerminalEx.java | 9 +- .../common/parts/PartSharedFluidBus.java | 5 - .../common/storage/FluidCellInventory.java | 2 - .../common/tile/TileFluidDiscretizer.java | 1 - .../common/tile/TileFluidPatternEncoder.java | 1 - .../github/inventory/AEFluidInventory.java | 4 - .../inventory/BiggerAppEngInventory.java | 57 ++++ .../FluidConvertingInventoryAdaptor.java | 1 - .../github/inventory/gui/GuiType.java | 12 + .../inventory/gui/MouseRegionManager.java | 1 - .../github/loader/ChannelLoader.java | 1 + .../network/CPacketInventoryAction.java | 21 ++ .../network/CPacketPatternValueSet.java | 107 ++++++++ .../github/network/CPacketTransferRecipe.java | 2 - .../java/com/glodblock/github/util/Util.java | 5 +- src/main/resources/META-INF/ae2fc_at.cfg | 2 + .../resources/assets/ae2fc/lang/en_US.lang | 1 + .../resources/assets/ae2fc/lang/zh_CN.lang | 1 + 33 files changed, 539 insertions(+), 38 deletions(-) create mode 100644 src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java create mode 100644 src/main/java/com/glodblock/github/client/gui/container/ContainerPatternValueAmount.java create mode 100644 src/main/java/com/glodblock/github/inventory/BiggerAppEngInventory.java create mode 100644 src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java diff --git a/src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminal.java b/src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminal.java index eb531e40..6eb7460a 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminal.java @@ -11,8 +11,6 @@ import appeng.core.localization.GuiText; import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.container.FCBasePartContainer; import com.glodblock.github.network.CPacketFluidPatternTermBtns; -import com.glodblock.github.util.Ae2Reflect; -import com.glodblock.github.util.Ae2ReflectClient; import com.glodblock.github.util.ModAndClassUtil; import com.glodblock.github.util.NameConst; import net.minecraft.client.gui.GuiButton; diff --git a/src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminalEx.java b/src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminalEx.java index c20cbf85..5aeaf08e 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminalEx.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminalEx.java @@ -11,7 +11,6 @@ import appeng.container.slot.AppEngSlot; import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.container.FCBasePartContainerEx; import com.glodblock.github.network.CPacketFluidPatternTermBtns; -import com.glodblock.github.util.Ae2ReflectClient; import com.glodblock.github.util.ModAndClassUtil; import com.glodblock.github.util.NameConst; import net.minecraft.client.gui.GuiButton; diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFCBaseMonitor.java b/src/main/java/com/glodblock/github/client/gui/GuiFCBaseMonitor.java index fa9af586..9512ca57 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFCBaseMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFCBaseMonitor.java @@ -7,7 +7,10 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.util.IConfigManager; import appeng.api.util.IConfigurableObject; import appeng.client.gui.AEBaseMEGui; -import appeng.client.gui.widgets.*; +import appeng.client.gui.widgets.GuiImgButton; +import appeng.client.gui.widgets.GuiScrollbar; +import appeng.client.gui.widgets.GuiTabButton; +import appeng.client.gui.widgets.ISortSource; import appeng.client.me.InternalSlotME; import appeng.client.me.ItemRepo; import appeng.client.me.SlotDisconnected; @@ -28,9 +31,9 @@ import appeng.integration.IntegrationRegistry; import appeng.integration.IntegrationType; import appeng.util.IConfigManagerHost; import appeng.util.Platform; +import appeng.util.item.AEItemStack; import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.container.FCBaseMonitorContain; -import com.glodblock.github.client.gui.container.FCBasePartContainer; import com.glodblock.github.network.CPacketInventoryAction; import com.glodblock.github.util.Ae2ReflectClient; import com.glodblock.github.util.ModAndClassUtil; @@ -362,6 +365,19 @@ public class GuiFCBaseMonitor extends AEBaseMEGui implements ISortSource, IConfi { final EntityPlayer player = Minecraft.getMinecraft().thePlayer; + if (mouseButton == 3 ){ + if (slot instanceof OptionalSlotFake || slot instanceof SlotFakeCraftingMatrix) { + if (slot.getHasStack()) { + InventoryAction action = InventoryAction.valueOf("SET_PATTERN_VALUE"); + IAEItemStack stack = AEItemStack.create(slot.getStack()); + + ((AEBaseContainer) this.inventorySlots).setTargetStack(stack); + FluidCraft.proxy.netHandler.sendToServer(new CPacketInventoryAction(action, Ae2ReflectClient.getInventorySlots(this).size(), 0, stack)); + return; + } + } + } + if( slot instanceof SlotFake) { InventoryAction action = ctrlDown == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN; diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFCPriority.java b/src/main/java/com/glodblock/github/client/gui/GuiFCPriority.java index 92468d59..b32b667f 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFCPriority.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFCPriority.java @@ -17,7 +17,6 @@ import com.glodblock.github.common.tile.TileFluidInterface; import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.loader.ItemAndBlockHolder; import com.glodblock.github.network.CPacketSwitchGuis; -import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.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 index f854df83..88688452 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftAmount.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftAmount.java @@ -14,6 +14,7 @@ import appeng.core.localization.GuiText; import appeng.helpers.Reflected; import com.glodblock.github.FluidCraft; import com.glodblock.github.common.parts.PartFluidPatternTerminal; +import com.glodblock.github.common.parts.PartFluidPatternTerminalEx; import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.loader.ItemAndBlockHolder; import com.glodblock.github.network.CPacketCraftRequest; @@ -78,6 +79,10 @@ public class GuiFluidCraftAmount extends AEBaseGui myIcon = new ItemStack(ItemAndBlockHolder.FLUID_TERMINAL, 1); this.originalGui = GuiType.FLUID_PATTERN_TERMINAL; } + if (target instanceof PartFluidPatternTerminalEx) { + myIcon = new ItemStack(ItemAndBlockHolder.FLUID_TERMINAL_EX, 1); + this.originalGui = GuiType.FLUID_PATTERN_TERMINAL_EX; + } if( this.originalGui != null && myIcon != null ) { 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 4a6702cc..308d6c8e 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternEncoder.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternEncoder.java @@ -12,7 +12,6 @@ import com.glodblock.github.inventory.gui.MouseRegionManager; import com.glodblock.github.inventory.slot.SlotFluid; import com.glodblock.github.inventory.slot.SlotSingleItem; import com.glodblock.github.network.CPacketEncodePattern; -import com.glodblock.github.util.Ae2Reflect; import com.glodblock.github.util.Ae2ReflectClient; import com.glodblock.github.util.NameConst; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalCraftingStatus.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalCraftingStatus.java index 713f762f..78fd304a 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalCraftingStatus.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalCraftingStatus.java @@ -8,7 +8,6 @@ import com.glodblock.github.common.parts.PartFluidPatternTerminalEx; import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.loader.ItemAndBlockHolder; -import com.glodblock.github.util.Ae2Reflect; import com.glodblock.github.util.Ae2ReflectClient; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalEx.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalEx.java index db0304ce..f05f0e5e 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalEx.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalEx.java @@ -11,7 +11,6 @@ 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.util.Ae2Reflect; import com.glodblock.github.util.Ae2ReflectClient; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/glodblock/github/client/gui/GuiIngredientBuffer.java b/src/main/java/com/glodblock/github/client/gui/GuiIngredientBuffer.java index 1732e954..0c038ec4 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiIngredientBuffer.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiIngredientBuffer.java @@ -12,7 +12,6 @@ import com.glodblock.github.inventory.gui.MouseRegionManager; import com.glodblock.github.inventory.gui.TankMouseHandler; import com.glodblock.github.util.NameConst; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java b/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java new file mode 100644 index 00000000..e5e0e1c7 --- /dev/null +++ b/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java @@ -0,0 +1,253 @@ +package com.glodblock.github.client.gui; + +import appeng.api.AEApi; +import appeng.api.definitions.IDefinitions; +import appeng.api.definitions.IParts; +import appeng.api.storage.ITerminalHost; +import appeng.client.gui.AEBaseGui; +import appeng.client.gui.widgets.GuiTabButton; +import appeng.container.AEBaseContainer; +import appeng.core.AEConfig; +import appeng.core.localization.GuiText; +<<<<<<< Updated upstream +import appeng.core.sync.GuiBridge; +import appeng.core.sync.network.NetworkHandler; +import appeng.core.sync.packets.PacketSwitchGuis; +import appeng.helpers.Reflected; +import appeng.parts.reporting.PartPatternTerminal; +import appeng.parts.reporting.PartPatternTerminalEx; +======= +import appeng.helpers.Reflected; +>>>>>>> Stashed changes +import appeng.util.calculators.ArithHelper; +import appeng.util.calculators.Calculator; +import com.glodblock.github.FluidCraft; +import com.glodblock.github.client.gui.container.ContainerPatternValueAmount; +import com.glodblock.github.common.item.ItemFluidPacket; +import com.glodblock.github.common.parts.PartFluidPatternTerminal; +import com.glodblock.github.common.parts.PartFluidPatternTerminalEx; +import com.glodblock.github.inventory.gui.GuiType; +import com.glodblock.github.loader.ItemAndBlockHolder; +import com.glodblock.github.network.CPacketPatternValueSet; +import com.glodblock.github.network.CPacketSwitchGuis; +import com.glodblock.github.util.Util; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiTextField; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.resources.I18n; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +public class GuiPatternValueAmount extends AEBaseGui { + + private GuiTextField amountToSet; + private GuiTabButton originalGuiBtn; + + private GuiButton set; + + private GuiButton plus1; + private GuiButton plus10; + private GuiButton plus100; + private GuiButton plus1000; + private GuiButton minus1; + private GuiButton minus10; + private GuiButton minus100; + private GuiButton minus1000; + + private GuiType originalGui; + private final int valueIndex; + private final int originalAmount; + + @Reflected + public GuiPatternValueAmount(final InventoryPlayer inventoryPlayer, final ITerminalHost te) { + super(new ContainerPatternValueAmount(inventoryPlayer, te)); + GuiContainer gui = (GuiContainer) Minecraft.getMinecraft().currentScreen; + if (gui != null && gui.theSlot != null && gui.theSlot.getHasStack()) { + Slot slot = gui.theSlot; + originalAmount = this.getOriginalAmount(slot.getStack()); + valueIndex = slot.slotNumber; + } else { + valueIndex = -1; + originalAmount = 0; + } + } + + @Override + public void initGui() { + super.initGui(); + + final int a = AEConfig.instance.craftItemsByStackAmounts(0); + final int b = AEConfig.instance.craftItemsByStackAmounts(1); + final int c = AEConfig.instance.craftItemsByStackAmounts(2); + final int d = AEConfig.instance.craftItemsByStackAmounts(3); + + this.buttonList.add(this.plus1 = new GuiButton(0, this.guiLeft + 20, this.guiTop + 26, 22, 20, "+" + a)); + this.buttonList.add(this.plus10 = new GuiButton(0, this.guiLeft + 48, this.guiTop + 26, 28, 20, "+" + b)); + this.buttonList.add(this.plus100 = new GuiButton(0, this.guiLeft + 82, this.guiTop + 26, 32, 20, "+" + c)); + this.buttonList.add(this.plus1000 = new GuiButton(0, this.guiLeft + 120, this.guiTop + 26, 38, 20, "+" + d)); + + this.buttonList.add(this.minus1 = new GuiButton(0, this.guiLeft + 20, this.guiTop + 75, 22, 20, "-" + a)); + this.buttonList.add(this.minus10 = new GuiButton(0, this.guiLeft + 48, this.guiTop + 75, 28, 20, "-" + b)); + this.buttonList.add(this.minus100 = new GuiButton(0, this.guiLeft + 82, this.guiTop + 75, 32, 20, "-" + c)); + this.buttonList.add(this.minus1000 = new GuiButton(0, this.guiLeft + 120, this.guiTop + 75, 38, 20, "-" + d)); + + this.buttonList.add(this.set = new GuiButton(0, this.guiLeft + 128, this.guiTop + 51, 38, 20, GuiText.Next.getLocal())); + + + ItemStack myIcon = null; + final Object target = ((AEBaseContainer) this.inventorySlots).getTarget(); + final IDefinitions definitions = AEApi.instance().definitions(); + final IParts parts = definitions.parts(); + + if (target instanceof PartFluidPatternTerminal) { + myIcon = new ItemStack(ItemAndBlockHolder.FLUID_TERMINAL, 1); + this.originalGui = GuiType.FLUID_PATTERN_TERMINAL; + } + + if (target instanceof PartFluidPatternTerminalEx) { + myIcon = new ItemStack(ItemAndBlockHolder.FLUID_TERMINAL_EX, 1); + this.originalGui = GuiType.FLUID_PATTERN_TERMINAL_EX; + } + + if (this.originalGui != null && myIcon != null) { + this.buttonList.add(this.originalGuiBtn = new GuiTabButton(this.guiLeft + 154, this.guiTop, myIcon, myIcon.getDisplayName(), itemRender)); + } + + this.amountToSet = new GuiTextField(this.fontRendererObj, this.guiLeft + 62, this.guiTop + 57, 59, this.fontRendererObj.FONT_HEIGHT); + this.amountToSet.setEnableBackgroundDrawing(false); + this.amountToSet.setMaxStringLength(16); + this.amountToSet.setTextColor(0xFFFFFF); + this.amountToSet.setVisible(true); + this.amountToSet.setFocused(true); + this.amountToSet.setText(String.valueOf(originalAmount)); + this.amountToSet.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, 0x404040); + } + + @Override + public void drawBG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) { + this.set.displayString = I18n.format("ae2fc.gui.button.set"); + this.set.enabled = valueIndex >= 0; + + this.bindTexture("guis/craftAmt.png"); + this.drawTexturedModalRect(offsetX, offsetY, 0, 0, this.xSize, this.ySize); + + try { + String out = this.amountToSet.getText(); + + double resultD = Calculator.conversion(out); + int resultI; + + if (resultD <= 0 || Double.isNaN(resultD)) { + resultI = 0; + } else { + resultI = (int) ArithHelper.round(resultD, 0); + } + + this.set.enabled = resultI > 0; + } catch (final NumberFormatException e) { + this.set.enabled = false; + } + + this.amountToSet.drawTextBox(); + } + + @Override + protected void keyTyped(final char character, final int key) { + if (!this.checkHotbarKeys(key)) { + if (key == 28) { + this.actionPerformed(this.set); + } + this.amountToSet.textboxKeyTyped(character, key); + super.keyTyped(character, key); + } + } + + @Override + protected void actionPerformed(final GuiButton btn) { + super.actionPerformed(btn); + + try { + + if (btn == this.originalGuiBtn) { + FluidCraft.proxy.netHandler.sendToServer(new CPacketSwitchGuis(this.originalGui)); + } + + if (btn == this.set && btn.enabled) { + double resultD = Calculator.conversion(this.amountToSet.getText()); + int resultI; + + if (resultD <= 0 || Double.isNaN(resultD)) { + resultI = 1; + } else { + resultI = (int) ArithHelper.round(resultD, 0); + } + + FluidCraft.proxy.netHandler.sendToServer(new CPacketPatternValueSet(originalGui.ordinal(), resultI, valueIndex)); + } + } catch (final NumberFormatException e) { + // nope.. + this.amountToSet.setText("1"); + } + + final boolean isPlus = btn == this.plus1 || btn == this.plus10 || btn == this.plus100 || btn == this.plus1000; + final boolean isMinus = btn == this.minus1 || btn == this.minus10 || btn == this.minus100 || btn == this.minus1000; + + if (isPlus || isMinus) { + this.addQty(this.getQty(btn)); + } + } + + private void addQty(final int i) { + try { + String out = this.amountToSet.getText(); + + double resultD = Calculator.conversion(out); + int resultI; + + if (resultD <= 0 || Double.isNaN(resultD)) { + resultI = 0; + } else { + resultI = (int) ArithHelper.round(resultD, 0); + } + + if (resultI == 1 && i > 1) { + resultI = 0; + } + + resultI += i; + if (resultI < 1) { + resultI = 1; + } + + out = Integer.toString(resultI); + + this.amountToSet.setText(out); + } catch (final NumberFormatException e) { + // :P + } + } + + private int getOriginalAmount(ItemStack stack) { + if (Util.isFluidPacket(stack)) { + FluidStack fluidStack = ItemFluidPacket.getFluidStack(stack); + return fluidStack.amount; + } else { + return stack.stackSize; + } + } + + protected String getBackground() { + return "guis/craftAmt.png"; + } + +} 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 new file mode 100644 index 00000000..db1912c4 --- /dev/null +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerPatternValueAmount.java @@ -0,0 +1,45 @@ +package com.glodblock.github.client.gui.container; + +import appeng.api.config.SecurityPermissions; +import appeng.api.storage.ITerminalHost; +import appeng.container.AEBaseContainer; +import appeng.container.slot.SlotInaccessible; +import appeng.tile.inventory.AppEngInternalInventory; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; + +public class ContainerPatternValueAmount extends AEBaseContainer { + + + private final Slot patternValue; + private int valueIndex; + + public ContainerPatternValueAmount(final InventoryPlayer ip, final ITerminalHost 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/FCBasePartContainerEx.java b/src/main/java/com/glodblock/github/client/gui/container/FCBasePartContainerEx.java index c521d3e8..a9986342 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/FCBasePartContainerEx.java +++ b/src/main/java/com/glodblock/github/client/gui/container/FCBasePartContainerEx.java @@ -4,7 +4,10 @@ import appeng.api.AEApi; import appeng.api.definitions.IDefinitions; import appeng.api.storage.ITerminalHost; import appeng.container.guisync.GuiSync; -import appeng.container.slot.*; +import appeng.container.slot.IOptionalSlotHost; +import appeng.container.slot.OptionalSlotFake; +import appeng.container.slot.SlotFake; +import appeng.container.slot.SlotRestrictedInput; import appeng.helpers.IContainerCraftingPacket; import appeng.tile.inventory.IAEAppEngInventory; import appeng.tile.inventory.InvOperation; diff --git a/src/main/java/com/glodblock/github/common/block/BlockFluidInterface.java b/src/main/java/com/glodblock/github/common/block/BlockFluidInterface.java index ebaa363f..7618e805 100644 --- a/src/main/java/com/glodblock/github/common/block/BlockFluidInterface.java +++ b/src/main/java/com/glodblock/github/common/block/BlockFluidInterface.java @@ -3,7 +3,6 @@ package com.glodblock.github.common.block; import appeng.api.util.IOrientable; import appeng.block.AEBaseItemBlock; import appeng.core.features.AEFeature; -import appeng.core.sync.GuiBridge; import appeng.tile.misc.TileInterface; import appeng.util.Platform; import com.glodblock.github.client.render.RenderBlockFluidInterface; diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidInterface.java b/src/main/java/com/glodblock/github/common/parts/PartFluidInterface.java index 2848ea2b..c4461687 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidInterface.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidInterface.java @@ -16,7 +16,6 @@ import appeng.api.parts.IPartRenderHelper; import appeng.api.storage.IMEMonitor; import appeng.api.storage.data.IAEFluidStack; import appeng.client.texture.CableBusTextures; -import appeng.core.settings.TickRates; import appeng.me.GridAccessException; import appeng.parts.misc.PartInterface; import appeng.tile.inventory.AppEngInternalAEInventory; diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminal.java b/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminal.java index e1cd9c5f..b0c3b633 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminal.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminal.java @@ -11,8 +11,8 @@ import appeng.tile.inventory.InvOperation; import appeng.util.Platform; import com.glodblock.github.client.textures.FCPartsTexture; 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.BiggerAppEngInventory; import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.util.BlockPos; @@ -34,8 +34,8 @@ public class PartFluidPatternTerminal extends FCBasePart { private static final FCPartsTexture FRONT_DARK_ICON = FCPartsTexture.PartFluidPatternTerminal_Colored; private static final FCPartsTexture FRONT_COLORED_ICON = FCPartsTexture.PartFluidPatternTerminal_Dark; - private final AppEngInternalInventory crafting = new AppEngInternalInventory( this, 9 ); - private final AppEngInternalInventory output = new AppEngInternalInventory( this, 3 ); + private final AppEngInternalInventory crafting = new BiggerAppEngInventory( this, 9 ); + private final AppEngInternalInventory output = new BiggerAppEngInventory( this, 3 ); private final AppEngInternalInventory pattern = new AppEngInternalInventory( this, 2 ); private boolean craftingMode = true; diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminalEx.java b/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminalEx.java index daabb293..b887ab20 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminalEx.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminalEx.java @@ -12,6 +12,7 @@ import appeng.util.Platform; import com.glodblock.github.client.textures.FCPartsTexture; import com.glodblock.github.common.item.ItemFluidDrop; import com.glodblock.github.common.item.ItemFluidPacket; +import com.glodblock.github.inventory.BiggerAppEngInventory; import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.util.BlockPos; @@ -33,8 +34,8 @@ public class PartFluidPatternTerminalEx extends FCBasePart { private static final FCPartsTexture FRONT_DARK_ICON = FCPartsTexture.PartFluidPatternTerminal_Colored; private static final FCPartsTexture FRONT_COLORED_ICON = FCPartsTexture.PartFluidPatternTerminal_Dark; - private final AppEngInternalInventory crafting = new AppEngInternalInventory( this, 32 ); - private final AppEngInternalInventory output = new AppEngInternalInventory( this, 32 ); + private final AppEngInternalInventory crafting = new BiggerAppEngInventory( this, 32 ); + private final AppEngInternalInventory output = new BiggerAppEngInventory( this, 32 ); private final AppEngInternalInventory pattern = new AppEngInternalInventory( this, 2 ); private boolean substitute = false; @@ -80,7 +81,7 @@ public class PartFluidPatternTerminalEx extends FCBasePart { public void readFromNBT( final NBTTagCompound data ) { super.readFromNBT( data ); - + this.setSubstitution( data.getBoolean( "substitute" ) ); this.setCombineMode( data.getBoolean("combine") ); this.pattern.readFromNBT( data, "pattern" ); @@ -96,7 +97,7 @@ public class PartFluidPatternTerminalEx extends FCBasePart { public void writeToNBT( final NBTTagCompound data ) { super.writeToNBT( data ); - + data.setBoolean( "substitute", this.substitute ); data.setBoolean( "combine", this.combine ); this.pattern.writeToNBT( data, "pattern" ); diff --git a/src/main/java/com/glodblock/github/common/parts/PartSharedFluidBus.java b/src/main/java/com/glodblock/github/common/parts/PartSharedFluidBus.java index 3c917dc4..506a0b88 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartSharedFluidBus.java +++ b/src/main/java/com/glodblock/github/common/parts/PartSharedFluidBus.java @@ -5,10 +5,8 @@ import appeng.api.config.Upgrades; import appeng.api.networking.ticking.IGridTickable; import appeng.api.networking.ticking.TickRateModulation; import appeng.api.parts.IPartCollisionHelper; -import appeng.api.parts.IPartRenderHelper; import appeng.api.storage.StorageChannel; import appeng.api.storage.data.IAEFluidStack; -import appeng.client.texture.CableBusTextures; import appeng.me.GridAccessException; import appeng.parts.automation.PartUpgradeable; import appeng.tile.inventory.AppEngInternalAEInventory; @@ -18,9 +16,6 @@ import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.util.BlockPos; import com.glodblock.github.util.Util; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java b/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java index 33208e59..0cff2d45 100644 --- a/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java +++ b/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java @@ -11,8 +11,6 @@ import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IItemList; import appeng.util.Platform; import appeng.util.item.AEFluidStack; -import com.glodblock.github.common.Config; -import com.glodblock.github.util.ModAndClassUtil; import com.glodblock.github.util.Util; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; diff --git a/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java b/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java index 44332f2f..613dd20a 100644 --- a/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java +++ b/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java @@ -1,6 +1,5 @@ package com.glodblock.github.common.tile; -import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.networking.GridFlags; import appeng.api.networking.crafting.ICraftingGrid; diff --git a/src/main/java/com/glodblock/github/common/tile/TileFluidPatternEncoder.java b/src/main/java/com/glodblock/github/common/tile/TileFluidPatternEncoder.java index 315e6ed5..5b31c50c 100644 --- a/src/main/java/com/glodblock/github/common/tile/TileFluidPatternEncoder.java +++ b/src/main/java/com/glodblock/github/common/tile/TileFluidPatternEncoder.java @@ -10,7 +10,6 @@ import appeng.tile.inventory.IAEAppEngInventory; import appeng.tile.inventory.InvOperation; import com.glodblock.github.inventory.AeStackInventory; import com.glodblock.github.inventory.AeStackInventoryImpl; -import com.glodblock.github.util.BlockPos; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/glodblock/github/inventory/AEFluidInventory.java b/src/main/java/com/glodblock/github/inventory/AEFluidInventory.java index 5fac85b7..7365fba2 100644 --- a/src/main/java/com/glodblock/github/inventory/AEFluidInventory.java +++ b/src/main/java/com/glodblock/github/inventory/AEFluidInventory.java @@ -5,8 +5,6 @@ import appeng.core.AELog; import appeng.util.Platform; import appeng.util.item.AEFluidStack; import com.glodblock.github.util.Util; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; @@ -14,8 +12,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidTank; -import java.util.Objects; - public class AEFluidInventory implements IAEFluidTank { private final IAEFluidStack[] fluids; diff --git a/src/main/java/com/glodblock/github/inventory/BiggerAppEngInventory.java b/src/main/java/com/glodblock/github/inventory/BiggerAppEngInventory.java new file mode 100644 index 00000000..43143dda --- /dev/null +++ b/src/main/java/com/glodblock/github/inventory/BiggerAppEngInventory.java @@ -0,0 +1,57 @@ +package com.glodblock.github.inventory; + +import appeng.core.AELog; +import appeng.tile.inventory.AppEngInternalInventory; +import appeng.tile.inventory.IAEAppEngInventory; +import cpw.mods.fml.common.ObfuscationReflectionHelper; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +/** + * Since there is no ae2 available now for compiling, we copied it over, and it will need to be removed in the future. + */ +@Deprecated +public class BiggerAppEngInventory extends AppEngInternalInventory { + + private final ItemStack[] inv; + + public BiggerAppEngInventory(IAEAppEngInventory inventory, int size) { + super(inventory, size); + inv = ObfuscationReflectionHelper.getPrivateValue(AppEngInternalInventory.class, this, "inv"); + } + + protected void writeToNBT(final NBTTagCompound target) { + for (int x = 0; x < this.getSizeInventory(); x++) { + try { + final NBTTagCompound c = new NBTTagCompound(); + + if (this.inv[x] != null) { + this.inv[x].writeToNBT(c); + c.setInteger("Count", this.inv[x].stackSize); + } + + target.setTag("#" + x, c); + } catch (final Exception ignored) { + } + } + } + + public void readFromNBT(final NBTTagCompound target) { + for (int x = 0; x < this.getSizeInventory(); x++) { + try { + final NBTTagCompound c = target.getCompoundTag("#" + x); + + if (c != null) { + ItemStack stack = ItemStack.loadItemStackFromNBT(c); + if (stack != null) { + stack.stackSize = c.getInteger("Count"); + } + this.inv[x] = stack; + } + } catch (final Exception e) { + AELog.debug(e); + } + } + } + +} diff --git a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java b/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java index 0eba2edc..2b5ef495 100644 --- a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java +++ b/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java @@ -11,7 +11,6 @@ import com.glodblock.github.common.parts.PartFluidInterface; import com.glodblock.github.common.tile.TileFluidInterface; import com.glodblock.github.util.Ae2Reflect; import com.glodblock.github.util.Util; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; 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 5ade92a8..b2a36436 100644 --- a/src/main/java/com/glodblock/github/inventory/gui/GuiType.java +++ b/src/main/java/com/glodblock/github/inventory/gui/GuiType.java @@ -222,6 +222,18 @@ public enum GuiType { protected Object createClientGui(EntityPlayer player, TileFluidPacketDecoder inv) { return new GuiFluidPacketDecoder(player.inventory, inv); } + }), + + PATTERN_VALUE_SET(new PartGuiFactory(FCBasePart.class) { + @Override + protected Object createServerGui(EntityPlayer player, FCBasePart inv) { + return new ContainerPatternValueAmount(player.inventory, inv); + } + + @Override + protected Object createClientGui(EntityPlayer player, FCBasePart inv) { + return new GuiPatternValueAmount(player.inventory, inv); + } }); public static final List VALUES = ImmutableList.copyOf(values()); diff --git a/src/main/java/com/glodblock/github/inventory/gui/MouseRegionManager.java b/src/main/java/com/glodblock/github/inventory/gui/MouseRegionManager.java index 8e4b9912..15cd3c3b 100644 --- a/src/main/java/com/glodblock/github/inventory/gui/MouseRegionManager.java +++ b/src/main/java/com/glodblock/github/inventory/gui/MouseRegionManager.java @@ -1,6 +1,5 @@ package com.glodblock.github.inventory.gui; -import com.glodblock.github.util.Ae2ReflectClient; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/glodblock/github/loader/ChannelLoader.java b/src/main/java/com/glodblock/github/loader/ChannelLoader.java index 9073ec55..0f84e232 100644 --- a/src/main/java/com/glodblock/github/loader/ChannelLoader.java +++ b/src/main/java/com/glodblock/github/loader/ChannelLoader.java @@ -20,5 +20,6 @@ public class ChannelLoader implements Runnable { FluidCraft.proxy.netHandler.registerMessage(new CPacketTransferRecipe.Handler(), CPacketTransferRecipe.class, id ++, Side.SERVER); FluidCraft.proxy.netHandler.registerMessage(new CPacketDumpTank.Handler(), CPacketDumpTank.class, id ++, Side.SERVER); FluidCraft.proxy.netHandler.registerMessage(new SPacketFluidUpdate.Handler(), SPacketFluidUpdate.class, id ++, Side.CLIENT); + FluidCraft.proxy.netHandler.registerMessage(new CPacketPatternValueSet.Handler(), CPacketPatternValueSet.class, id ++, Side.SERVER); } } diff --git a/src/main/java/com/glodblock/github/network/CPacketInventoryAction.java b/src/main/java/com/glodblock/github/network/CPacketInventoryAction.java index a67232e3..40b66be9 100644 --- a/src/main/java/com/glodblock/github/network/CPacketInventoryAction.java +++ b/src/main/java/com/glodblock/github/network/CPacketInventoryAction.java @@ -4,8 +4,11 @@ import appeng.api.storage.data.IAEItemStack; import appeng.container.AEBaseContainer; import appeng.container.ContainerOpenContext; import appeng.container.implementations.ContainerCraftAmount; +import appeng.core.sync.GuiBridge; import appeng.helpers.InventoryAction; +import appeng.util.Platform; import appeng.util.item.AEItemStack; +import com.glodblock.github.client.gui.container.ContainerPatternValueAmount; import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.util.BlockPos; @@ -108,6 +111,24 @@ public class CPacketInventoryAction implements IMessage { cca.detectAndSendChanges(); } } + }else if (message.action == InventoryAction.valueOf("SET_PATTERN_VALUE")) + { + final ContainerOpenContext context = baseContainer.getOpenContext(); + if( context != null ) + { + final TileEntity te = context.getTile(); + InventoryHandler.openGui(sender, te.getWorldObj(), new BlockPos(te), Objects.requireNonNull(Util.from(baseContainer.getOpenContext().getSide())), GuiType.PATTERN_VALUE_SET ); + if( sender.openContainer instanceof ContainerPatternValueAmount) + { + final ContainerPatternValueAmount cpv = (ContainerPatternValueAmount) sender.openContainer; + if( baseContainer.getTargetStack() != null ) + { + cpv.setValueIndex( message.slot ); + cpv.getPatternValue().putStack( baseContainer.getTargetStack().getItemStack() ); + } + cpv.detectAndSendChanges(); + } + } } else { diff --git a/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java b/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java new file mode 100644 index 00000000..8ae06909 --- /dev/null +++ b/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java @@ -0,0 +1,107 @@ +package com.glodblock.github.network; + +import appeng.api.networking.IGridHost; +import appeng.container.ContainerOpenContext; +<<<<<<< Updated upstream +import appeng.container.implementations.ContainerPatternTerm; +import appeng.container.implementations.ContainerPatternTermEx; +import appeng.core.sync.AppEngPacket; +import appeng.core.sync.GuiBridge; +import appeng.core.sync.network.INetworkInfo; +import appeng.util.Platform; +======= +>>>>>>> Stashed changes +import com.glodblock.github.client.gui.container.ContainerFluidPatternTerminal; +import com.glodblock.github.client.gui.container.ContainerFluidPatternTerminalEx; +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.util.BlockPos; +import com.glodblock.github.util.Util; +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; +<<<<<<< Updated upstream +import io.netty.buffer.Unpooled; +======= +>>>>>>> Stashed changes +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 java.util.Objects; + +public class CPacketPatternValueSet implements IMessage { + + + private GuiType originGui; + private int amount; + private int valueIndex; + + public CPacketPatternValueSet() { + + } + + 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) { + ContainerPatternValueAmount cpv = (ContainerPatternValueAmount) player.openContainer; + final Object target = cpv.getTarget(); + if (target instanceof IGridHost) { + final ContainerOpenContext context = cpv.getOpenContext(); + if (context != null) { + final TileEntity te = context.getTile(); + InventoryHandler.openGui(player, player.worldObj, new BlockPos(te), Objects.requireNonNull(Util.from(context.getSide())), message.originGui); + if (player.openContainer instanceof ContainerFluidPatternTerminal || player.openContainer instanceof ContainerFluidPatternTerminalEx) { + Slot slot = player.openContainer.getSlot(message.valueIndex); + if (slot != null && slot.getHasStack()) { + 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/CPacketTransferRecipe.java b/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java index f49a08b7..97a968cc 100644 --- a/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java +++ b/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java @@ -19,8 +19,6 @@ import net.minecraftforge.fluids.FluidStack; import javax.annotation.Nullable; import java.util.LinkedList; import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; public class CPacketTransferRecipe implements IMessage { diff --git a/src/main/java/com/glodblock/github/util/Util.java b/src/main/java/com/glodblock/github/util/Util.java index b4b0d0cf..fb8e8471 100644 --- a/src/main/java/com/glodblock/github/util/Util.java +++ b/src/main/java/com/glodblock/github/util/Util.java @@ -14,7 +14,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidContainerItem; public final class Util { diff --git a/src/main/resources/META-INF/ae2fc_at.cfg b/src/main/resources/META-INF/ae2fc_at.cfg index d92743a3..d9650cf7 100644 --- a/src/main/resources/META-INF/ae2fc_at.cfg +++ b/src/main/resources/META-INF/ae2fc_at.cfg @@ -3,3 +3,5 @@ public net.minecraft.inventory.InventoryCrafting field_70464_b # inventoryWidth public net.minecraft.client.gui.inventory.GuiContainer field_147003_i # guiLeft public net.minecraft.client.gui.inventory.GuiContainer field_147009_r # guiTop +#Pattern Value Setting +public net.minecraft.client.gui.inventory.GuiContainer field_147006_u #theSlot diff --git a/src/main/resources/assets/ae2fc/lang/en_US.lang b/src/main/resources/assets/ae2fc/lang/en_US.lang index c750f6b4..ac2bc3e9 100644 --- a/src/main/resources/assets/ae2fc/lang/en_US.lang +++ b/src/main/resources/assets/ae2fc/lang/en_US.lang @@ -54,5 +54,6 @@ ae2fc.gui.fluid_interface.3=S ae2fc.gui.fluid_interface.4=W ae2fc.gui.fluid_interface.5=E ae2fc.gui.oc_pattern_editor=OC Pattern Editor +ae2fc.gui.button.set=Set itemGroup.ae2fc=Fluid Craft For AE2 diff --git a/src/main/resources/assets/ae2fc/lang/zh_CN.lang b/src/main/resources/assets/ae2fc/lang/zh_CN.lang index 486dcba1..41514ffa 100644 --- a/src/main/resources/assets/ae2fc/lang/zh_CN.lang +++ b/src/main/resources/assets/ae2fc/lang/zh_CN.lang @@ -50,3 +50,4 @@ ae2fc.gui.fluid_interface.3=南 ae2fc.gui.fluid_interface.4=西 ae2fc.gui.fluid_interface.5=东 ae2fc.gui.oc_pattern_editor=OC样板编辑器 +ae2fc.gui.button.set=设置 From f53db65b887d97d0ef4f57fffc4e5ae2b6a8c8d3 Mon Sep 17 00:00:00 2001 From: vfyjxf <2331007009@qq.com> Date: Sun, 14 Aug 2022 13:31:44 +0800 Subject: [PATCH 2/3] Fix build failure --- dependencies.gradle | 2 +- .../github/client/gui/GuiPatternValueAmount.java | 9 --------- .../github/network/CPacketPatternValueSet.java | 13 ------------- 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 1dadc7a9..078f91a4 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { compile('com.github.GTNewHorizons:NotEnoughItems:2.2.17-GTNH:dev') - compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-87-GTNH:dev') + compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-92-GTNH:dev') compile('curse.maven:cofh-core-69162:2388751') compile('com.github.GTNewHorizons:ExtraCells2:2.5.9:dev') {transitive = false} compile("com.github.GTNewHorizons:WirelessCraftingTerminal:1.8.8.5:dev") diff --git a/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java b/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java index e5e0e1c7..9b3fa173 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java @@ -9,16 +9,7 @@ import appeng.client.gui.widgets.GuiTabButton; import appeng.container.AEBaseContainer; import appeng.core.AEConfig; import appeng.core.localization.GuiText; -<<<<<<< Updated upstream -import appeng.core.sync.GuiBridge; -import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketSwitchGuis; import appeng.helpers.Reflected; -import appeng.parts.reporting.PartPatternTerminal; -import appeng.parts.reporting.PartPatternTerminalEx; -======= -import appeng.helpers.Reflected; ->>>>>>> Stashed changes import appeng.util.calculators.ArithHelper; import appeng.util.calculators.Calculator; import com.glodblock.github.FluidCraft; diff --git a/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java b/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java index 8ae06909..f9881952 100644 --- a/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java +++ b/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java @@ -2,15 +2,6 @@ package com.glodblock.github.network; import appeng.api.networking.IGridHost; import appeng.container.ContainerOpenContext; -<<<<<<< Updated upstream -import appeng.container.implementations.ContainerPatternTerm; -import appeng.container.implementations.ContainerPatternTermEx; -import appeng.core.sync.AppEngPacket; -import appeng.core.sync.GuiBridge; -import appeng.core.sync.network.INetworkInfo; -import appeng.util.Platform; -======= ->>>>>>> Stashed changes import com.glodblock.github.client.gui.container.ContainerFluidPatternTerminal; import com.glodblock.github.client.gui.container.ContainerFluidPatternTerminalEx; import com.glodblock.github.client.gui.container.ContainerPatternValueAmount; @@ -23,10 +14,6 @@ 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; -<<<<<<< Updated upstream -import io.netty.buffer.Unpooled; -======= ->>>>>>> Stashed changes import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; From 48c783dd257c509c878787f395a20c3ef1f59ab2 Mon Sep 17 00:00:00 2001 From: vfyjxf <2331007009@qq.com> Date: Sun, 14 Aug 2022 17:16:26 +0800 Subject: [PATCH 3/3] remove useless methods --- .../com/glodblock/github/client/gui/GuiFluidCraftAmount.java | 4 ---- .../glodblock/github/client/gui/GuiPatternValueAmount.java | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftAmount.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftAmount.java index 88688452..fd2cb71d 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftAmount.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftAmount.java @@ -255,8 +255,4 @@ public class GuiFluidCraftAmount extends AEBaseGui } } - protected String getBackground() - { - return "guis/craftAmt.png"; - } } diff --git a/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java b/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java index 9b3fa173..babdbf4a 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java @@ -237,8 +237,4 @@ public class GuiPatternValueAmount extends AEBaseGui { } } - protected String getBackground() { - return "guis/craftAmt.png"; - } - }