aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java
diff options
context:
space:
mode:
authorNopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>2022-01-02 09:07:24 +1100
committerGitHub <noreply@github.com>2022-01-01 17:07:24 -0500
commit0f3cfc259f89c22840b761931e238d699f17acc7 (patch)
tree5ea4cfb8ef7eed04a9737c4882679435b12bba50 /src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java
parenta2caf04c1e4a3a4f38d13c1c80db83f624c838d6 (diff)
downloadnotenoughupdates-0f3cfc259f89c22840b761931e238d699f17acc7.tar.gz
notenoughupdates-0f3cfc259f89c22840b761931e238d699f17acc7.tar.bz2
notenoughupdates-0f3cfc259f89c22840b761931e238d699f17acc7.zip
Added custom wardrobe display for the new stuff they have put on the alpha (#36)
* istg if you give me 170 commits i will end someone(added stranded pv icon + added an icon for gamemodes that neu doesnt know about) * Change the mines of divan waypoints to blue because it was hard to see the gold waypoint gold blocks everywhere * Added a custom armor stuff for the alpha content * Made it so it doesnt show if you dont have hide potion effects on * very cool and epic armor display (dont look at the code its bad) ((not finished)) * hello yes please test armor hud (finished but i will clean it up a lil) * clean up code + show thingy when no items cached + fix neu buttons placement + fixed crash * fixed neubutton placment but the fix works (i hope) * i see no reason for this to work outside skyblock soo * ery wanted it to be possible for an on texture to be different to an off texture in /neu * Added "Has Advanced Tab" to /neustats * Added "Has Advanced Tab" to /neustats * https://cdn.discordapp.com/attachments/896407218151366687/924981162714234900/unknown.png https://cdn.discordapp.com/attachments/896407218151366687/924981203319263232/unknown.png (fixed storage menu if you have new tab off) * tried to fix the gui being offset * Add a pet display for your inventory * tries to show your pet stats in the inv display * skyblock check * Fix texture * try to lower file size by unused assets * patch notes ! * remove some random code that wasnt doing anything * added a repo check to see if the wardrobe stuff has come out yet * fixed it showing wrong pet * fixed caching
Diffstat (limited to 'src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java')
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java
index 9663868b..8fe64b55 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java
@@ -3,6 +3,7 @@ package io.github.moulberry.notenoughupdates.miscfeatures;
import com.google.common.collect.Lists;
import com.google.gson.*;
import io.github.moulberry.notenoughupdates.NEUEventListener;
+import io.github.moulberry.notenoughupdates.NEUOverlay;
import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
import io.github.moulberry.notenoughupdates.core.config.Position;
import io.github.moulberry.notenoughupdates.core.util.lerp.LerpUtils;
@@ -1114,7 +1115,11 @@ public class PetInfoOverlay extends TextOverlay {
String chatMessage = Utils.cleanColour(event.message.getUnformattedText());
Matcher autopetMatcher = AUTOPET_EQUIP.matcher(event.message.getFormattedText());
- if (autopetMatcher.matches()) {
+ if (event.message.getUnformattedText().startsWith("You summoned your") || System.currentTimeMillis() - NEUOverlay.cachedPetTimer < 500) {
+ NEUOverlay.cachedPetTimer = System.currentTimeMillis();
+ NEUOverlay.shouldUseCachedPet = false;
+ } else if (autopetMatcher.matches()) {
+ NEUOverlay.shouldUseCachedPet = false;
try {
lastLevelHovered = Integer.parseInt(autopetMatcher.group(1));
} catch (NumberFormatException ignored) {}