From dd91ed7db4a4323126a04ac88bd8a4c6d6c9c82d Mon Sep 17 00:00:00 2001 From: Vixid <52578495+Vixid1@users.noreply.github.com> Date: Mon, 12 Dec 2022 17:29:58 +0000 Subject: Added Highest Wave completed to Kuudra stats in pv (#489) --- .../assets/notenoughupdates/pv_crimson_isle_page.png | Bin 3370 -> 3752 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'src/main/resources/assets/notenoughupdates') diff --git a/src/main/resources/assets/notenoughupdates/pv_crimson_isle_page.png b/src/main/resources/assets/notenoughupdates/pv_crimson_isle_page.png index b08c0057..7ea7af0e 100644 Binary files a/src/main/resources/assets/notenoughupdates/pv_crimson_isle_page.png and b/src/main/resources/assets/notenoughupdates/pv_crimson_isle_page.png differ -- cgit From c6e0f61c412adc1927ccff21d3e58f83808de215 Mon Sep 17 00:00:00 2001 From: NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com> Date: Thu, 5 Jan 2023 23:42:35 +1100 Subject: Replace help button with button to toggle inventory searching (#539) * add button to toggle search mode * Its a bit better Co-authored-by: jani270 --- .../github/moulberry/notenoughupdates/NEUOverlay.java | 18 ++++++++---------- .../options/seperateSections/Toolbar.java | 6 +++--- .../assets/notenoughupdates/search_mode_button.png | Bin 0 -> 644 bytes 3 files changed, 11 insertions(+), 13 deletions(-) create mode 100644 src/main/resources/assets/notenoughupdates/search_mode_button.png (limited to 'src/main/resources/assets/notenoughupdates') diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java index 686f6a27..7159ef89 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java @@ -88,7 +88,6 @@ import java.awt.*; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; @@ -113,6 +112,7 @@ public class NEUOverlay extends Gui { "notenoughupdates:supersecretassets/lunar.png"); private static final ResourceLocation SEARCH_BAR = new ResourceLocation("notenoughupdates:search_bar.png"); private static final ResourceLocation SEARCH_BAR_GOLD = new ResourceLocation("notenoughupdates:search_bar_gold.png"); + private static final ResourceLocation SEARCH_MODE_BUTTON = new ResourceLocation("notenoughupdates:search_mode_button.png"); private final NEUManager manager; @@ -429,7 +429,7 @@ public class NEUOverlay extends Gui { }; } - private MBGuiElement createHelpButton(NEUOverlay overlay) { + private MBGuiElement createSearchModeButton() { return new MBGuiElement() { @Override public int getWidth() { @@ -446,14 +446,12 @@ public class NEUOverlay extends Gui { @Override public void mouseClick(float x, float y, int mouseX, int mouseY) { - if (!NotEnoughUpdates.INSTANCE.config.toolbar.enableHelpButton) { + if (!NotEnoughUpdates.INSTANCE.config.toolbar.enableSearchModeButton) { return; } if (Mouse.getEventButtonState()) { - //displayInformationPane(HTMLInfoPane.createFromWikiUrl(overlay, manager, "Help", - // "https://moulberry.github.io/files/neu_help.html")); - //Minecraft.getMinecraft().displayGuiScreen(new HelpGUI()); - ClientCommandHandler.instance.executeCommand(Minecraft.getMinecraft().thePlayer, "/neuhelp"); + searchMode = !searchMode; + lastSearchMode = System.currentTimeMillis(); Utils.playPressSound(); } } @@ -466,7 +464,7 @@ public class NEUOverlay extends Gui { int paddingUnscaled = getPaddingUnscaled(); int searchYSize = getSearchBarYSize(); - if (!NotEnoughUpdates.INSTANCE.config.toolbar.enableHelpButton) { + if (!NotEnoughUpdates.INSTANCE.config.toolbar.enableSearchModeButton) { return; } @@ -476,7 +474,7 @@ public class NEUOverlay extends Gui { searchYSize + paddingUnscaled * 2, searchYSize + paddingUnscaled * 2, GL11.GL_NEAREST ); - Minecraft.getMinecraft().getTextureManager().bindTexture(GuiTextures.help); + Minecraft.getMinecraft().getTextureManager().bindTexture(SEARCH_MODE_BUTTON); GlStateManager.color(1f, 1f, 1f, 1f); Utils.drawTexturedRect((int) x + paddingUnscaled, (int) y + paddingUnscaled, getSearchBarYSize(), getSearchBarYSize() @@ -621,7 +619,7 @@ public class NEUOverlay extends Gui { List children = Lists.newArrayList( createSettingsButton(this), createSearchBar(), - createHelpButton(this) + createSearchModeButton() ); return new MBGuiGroupAligned(children, false) { public int getPadding() { diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Toolbar.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Toolbar.java index 2d88544e..d8fe91d5 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Toolbar.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Toolbar.java @@ -64,12 +64,12 @@ public class Toolbar { @Expose @ConfigOption( - name = "Show a help settings button", - desc = "Show quick settings button in the NEU toolbar" + name = "Show an inventory search button", + desc = "Show button to enable inventory searching in the NEU toolbar" ) @ConfigEditorBoolean @ConfigAccordionId(id = 0) - public boolean enableHelpButton = true; + public boolean enableSearchModeButton = true; @Expose @ConfigOption( diff --git a/src/main/resources/assets/notenoughupdates/search_mode_button.png b/src/main/resources/assets/notenoughupdates/search_mode_button.png new file mode 100644 index 00000000..416d26f7 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/search_mode_button.png differ -- cgit