aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java
diff options
context:
space:
mode:
authorNopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>2022-04-30 14:24:52 +0000
committerGitHub <noreply@github.com>2022-04-30 16:24:52 +0200
commit7243827ec602efa0d2386ab53a61472465e8555a (patch)
treef854d9ecddd27a200f3a91193448cfbf85303780 /src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java
parente6d58c7281375e8ca67b0e217e9c0eea2626ee19 (diff)
downloadnotenoughupdates-7243827ec602efa0d2386ab53a61472465e8555a.tar.gz
notenoughupdates-7243827ec602efa0d2386ab53a61472465e8555a.tar.bz2
notenoughupdates-7243827ec602efa0d2386ab53a61472465e8555a.zip
made it so "pane gui scale" doesnt effect armour/pet huds (#117)
* made it so "pane gui scale" doesnt effect armour/pet huds ( i did not know that was a feature) this did NOT take me 20 minutes to make this commit on the right branch * = Updated the syntax for the /sthw command, putting name after the coordinates (@My-Name-Is-Jeff) * deez nuts * move equipment tooltips to the left * move tooltip when rendering fixes some opengl shenanigans when using GlTranslate * import static * i think the number 27 is cooler than 21 but its needed here * fix pet tooltip when equipment is not cached * added master star support to the search overlay (no texture rn cos lazy) * Added 6-10 stars to the auction search overlay i am not using the web editor * texture - jani * ➓/➓ pr adding numbers to /neurename * ➓/➓ pr adding numbers 2.1.md * neuec support to attributes (THIS DID NOT TAKE OVER AN HOUR) * 2.1.md 🙂 * Added flares to tools itemtab / fixed todo move option not showing / some fixes for my heart * fix normal keybinds not working in CalendarOverlay * 2.1.md 🙂 * cobble pro time keeper * added MAXED_ATTRIBUTE_SHARD * Update 2.1.md Co-authored-by: Lulonaut <lulonaut@tutanota.de> Co-authored-by: jani270 <jani270@gmx.de>
Diffstat (limited to 'src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java')
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java28
1 files changed, 27 insertions, 1 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java
index bd4bd680..4e865b28 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java
@@ -66,7 +66,9 @@ public class GuiEnchantColour extends GuiScreen {
private static final Pattern settingPattern = Pattern.compile(".*:[>=<]:[0-9]+:[a-zA-Z0-9]+(:[a-zA-Z0-9]+)?");
private ItemStack maxedBook;
+ private ItemStack maxedAttBook;
private int maxedBookFound = 0;
+ private int maxedAttBookFound = 0;
private List<String> getEnchantColours() {
return NotEnoughUpdates.INSTANCE.config.hidden.enchantColours;
@@ -227,13 +229,37 @@ public class GuiEnchantColour extends GuiScreen {
if (maxedBookFound == 1) {
Utils.drawItemStack(maxedBook, guiLeft + xSize + 3, guiTopSidebar - 34);
}
+ if (maxedAttBookFound == 0) {
+ try {
+ if (NotEnoughUpdates.INSTANCE.manager.jsonToStack(
+ NotEnoughUpdates.INSTANCE.manager.getItemInformation().get("MAXED_ATTRIBUTE_SHARD")).hasDisplayName()) {
+ maxedAttBook = NotEnoughUpdates.INSTANCE.manager.jsonToStack(NotEnoughUpdates.INSTANCE.manager
+ .getItemInformation()
+ .get("MAXED_ATTRIBUTE_SHARD"));
+ maxedAttBookFound = 1;
+ } else {
+ maxedAttBookFound = 2;
+ }
- if (mouseX >= guiLeft + xSize + 3 && mouseX < guiLeft + xSize + 19) {
+ } catch (Exception ignored) {
+ maxedAttBookFound = 2;
+ }
+ }
+ if (maxedAttBookFound == 1) {
+ Utils.drawItemStack(maxedAttBook, guiLeft + xSize + 3, guiTopSidebar - 52);
+ }
+
+ if (mouseX >= guiLeft + xSize + 3 && mouseX < guiLeft + xSize + 39) {
if (mouseY >= guiTopSidebar - 34 && mouseY <= guiTopSidebar - 18 && maxedBookFound == 1) {
tooltipToDisplay = maxedBook.getTooltip(Minecraft.getMinecraft().thePlayer, false);
Utils.drawHoveringText(tooltipToDisplay, mouseX, mouseY, width, height, -1, fr);
tooltipToDisplay = null;
}
+ if (mouseY >= guiTopSidebar - 52 && mouseY <= guiTopSidebar - 34 && maxedAttBookFound == 1) {
+ tooltipToDisplay = maxedAttBook.getTooltip(Minecraft.getMinecraft().thePlayer, false);
+ Utils.drawHoveringText(tooltipToDisplay, mouseX, mouseY, width, height, -1, fr);
+ tooltipToDisplay = null;
+ }
if (mouseY >= guiTopSidebar - 18 && mouseY <= guiTopSidebar - 2) {
tooltipToDisplay = Lists.newArrayList(
EnumChatFormatting.AQUA + "NEUEC Colouring Guide",