From 439fc22ff04b0f5b0201c2d982bceb18d82fd553 Mon Sep 17 00:00:00 2001
From: NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>
Date: Thu, 16 Jun 2022 11:41:19 +0000
Subject: added colours to fishing tab (#166)
* Added color background to the back of the fishing tab
* Fixed missing enchants not working with shiny items
* added my name to everything i had done in 2.1.md cos idk why i didnt before
---
Update Notes/2.1.md | 115 +++++++++++----------
.../listener/ItemTooltipListener.java | 2 +-
.../profileviewer/trophy/TrophyFishingPage.java | 29 ++++--
.../assets/notenoughupdates/pv_trophy_fish_tab.png | Bin 4057 -> 2839 bytes
4 files changed, 81 insertions(+), 65 deletions(-)
diff --git a/Update Notes/2.1.md b/Update Notes/2.1.md
index 933b907a..6b95d546 100644
--- a/Update Notes/2.1.md
+++ b/Update Notes/2.1.md
@@ -2,32 +2,32 @@
### **Major Changes:**
-- Added mining skill overlay
-- Added fishing skill overlay
-- Added combat skill overlay
-- Added slayer overlay
+- Added mining skill overlay - nopo
+- Added fishing skill overlay - nopo
+- Added combat skill overlay - nopo
+- Added slayer overlay - nopo
- Added blocking clicks back to the enchanting minigames (because apparently, it's not bannable?)
- [Donpireso replied to a sba dev's email about some of sba features, and it seems to imply that blocking clicks in guis aren't bannable](https://cdn.discordapp.com/attachments/823769568933576764/906101631861526559/unknown.png)
-- Fixed pet overlay not updating when going into /pets
+- Fixed pet overlay not updating when going into /pets - nopo
- [Added an armor overlay for the new armor slots](https://cdn.discordapp.com/attachments/832652653292027904/922399046528794634/unknown.png)
-- Added a pet overlay that shows your active pet in your inventory
+- Added a pet overlay that shows your active pet in your inventory - nopo
- [Price graph for items on /ah and /bz](https://cdn.discordapp.com/attachments/896407218151366687/926968296929107999/unknown.png) - DeDiamondPro
- Added wishing compass solver that shows target coordinates, structure, and integrates with Skytils waypoints - CraftyOldMiner
- Improved metal detector logic to solve using a single position in most cases using known locations based on Keeper coordinates - CraftyOldMiner
- Added support for official Hypixel wiki, can be toggled in /neu misc - DeDiamondPro
- Added and fixed various things in the profile viewer:
- - [Added mining tab](https://cdn.discordapp.com/attachments/832652653292027904/903619242384056370/unknown.png)
+ - [Added mining tab](https://cdn.discordapp.com/attachments/832652653292027904/903619242384056370/unknown.png) - nopo
- Big thanks to kwev1n for some math and jani for the texture
- [Added bingo tab](https://cdn.discordapp.com/attachments/702456294874808330/951909539383500820/unknown.png) - Lulonaut
- - [Added bingo and Stranded profile icons to /pv](https://cdn.discordapp.com/attachments/832652653292027904/915844465372065842/unknown.png)
+ - [Added bingo and Stranded profile icons to /pv](https://cdn.discordapp.com/attachments/832652653292027904/915844465372065842/unknown.png) - nopo
- Added trophy fishing tab - efefury
- - Added equipment
- - Added blaze slayer level and kills
- - Added social level
- - Added various new collections and minions
- - Added mastermode catacombs xp to level calculator
- - Added profile viewer settings to /neu
- - Added an unknown icon if neu doesn't recognize your profile type
+ - Added equipment - nopo
+ - Added blaze slayer level and kills - nopo
+ - Added social level - nopo
+ - Added various new collections and minions - nopo
+ - Added mastermode catacombs xp to level calculator - nopo
+ - Added profile viewer settings to /neu - nopo
+ - Added an unknown icon if neu doesn't recognize your profile type - nopo
- Added total xp to catacombs level - efefury
- Fixed minion tiers crafted by coop members not showing up in /pv - Lulonaut
- Fixed crash in /pv when the player had a pet that is not saved in the repo - Lulonaut
@@ -38,44 +38,44 @@
- Add mob drop viewer in the recipe viewer - nea89
- Add Stranded Villager Trades to the item list - nea89
- Added a config option to hide Dwarven Mines waypoints when already at the location - Lulonaut
-- Added some info panels to some settings in /neu
+- Added some info panels to some settings in /neu - nopo
- Added Kat Level After Upgrade Estimator - nea89
-- Added pitch and coins/m as options in farming skill overlay
+- Added pitch and coins/m as options in farming skill overlay - nopo
- Make it so tab completion in ah search GUI goes down the items - Lulonaut
-- Added a toggle for enchant glint in storage gui (ty ery for texture)
+- Added a toggle for enchant glint in storage gui (ty ery for texture) - nopo
- Fairy soul beacons now change color based on their distance
- Separated settings for fairy soul tracking from showing beacons. Tracking is turned on by default.
-- Added fairy souls option to /neu misc
+- Added fairy souls option to /neu misc - nopo
- Make it so fairy souls are tracked independently for each profile - Lulonaut
-- Added a button in the storage gui to open the settings
-- Added an option to change the click names for /pv to /ah
+- Added a button in the storage gui to open the settings - nopo
+- Added an option to change the click names for /pv to /ah - nopo
- Added a help menu to /neuec
-- Made it so treecap shows foraging xp instead of farming xp on the farming overlay
-- Made it so a jungle axe with cult will show the "farming" overlay
+- Made it so treecap shows foraging xp instead of farming xp on the farming overlay - nopo
+- Made it so a jungle axe with cult will show the "farming" overlay - nopo
- Added /neurepomode to toggle item editing and dev mode, changing the item repo url and toggling autoupdating of the repo
-- Changed "NEUAH is DISABLED! Enable in /neusettings." to /neu
-- Changed misc overlays tab to todo overlays
-- Added a config option for npc retexturing
-- Added a config option for dirt wand overlay
-- Added a config option for hoe of tilling
-- Added an option to use short numbers (1.5mil) for price tooltips
+- Changed "NEUAH is DISABLED! Enable in /neusettings." to /neu - nopo
+- Changed misc overlays tab to todo overlays - nopo
+- Added a config option for npc retexturing - nopo
+- Added a config option for dirt wand overlay - nopo
+- Added a config option for hoe of tilling - nopo
+- Added an option to use short numbers (1.5mil) for price tooltips - nopo
- Added Drills and Gauntlet to the itemlist tools category - jani
-- Added an option to turn off showing next click in chronomatron
-- Turns off inv search mode after 2 minutes
-- Made /neustats modlist show normal /neustats if under 15 mods
+- Added an option to turn off showing next click in chronomatron - nopo
+- Turns off inv search mode after 2 minutes - nopo
+- Made /neustats modlist show normal /neustats if under 15 mods - nopo
- Added max enchant book and max attribute shard to /neuec - Dokm
-- Fixed pet overlay not resetting pet when making new profile
+- Fixed pet overlay not resetting pet when making new profile - nopo
- Added a warning in the tooltip when price info couldn't be found/is outdated - Lulonaut
-- Added "Has Advanced Tab" to /neustats
+- Added "Has Advanced Tab" to /neustats - nopo
- Added custom runes and crab hat system - jani
-- Removed unused textures
+- Removed unused textures - nopo
- Added daily powder to todo overlay - efefury
- Added a way to include kismet feather to profit calculator - efefury
- Added custom sounds for crystal hollow gemstones - nea89
- Added custom biomes for crystal hollow areas - nopo
- Added a config option to hide the reforge stats for Legendary items from Hypixel on reforge stones - Lulonaut
-- Added an option to alert you if you put something for too much onto ah (default 50%)
-- Lowest bin alert triggers if lowest bin isnt found
+- Added an option to alert you if you put something for too much onto ah (default 50%) - nopo
+- Lowest bin alert triggers if lowest bin isnt found - nopo
- Crystal Hollows crystal states are now updated when the Heart of the Mountain menu is opened - CraftyOldMiner
- Added /neudiag command to enable/disable debug logging and dump diagnostic data - CraftyOldMiner
- Added NBT data to Profile Viewer HOTM tree icons - whalker
@@ -90,9 +90,9 @@
- Added optional radius argument for neupackdev subcommands. - whalker
- Added tab completion to /neupackdev subcommands. - whalker
- Made it if you hold shift in the enchant solvers it overrides prevent missclicks
-- Added 6-10 stars to the auction search overlay
-- Added 6-10 stars to /neucustomize
-- Added support for attributes in neuec
+- Added 6-10 stars to the auction search overlay - nopo
+- Added 6-10 stars to /neucustomize - nopo
+- Added support for attributes in neuec - nopo
- Added Heavy Pearls to todo overlay - cobble8
- Added Booster Cookie Warning - 2stinkysocks
- Added an option to only search for Level 100 pets in the auction house search overlay - Lulonaut
@@ -100,31 +100,32 @@
### **Bug Fixes:**
- Fix wiki pages freezing the entire game - nea89
-- Made titanium overlay and waypoints work with dwarven overlay off
-- "fixed" divan rarity in NEUAH (scuffed)
-- Made etherwarp block overlay config option
+- Made titanium overlay and waypoints work with dwarven overlay off - nopo
+- "fixed" divan rarity in NEUAH (scuffed) - nopo
+- Made etherwarp block overlay config option - nopo
- Fixed ram usage in crystal hollows - Dokm
-- Made skills not show int limit when at max level in skill overlays
+- Made skills not show int limit when at max level in skill overlays - nopo
- Fixed space cape texture - Microcontrollers
-- Make it so you can hold down keys in sign GUIs
-- Added entrance to "floor one" + made blur limit at 100
-- Fixed screenshot key in /et overlay
-- Fixed api key autofill with dg copy chat feature
-- Made missing enchants not show on an item if its not missing any enchants
+- Make it so you can hold down keys in sign GUIs - nopo
+- Added entrance to "floor one" + made blur limit at 100 - nopo
+- Fixed screenshot key in /et overlay - nopo
+- Fixed api key autofill with dg copy chat feature - nopo
+- Made missing enchants not show on an item if its not missing any enchants - nopo
- Fixed Mining overlay crash - Dokm
- Fixed pet crash - Dokm
-- Fixed fetchur for the 75th time
-- [Made an error if you have new tab list off](https://cdn.discordapp.com/attachments/896407218151366687/913681097605398528/unknown.png)
-- Fixed lava fishing with the fishing alert
+- Fixed fetchur for the 75th time - nopo
+- [Made an error if you have new tab list off](https://cdn.discordapp.com/attachments/896407218151366687/913681097605398528/unknown.png) - nopo
+- Fixed lava fishing with the fishing alert - nopo
- Fixed /locraw detection, [previously allowed chat messages to trigger it](https://github.com/NotEnoughUpdates/NotEnoughUpdates/issues/35) - IRONM00N
- Fixed experiment timer in todo overlay - efefury
-- Fixed replace click events with /pv working in other modes
+- Fixed replace click events with /pv working in other modes - nopo
- Fixed /neuec presets not applying the strikethrough attribute - Lulonaut
-- Fixed what hypxiel broke in dungeons
+- Fixed what hypxiel broke in dungeons - nopo
- Fixed the dungeon map on f1 - Minikloon
-- Added checks for chat messages for dungeon win overlay
-- Fixed some vanilla Minecraft keybinds not working in NEU GUIs
+- Added checks for chat messages for dungeon win overlay - nopo
+- Fixed some vanilla Minecraft keybinds not working in NEU GUIs - nopo
- Fixed crash with spamming remove enchant in /neuec
+- Fixed missing enchants not working with shiny items - nopo
### **Other:**
@@ -139,4 +140,4 @@
### **Previous change log**
-https://github.com/NotEnoughUpdates/NotEnoughUpdates/blob/master/Update%20Notes/2.0-Pre31-Release.md
\ No newline at end of file
+https://github.com/NotEnoughUpdates/NotEnoughUpdates/blob/master/Update%20Notes/2.0-Pre31-Release.md
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/listener/ItemTooltipListener.java b/src/main/java/io/github/moulberry/notenoughupdates/listener/ItemTooltipListener.java
index fab02bf9..e7da8628 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/listener/ItemTooltipListener.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/listener/ItemTooltipListener.java
@@ -155,7 +155,7 @@ public class ItemTooltipListener {
for (int j = 0; j < Utils.rarityArrC.length; j++) {
for (Map.Entry<String, JsonElement> entry : enchantsObj.entrySet()) {
if (line.contains(Utils.rarityArrC[j] + " " + entry.getKey()) || line.contains(
- Utils.rarityArrC[j] + " DUNGEON " + entry.getKey())) {
+ Utils.rarityArrC[j] + " DUNGEON " + entry.getKey()) || line.contains("SHINY " + Utils.rarityArrC[j].replaceAll("§.§.","") + " DUNGEON " + entry.getKey())) {
allItemEnchs = entry.getValue().getAsJsonArray();
break out;
}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/trophy/TrophyFishingPage.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/trophy/TrophyFishingPage.java
index 6063dee0..ece6f275 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/trophy/TrophyFishingPage.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/trophy/TrophyFishingPage.java
@@ -114,6 +114,7 @@ public class TrophyFishingPage {
private static final ResourceLocation TROPHY_FISH_TEXTURE = new ResourceLocation(
"notenoughupdates:pv_trophy_fish_tab.png");
+ public static final ResourceLocation pv_elements = new ResourceLocation("notenoughupdates:pv_elements.png");
private static final Map<String, TrophyFish> trophyFishList = new HashMap<>();
private static final Map<String, Integer> total = new HashMap<>();
@@ -197,18 +198,30 @@ public class TrophyFishingPage {
);
ArrayList<TrophyFish> arrayList = new ArrayList<>(trophyFishList.values());
- arrayList.sort((c1, c2) -> {
- if (c1.getTotal() > c2.getTotal()) return -1;
- if (c1.getTotal() < c2.getTotal()) return 1;
- return 0;
- });
+ arrayList.sort((c1, c2) -> Integer.compare(c2.getTotal(), c1.getTotal()));
int x;
int y;
for (TrophyFish value : arrayList) {
- RenderHelper.enableGUIStandardItemLighting();
x = guiLeft + slotLocations.get(arrayList.indexOf(value)).getLeft();
y = guiTop + slotLocations.get(arrayList.indexOf(value)).getRight();
+ RenderHelper.enableGUIStandardItemLighting();
+ Minecraft.getMinecraft().getTextureManager().bindTexture(pv_elements);
+ Map<TrophyFish.TrophyFishRarity, Integer> trophyFishRarityIntegerMap = value.getTrophyFishRarityIntegerMap();
+ if (trophyFishRarityIntegerMap.containsKey(TrophyFish.TrophyFishRarity.BRONZE)) {
+ GlStateManager.color(255/255f, 130/255f, 0/255f, 1);
+ }
+ if (trophyFishRarityIntegerMap.containsKey(TrophyFish.TrophyFishRarity.SILVER)) {
+ GlStateManager.color(192/255f, 192/255f, 192/255f, 1);
+ }
+ if (trophyFishRarityIntegerMap.containsKey(TrophyFish.TrophyFishRarity.GOLD)) {
+ GlStateManager.color(1, 0.82F, 0, 1);
+ }
+ if (trophyFishRarityIntegerMap.containsKey(TrophyFish.TrophyFishRarity.DIAMOND)) {
+ GlStateManager.color(31/255f, 216/255f, 241/255f, 1);
+ }
+ Utils.drawTexturedRect(x - 2 , y - 2, 20, 20, 0, 20 / 256f, 0, 20 / 256f, GL11.GL_NEAREST);
+ GlStateManager.color(1, 1, 1, 1);
Minecraft.getMinecraft().getRenderItem().renderItemIntoGUI(
getItem(value.getName()),
x,
@@ -255,9 +268,11 @@ public class TrophyFishingPage {
-1,
Minecraft.getMinecraft().fontRendererObj
);
+ GlStateManager.color(1, 1, 1, 1);
}
-
}
+ Minecraft.getMinecraft().getTextureManager().bindTexture(pv_elements);
+ Utils.drawTexturedRect(x - 2 , y - 2, 20, 20, 0, 20 / 256f, 0, 20 / 256f, GL11.GL_NEAREST);
}
}
diff --git a/src/main/resources/assets/notenoughupdates/pv_trophy_fish_tab.png b/src/main/resources/assets/notenoughupdates/pv_trophy_fish_tab.png
index 669bc489..d42446c1 100644
Binary files a/src/main/resources/assets/notenoughupdates/pv_trophy_fish_tab.png and b/src/main/resources/assets/notenoughupdates/pv_trophy_fish_tab.png differ
--
cgit