diff --git a/src/main/java/codechicken/nei/ItemPanel.java b/src/main/java/codechicken/nei/ItemPanel.java index d827f9be..f68b11d3 100644 --- a/src/main/java/codechicken/nei/ItemPanel.java +++ b/src/main/java/codechicken/nei/ItemPanel.java @@ -166,19 +166,33 @@ public class ItemPanel extends PanelWidget { } protected int resizeFooter(GuiContainer gui) { - if (!NEIClientConfig.showItemQuantityWidget()) return 0; + if (!(NEIClientConfig.showItemQuantityWidget() || !NEIClientConfig.isSearchWidgetCentered())) return 0; final int BUTTON_SIZE = 16; more.w = less.w = BUTTON_SIZE; - more.h = less.h = quantity.h = BUTTON_SIZE; - less.x = x; - more.x = x + w - BUTTON_SIZE; - more.y = less.y = quantity.y = y + h - BUTTON_SIZE; - quantity.x = x + BUTTON_SIZE + 2; - quantity.w = more.x - quantity.x - 2; + if (NEIClientConfig.isSearchWidgetCentered()) { + more.x = x + w - BUTTON_SIZE; + more.h = less.h = quantity.h = BUTTON_SIZE; + more.y = less.y = quantity.y = y + h - BUTTON_SIZE; + less.x = x; + quantity.x = x + BUTTON_SIZE + 2; + quantity.w = more.x - quantity.x - 2; + } else { + more.x = less.x; + more.y = y + h - BUTTON_SIZE; + more.h = less.h = BUTTON_SIZE / 2; + + less.x = (int) (x + (w * 0.7)); + less.y = more.y + more.h; + + quantity.h = BUTTON_SIZE; + quantity.x = less.x + less.w + 1; + quantity.y = y + h - BUTTON_SIZE; + quantity.w = x + w - quantity.x; + } return BUTTON_SIZE + 2; } diff --git a/src/main/java/codechicken/nei/LayoutStyleMinecraft.java b/src/main/java/codechicken/nei/LayoutStyleMinecraft.java index eb40b12c..b4fd8e8c 100644 --- a/src/main/java/codechicken/nei/LayoutStyleMinecraft.java +++ b/src/main/java/codechicken/nei/LayoutStyleMinecraft.java @@ -126,9 +126,15 @@ public class LayoutStyleMinecraft extends LayoutStyle { presetsPanel.y = 2; presetsPanel.x = (gui.width - gui.xSize) / 2 + gui.xSize - presetsPanel.w; - searchField.h = 20; - searchField.w = 150; - searchField.x = (gui.width - searchField.w) / 2; + if (NEIClientConfig.isSearchWidgetCentered()) { + searchField.h = 20; + searchField.w = 150; + searchField.x = (gui.width - searchField.w) / 2; + } else { + searchField.h = itemPanel.quantity.h; + searchField.w = (int) (itemPanel.w * (NEIClientConfig.showItemQuantityWidget() ? 0.7 : 1)); + searchField.x = itemPanel.x; + } searchField.y = gui.height - searchField.h - 2; if (!visiblity.showItemSection) { diff --git a/src/main/java/codechicken/nei/NEIClientConfig.java b/src/main/java/codechicken/nei/NEIClientConfig.java index 30c030d9..15025876 100644 --- a/src/main/java/codechicken/nei/NEIClientConfig.java +++ b/src/main/java/codechicken/nei/NEIClientConfig.java @@ -247,6 +247,9 @@ public class NEIClientConfig { tag.getTag("inventory.showItemQuantityWidget").setComment("Show Item Quantity Widget").getBooleanValue(true); API.addOption(new OptionToggleButton("inventory.showItemQuantityWidget", true)); + tag.getTag("inventory.centerSearchWidget").setComment("Center Search Widget").getBooleanValue(true); + API.addOption(new OptionToggleButton("inventory.centerSearchWidget", true)); + tag.getTag("inventory.jei_style_tabs").setComment("Enable/disable JEI Style Tabs").getBooleanValue(true); API.addOption(new OptionToggleButtonBoubs("inventory.jei_style_tabs", true)); tag.getTag("inventory.jei_style_item_presence_overlay") @@ -554,6 +557,10 @@ public class NEIClientConfig { return getBooleanSetting("inventory.showItemQuantityWidget"); } + public static boolean isSearchWidgetCentered() { + return getBooleanSetting("inventory.centerSearchWidget"); + } + public static boolean areJEIStyleTabsVisible() { return getBooleanSetting("inventory.jei_style_tabs"); } diff --git a/src/main/resources/assets/nei/lang/en_US.lang b/src/main/resources/assets/nei/lang/en_US.lang index 88019e7e..b8ade610 100644 --- a/src/main/resources/assets/nei/lang/en_US.lang +++ b/src/main/resources/assets/nei/lang/en_US.lang @@ -157,6 +157,9 @@ nei.options.inventory.showRecipeMarker.false=No nei.options.inventory.showItemQuantityWidget=Show Item Quantity Widget nei.options.inventory.showItemQuantityWidget.true=Yes nei.options.inventory.showItemQuantityWidget.false=No +nei.options.inventory.centerSearchWidget=Center Search Widget +nei.options.inventory.centerSearchWidget.true=Yes +nei.options.inventory.centerSearchWidget.false=No nei.options.inventory.creative_tab_style=Creative or JEI tab style nei.options.inventory.creative_tab_style.true=Creative nei.options.inventory.creative_tab_style.false=JEI