mirror of
https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git
synced 2026-11-11 15:57:55 +00:00
Middle click craft ordering inserts a proper count (#329)
Co-authored-by: Kogepan229 <kogepan25629@gmail.com>
This commit is contained in:
1 parent
80bcb3bdf3
commit
697217c5cd
6 files changed
+15
-18
No files matched your search
@@ -92,7 +92,7 @@ public class GuiCraftingStatus extends appeng.client.gui.implementations.GuiCraf
|
||||
new CPacketInventoryAction(
|
||||
InventoryAction.AUTO_CRAFT,
|
||||
Ae2ReflectClient.getInventorySlots(this).size(),
|
||||
0,
|
||||
hoveredAEStack.getStackSize(),
|
||||
hoveredAEStack));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -55,6 +55,7 @@ public class GuiFCPriority extends FCGuiAmount {
|
||||
protected void addQty(final int i) {
|
||||
try {
|
||||
this.amountBox.setText(Long.toString(getAmount() + i));
|
||||
this.amountBox.setCursorPositionEnd();
|
||||
} catch (final NumberFormatException ignore) {}
|
||||
try {
|
||||
NetworkHandler.instance
|
||||
|
||||
@@ -45,9 +45,7 @@ public class GuiFluidCraftAmount extends FCGuiAmount {
|
||||
this.guiTop + 53,
|
||||
Settings.CRAFTING_MODE,
|
||||
CraftingMode.STANDARD));
|
||||
|
||||
this.amountBox.setText("1");
|
||||
this.amountBox.setSelectionPos(0);
|
||||
((ContainerCraftAmount) this.inventorySlots).setAmountField(this.amountBox);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.glodblock.github.client.gui.base;
|
||||
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
import net.minecraft.client.gui.GuiTextField;
|
||||
import net.minecraft.inventory.Container;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
@@ -12,6 +11,7 @@ import com.glodblock.github.inventory.gui.GuiType;
|
||||
|
||||
import appeng.client.gui.AEBaseGui;
|
||||
import appeng.client.gui.widgets.GuiTabButton;
|
||||
import appeng.client.gui.widgets.MEGuiTextField;
|
||||
import appeng.container.AEBaseContainer;
|
||||
import appeng.core.AEConfig;
|
||||
import appeng.core.localization.GuiText;
|
||||
@@ -20,7 +20,7 @@ import appeng.util.calculators.Calculator;
|
||||
|
||||
public abstract class FCGuiAmount extends AEBaseGui {
|
||||
|
||||
protected GuiTextField amountBox;
|
||||
protected MEGuiTextField amountBox;
|
||||
protected GuiTabButton originalGuiBtn;
|
||||
protected GuiButton submit;
|
||||
protected GuiButton plus1;
|
||||
@@ -72,16 +72,10 @@ public abstract class FCGuiAmount extends AEBaseGui {
|
||||
this.originalGuiBtn.setHideEdge(13);
|
||||
}
|
||||
|
||||
this.amountBox = new GuiTextField(
|
||||
this.fontRendererObj,
|
||||
this.guiLeft + 62,
|
||||
this.guiTop + 57,
|
||||
59,
|
||||
this.fontRendererObj.FONT_HEIGHT);
|
||||
this.amountBox.setEnableBackgroundDrawing(false);
|
||||
this.amountBox = new MEGuiTextField(61, 12);
|
||||
this.amountBox.x = this.guiLeft + 60;
|
||||
this.amountBox.y = this.guiTop + 55;
|
||||
this.amountBox.setMaxStringLength(16);
|
||||
this.amountBox.setTextColor(0xFFFFFF);
|
||||
this.amountBox.setVisible(true);
|
||||
this.amountBox.setFocused(true);
|
||||
}
|
||||
|
||||
@@ -134,6 +128,7 @@ public abstract class FCGuiAmount extends AEBaseGui {
|
||||
}
|
||||
String out = Long.toString(resultI);
|
||||
this.amountBox.setText(out);
|
||||
this.amountBox.setCursorPositionEnd();
|
||||
} catch (final NumberFormatException ignore) {}
|
||||
}
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ public class CPacketInventoryAction implements IMessage {
|
||||
|
||||
public CPacketInventoryAction() {}
|
||||
|
||||
public CPacketInventoryAction(final InventoryAction action, final int slot, final int id) {
|
||||
public CPacketInventoryAction(final InventoryAction action, final int slot, final long id) {
|
||||
this.action = action;
|
||||
this.slot = slot;
|
||||
this.id = id;
|
||||
@@ -51,7 +51,7 @@ public class CPacketInventoryAction implements IMessage {
|
||||
this.isEmpty = true;
|
||||
}
|
||||
|
||||
public CPacketInventoryAction(final InventoryAction action, final int slot, final int id, IAEItemStack stack) {
|
||||
public CPacketInventoryAction(final InventoryAction action, final int slot, final long id, IAEItemStack stack) {
|
||||
this.action = action;
|
||||
this.slot = slot;
|
||||
this.id = id;
|
||||
@@ -123,6 +123,9 @@ public class CPacketInventoryAction implements IMessage {
|
||||
if (baseContainer.getTargetStack() != null) {
|
||||
cca.getCraftingItem().putStack(baseContainer.getTargetStack().getItemStack());
|
||||
cca.setItemToCraft(baseContainer.getTargetStack());
|
||||
if (message.id > 0) {
|
||||
cca.setInitialCraftAmount(message.id);
|
||||
}
|
||||
}
|
||||
cca.detectAndSendChanges();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user