diff --git a/build.properties b/build.properties index 8a706f77..294dd283 100644 --- a/build.properties +++ b/build.properties @@ -2,4 +2,4 @@ mc_version=1.7.10 forge_version=10.13.4.1614-1.7.10 ccl_version=1.1.3.138 ccc_version=1.0.7.+ -mod_version=2.1.9-GTNH +mod_version=2.1.10-GTNH diff --git a/src/codechicken/nei/ItemQuantityField.java b/src/codechicken/nei/ItemQuantityField.java index 2511589b..0571b4a3 100644 --- a/src/codechicken/nei/ItemQuantityField.java +++ b/src/codechicken/nei/ItemQuantityField.java @@ -7,30 +7,25 @@ public class ItemQuantityField extends TextField centered = true; } - // Find a way to work this back in - public boolean isValid(String string) { - if (string.equals("")) - return true; - - try { - return Integer.parseInt(string) >= 0; - } catch (NumberFormatException nfe) { - return false; - } - } - public int intValue() { return intValue(text()); } public int intValue(String s) { try { - return Integer.parseInt(s); + return Math.max(0, Integer.parseInt(s)); } catch (NumberFormatException nfe) { return 0; } } + @Override + public void gainFocus() { + if (text().equals("0")) { + setText(""); + } + } + @Override public void loseFocus() { setText(Integer.toString(NEIClientConfig.getItemQuantity())); @@ -38,7 +33,6 @@ public class ItemQuantityField extends TextField @Override public void onTextChange(String oldText) { - if (intValue(oldText) != intValue())//hacky recursion stopper - NEIClientUtils.setItemQuantity(intValue()); + NEIClientUtils.setItemQuantity(intValue()); } } diff --git a/src/codechicken/nei/LayoutManager.java b/src/codechicken/nei/LayoutManager.java index e9d4cb82..d0b77975 100644 --- a/src/codechicken/nei/LayoutManager.java +++ b/src/codechicken/nei/LayoutManager.java @@ -423,7 +423,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH if (quantity < 0) quantity = 0; - setItemQuantity(quantity); + LayoutManager.quantity.setText(Integer.toString(quantity)); return true; } }; @@ -440,7 +440,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH if (quantity < 0) quantity = 0; - setItemQuantity(quantity); + LayoutManager.quantity.setText(Integer.toString(quantity)); return true; } }; @@ -626,8 +626,6 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH @Override public void load(GuiContainer gui) { if (isEnabled()) { - setInputFocused(null); - if(!itemsLoaded) { ItemList.loadItems.restart(); itemsLoaded = true; @@ -762,19 +760,6 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH return itemPanel.draggedStack == null; } - public static Widget getInputFocused() { - return inputFocused; - } - - public static void setInputFocused(Widget widget) { - if (inputFocused != null) - inputFocused.loseFocus(); - - inputFocused = widget; - if (inputFocused != null) - inputFocused.gainFocus(); - } - @Override public void renderSlotUnderlay(GuiContainer gui, Slot slot) { if (overlayRenderer != null) diff --git a/src/codechicken/nei/NEIClientUtils.java b/src/codechicken/nei/NEIClientUtils.java index 9553dd7b..b87bfc8c 100644 --- a/src/codechicken/nei/NEIClientUtils.java +++ b/src/codechicken/nei/NEIClientUtils.java @@ -352,7 +352,6 @@ public class NEIClientUtils extends NEIServerUtils public static void setItemQuantity(int i) { world.nbt.setInteger("quantity", i); world.saveNBT(); - LayoutManager.quantity.setText(Integer.toString(i)); } public static GuiContainer getGuiContainer() { diff --git a/src/codechicken/nei/TextField.java b/src/codechicken/nei/TextField.java index 0b7bf494..10ede209 100644 --- a/src/codechicken/nei/TextField.java +++ b/src/codechicken/nei/TextField.java @@ -121,8 +121,10 @@ public abstract class TextField extends Widget if (focus) { previousKeyboardRepeatEnabled = Keyboard.areRepeatEventsEnabled(); Keyboard.enableRepeatEvents(true); + gainFocus(); } else { Keyboard.enableRepeatEvents(previousKeyboardRepeatEnabled); + loseFocus(); } }