aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker/skyblock/dungeon
diff options
context:
space:
mode:
authorYasin <a.piri@hotmail.de>2024-07-23 00:04:37 +0200
committerKevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>2024-07-26 15:09:00 +0800
commit646eaeee8a30b4edf82b2b401e930adf6627f65e (patch)
tree8df157e45075404e1ce32f2ad9ff4291fa240c86 /src/main/java/de/hysky/skyblocker/skyblock/dungeon
parenta26143be386e78094d9a32e0d2c70439afd56369 (diff)
downloadSkyblocker-646eaeee8a30b4edf82b2b401e930adf6627f65e.tar.gz
Skyblocker-646eaeee8a30b4edf82b2b401e930adf6627f65e.tar.bz2
Skyblocker-646eaeee8a30b4edf82b2b401e930adf6627f65e.zip
livid fix
now it will only highlight the correct livid also after the "change"
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/skyblock/dungeon')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/LividColor.java23
1 files changed, 22 insertions, 1 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/LividColor.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/LividColor.java
index 15d0d6dd..d360ae2e 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/LividColor.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/LividColor.java
@@ -46,10 +46,12 @@ public class LividColor {
);
public static final Set<String> LIVID_NAMES = Set.copyOf(LIVID_TO_FORMATTING.keySet());
public static final DungeonsConfig.Livid CONFIG = SkyblockerConfigManager.get().dungeons.livid;
- private static Formatting color;
+ private static Formatting color = Formatting.AQUA;
private static Block lastColor = Blocks.AIR;
+ private static int lividID = 0;
private static boolean isInitialized = false;
+ private static boolean originLividFound = false;
private static final long OFFSET_DURATION = 2000;
private static long toggleTime = 0;
@@ -74,6 +76,18 @@ public class LividColor {
isInitialized = true;
} else if (isInitialized && System.currentTimeMillis() - toggleTime >= OFFSET_DURATION) {
onLividColorFound(client, currentColor);
+ if (!originLividFound) {
+ String lividName = LIVID_TO_FORMATTING.entrySet().stream()
+ .filter(entry -> entry.getValue() == color)
+ .map(Map.Entry::getKey)
+ .findFirst()
+ .orElse("unknown");
+ client.world.getPlayers().stream()
+ .filter(entity -> entity.getName().getString().equals(lividName))
+ .findFirst()
+ .ifPresent(entity -> lividID = entity.getId());
+ originLividFound = true;
+ }
lastColor = currentColor;
}
@@ -114,9 +128,16 @@ public class LividColor {
return Formatting.WHITE.getColorValue();
}
+ public static int getLividID(){
+ return lividID;
+ }
+
private static void reset() {
lastColor = Blocks.AIR;
toggleTime = 0;
isInitialized = false;
+ originLividFound = false;
+ lividID = 0;
+ color = Formatting.AQUA;
}
}