diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFCBaseFluidMonitor.java b/src/main/java/com/glodblock/github/client/gui/GuiFCBaseFluidMonitor.java index 7e3492e2..fddc84db 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFCBaseFluidMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFCBaseFluidMonitor.java @@ -10,20 +10,17 @@ import appeng.api.util.IConfigurableObject; import appeng.client.gui.AEBaseMEGui; import appeng.client.gui.widgets.*; import appeng.client.me.InternalSlotME; -import appeng.client.me.SlotDisconnected; -import appeng.client.me.SlotME; -import appeng.container.AEBaseContainer; -import appeng.container.slot.*; +import appeng.container.slot.AppEngSlot; +import appeng.container.slot.SlotCraftingMatrix; +import appeng.container.slot.SlotFakeCraftingMatrix; import appeng.core.AEConfig; import appeng.core.AELog; import appeng.core.localization.ButtonToolTips; import appeng.core.localization.GuiText; import appeng.core.sync.GuiBridge; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketInventoryAction; import appeng.core.sync.packets.PacketSwitchGuis; import appeng.core.sync.packets.PacketValueConfig; -import appeng.helpers.InventoryAction; import appeng.integration.IntegrationRegistry; import appeng.integration.IntegrationType; import appeng.util.IConfigManagerHost; @@ -35,18 +32,11 @@ import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.container.FCBaseFluidMonitorContain; import com.glodblock.github.client.me.FluidRepo; import com.glodblock.github.common.item.ItemFluidDrop; -import com.glodblock.github.network.CPacketInventoryAction; -import com.glodblock.github.util.Ae2ReflectClient; import com.glodblock.github.util.ModAndClassUtil; import com.glodblock.github.util.NameConst; import com.glodblock.github.util.Util; -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.client.resources.I18n; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -54,6 +44,10 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; +import java.io.IOException; +import java.lang.reflect.Field; +import java.util.List; + public class GuiFCBaseFluidMonitor extends AEBaseMEGui implements ISortSource, IConfigManagerHost, IDropToFillTextField { @@ -122,46 +116,6 @@ public class GuiFCBaseFluidMonitor extends AEBaseMEGui 0, (this.repo.size() + this.perRow - 1) / this.perRow - this.rows, Math.max(1, this.rows / 6)); } - @Override - protected void actionPerformed(final GuiButton btn) { - - if (btn == this.craftingStatusBtn || btn == this.craftingStatusImgBtn) { - NetworkHandler.instance.sendToServer(new PacketSwitchGuis(GuiBridge.GUI_CRAFTING_STATUS)); - } - - if (btn instanceof GuiImgButton) { - final boolean backwards = Mouse.isButtonDown(1); - - final GuiImgButton iBtn = (GuiImgButton) btn; - 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 { - 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) { - this.reinitalize(); - } - } - } - } - private void reinitalize() { this.buttonList.clear(); this.initGui(); @@ -363,7 +317,6 @@ public class GuiFCBaseFluidMonitor extends AEBaseMEGui if (btn == 1 && this.searchField.isMouseIn(xCoord, yCoord)) { setSearchString("", true); } - super.mouseClicked(xCoord, yCoord, btn); } @@ -400,198 +353,6 @@ public class GuiFCBaseFluidMonitor extends AEBaseMEGui 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.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; - - 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 (Ae2ReflectClient.getDragClick(this).size() > 1) { - return; - } - - final PacketInventoryAction p = new PacketInventoryAction(action, slotIdx, 0); - NetworkHandler.instance.sendToServer(p); - - return; - } - - if (slot instanceof SlotPatternTerm) { - if (mouseButton == 6) { - return; // prevent 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; // prevent weird double clicks.. - } - - InventoryAction action; - if (isShiftKeyDown()) { - action = InventoryAction.CRAFT_SHIFT; - } else { - // Craft stack on right-click, craft single 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 (Ae2ReflectClient.getDragClick(this).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) { - 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; - stack = ((SlotME) slot).getAEStack(); - - if (stack != null - && action == InventoryAction.PICKUP_OR_SET_DOWN - && stack.getStackSize() == 0 - && player.inventory.getItemStack() == null) { - action = InventoryAction.AUTO_CRAFT; - } - - break; - case 1: - action = ctrlDown == 1 ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK; - stack = ((SlotME) slot).getAEStack(); - break; - - case 3: // creative dupe: - stack = ((SlotME) slot).getAEStack(); - if (stack.getItem() instanceof ItemFluidDrop) { - stack = ItemFluidDrop.newAeStack(ItemFluidDrop.getAeFluidStack(stack)); - } - 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); - } - @Override public void onGuiClosed() { super.onGuiClosed(); diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidTerminal.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidTerminal.java index f10cd973..4c630938 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidTerminal.java @@ -32,11 +32,6 @@ public class GuiFluidTerminal extends GuiBaseFluidTerminal { this.container = new ContainerFluidTerminal(inventoryPlayer, te); } - @Override - public void initGui() { - super.initGui(); - } - @Override public void func_146977_a(final Slot s) { if (drawSlot0(s)) super.func_146977_a(s); @@ -87,6 +82,7 @@ public class GuiFluidTerminal extends GuiBaseFluidTerminal { itemStack.stackSize = 1; } FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidUpdate(tmp, itemStack)); + return; } super.handleMouseClick(slot, slotIdx, ctrlDown, mouseButton); } diff --git a/src/main/java/com/glodblock/github/client/gui/container/FCBaseFluidMonitorContain.java b/src/main/java/com/glodblock/github/client/gui/container/FCBaseFluidMonitorContain.java index a08e64a5..f5702460 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/FCBaseFluidMonitorContain.java +++ b/src/main/java/com/glodblock/github/client/gui/container/FCBaseFluidMonitorContain.java @@ -405,7 +405,7 @@ public class FCBaseFluidMonitorContain extends AEBaseContainer this.host.getFluidInventory().extractItems(toExtract, Actionable.MODULATE, this.getActionSource()); } } else if (!Util.FluidUtil.isEmpty(fluidContainer)) { - // add fluid to ae network + // add fluid to ae network AEFluidStack fluidStack = Util.getAEFluidFromItem(fluidContainer); final IAEFluidStack aeFluidStack = fluidStack.copy(); // simulate result is incorrect. so I'm using other solution and ec2 both mod have same issues @@ -448,9 +448,8 @@ public class FCBaseFluidMonitorContain extends AEBaseContainer } if (slotIndex == -1) out.stackSize = fluidContainer.stackSize - out.stackSize; } else { - out.stackSize = (int) (fluidContainer.stackSize - (aeFluidStack.getStackSize() / drainStack.left)); + out.stackSize = fluidContainer.stackSize; this.dropItem(drainStack.right, fluidContainer.stackSize); // drop empty item - if (slotIndex == -1) out.stackSize++; } } else { continue; @@ -467,6 +466,7 @@ public class FCBaseFluidMonitorContain extends AEBaseContainer new SPacketFluidUpdate(new HashMap<>()), (EntityPlayerMP) player); } } else { + out.stackSize = fluidContainer.stackSize - out.stackSize; player.inventory.setInventorySlotContents(slotIndex, out.stackSize > 0 ? out : null); } } diff --git a/src/main/java/com/glodblock/github/network/CPacketFluidUpdate.java b/src/main/java/com/glodblock/github/network/CPacketFluidUpdate.java index 90b1fd5f..d744a654 100644 --- a/src/main/java/com/glodblock/github/network/CPacketFluidUpdate.java +++ b/src/main/java/com/glodblock/github/network/CPacketFluidUpdate.java @@ -58,7 +58,6 @@ public class CPacketFluidUpdate implements IMessage { this.itemStack = AEItemStack.loadItemStackFromPacket(buf).getItemStack(); this.slotIndex = buf.readInt(); } - } catch (IOException e) { e.printStackTrace(); } @@ -98,7 +97,7 @@ public class CPacketFluidUpdate implements IMessage { ItemStack item = player.inventory.getItemStack(); ((FCBaseFluidMonitorContain) container) .postChange( - new ArrayList(message.list.values()), + new ArrayList<>(message.list.values()), message.itemStack == null ? item : message.itemStack, player, message.slotIndex);