diff --git a/src/main/java/refinedstorage/gui/GuiCraftingSettings.java b/src/main/java/refinedstorage/gui/GuiCraftingSettings.java index 52aef83af..627f78a15 100755 --- a/src/main/java/refinedstorage/gui/GuiCraftingSettings.java +++ b/src/main/java/refinedstorage/gui/GuiCraftingSettings.java @@ -1,15 +1,28 @@ package refinedstorage.gui; +import net.minecraft.client.gui.GuiTextField; import refinedstorage.container.ContainerDummy; +import java.io.IOException; + public class GuiCraftingSettings extends GuiBase { + private GuiTextField amountField; + public GuiCraftingSettings() { super(new ContainerDummy(), 143, 61); } @Override public void init(int x, int y) { - addButton(x + 56, y + 38, 50, 50, "Craft"); + addButton(x + 48, y + 35, 50, 20, t("misc.refinedstorage:start")); + + amountField = new GuiTextField(0, fontRendererObj, x + 39 + 1, y + 21 + 1, 69 - 6, fontRendererObj.FONT_HEIGHT); + amountField.setEnableBackgroundDrawing(false); + amountField.setVisible(true); + amountField.setText("1"); + amountField.setTextColor(16777215); + amountField.setCanLoseFocus(false); + amountField.setFocused(true); } @Override @@ -21,10 +34,21 @@ public class GuiCraftingSettings extends GuiBase { bindTexture("gui/crafting_settings.png"); drawTexture(x, y, 0, 0, width, height); + + amountField.drawTextBox(); } @Override public void drawForeground(int mouseX, int mouseY) { - drawString(55, 7, "Crafting"); + drawString(53, 7, t("container.crafting")); + } + + @Override + protected void keyTyped(char character, int keyCode) throws IOException { + if (!checkHotbarKeys(keyCode) && amountField.textboxKeyTyped(character, keyCode)) { + // NO OP + } else { + super.keyTyped(character, keyCode); + } } } diff --git a/src/main/java/refinedstorage/item/ItemPattern.java b/src/main/java/refinedstorage/item/ItemPattern.java index a68d19e9b..6dc5bfbf6 100755 --- a/src/main/java/refinedstorage/item/ItemPattern.java +++ b/src/main/java/refinedstorage/item/ItemPattern.java @@ -15,7 +15,7 @@ public class ItemPattern extends ItemBase { @Override public void addInformation(ItemStack pattern, EntityPlayer player, List list, boolean b) { - if (getResult(pattern) != null) { + if (hasResult(pattern)) { list.add(getResult(pattern).getDisplayName()); } } diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index 243c193c6..0c6a45469 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -40,6 +40,7 @@ misc.refinedstorage:wireless_grid.not_found=Controller not found. misc.refinedstorage:yes=Yes misc.refinedstorage:no=No +misc.refinedstorage:start=Start misc.refinedstorage:clear=Clear misc.refinedstorage:priority=Priority diff --git a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang index 5935ffe4f..1f4d6c711 100755 --- a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang +++ b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang @@ -40,6 +40,7 @@ misc.refinedstorage:wireless_grid.not_found=Controller werd niet gevonden. misc.refinedstorage:yes=Ja misc.refinedstorage:no=Nee +misc.refinedstorage:start=Start misc.refinedstorage:clear=Legen misc.refinedstorage:priority=Prioriteit diff --git a/src/main/resources/assets/refinedstorage/textures/gui/crafting_monitor.png b/src/main/resources/assets/refinedstorage/textures/gui/crafting_monitor.png new file mode 100755 index 000000000..b293e451b Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/gui/crafting_monitor.png differ