aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-08-22 23:13:14 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-08-22 23:13:14 +0200
commit6ef62c0a5c2f23befeac58451ff7a41cb0ec4678 (patch)
treefbfa7e671dcfe7b86f0baceb61c4c71533b354d1
parent51af64037d0422d4d6b603e1164e60cf4b50dda0 (diff)
downloadskyhanni-6ef62c0a5c2f23befeac58451ff7a41cb0ec4678.tar.gz
skyhanni-6ef62c0a5c2f23befeac58451ff7a41cb0ec4678.tar.bz2
skyhanni-6ef62c0a5c2f23befeac58451ff7a41cb0ec4678.zip
Removed wishing compass in item number.
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/InventoryConfig.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt23
2 files changed, 6 insertions, 19 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/InventoryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/InventoryConfig.java
index ff2c0eb83..cfe2570b9 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/InventoryConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/InventoryConfig.java
@@ -272,7 +272,7 @@ public class InventoryConfig {
"§bPet Level",
"§bMinion Tier",
"§bCrimson Armor",
- "§bWishing Compass",
+ "§b§mWishing Compass§r §7(Disabled)",
"§bKuudra Key",
"§bSkill Level",
"§bCollection Level",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
index 029ca979f..aa73ad5bc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
@@ -100,19 +100,6 @@ class ItemDisplayOverlayFeatures {
}
if (SkyHanniMod.feature.inventory.itemNumberAsStackSize.contains(7)) {
- if (itemName.contains("Wishing Compass")) {
- for (line in item.getLore()) {
- wishingCompassPattern.matchMatcher(line) {
- val uses = group("amount")
- if (uses != "3") {
- return uses
- }
- }
- }
- }
- }
-
- if (SkyHanniMod.feature.inventory.itemNumberAsStackSize.contains(8)) {
if (itemName.contains("Kuudra Key")) {
return when (itemName) {
"Kuudra Key" -> "§a1"
@@ -125,7 +112,7 @@ class ItemDisplayOverlayFeatures {
}
}
- if (SkyHanniMod.feature.inventory.itemNumberAsStackSize.contains(9)) {
+ if (SkyHanniMod.feature.inventory.itemNumberAsStackSize.contains(8)) {
if (InventoryUtils.openInventoryName() == "Your Skills") {
if (item.getLore().any { it.contains("Click to view!") }) {
if (CollectionAPI.isCollectionTier0(item.getLore())) return "0"
@@ -137,7 +124,7 @@ class ItemDisplayOverlayFeatures {
}
}
- if (SkyHanniMod.feature.inventory.itemNumberAsStackSize.contains(10)) {
+ if (SkyHanniMod.feature.inventory.itemNumberAsStackSize.contains(9)) {
if (InventoryUtils.openInventoryName().endsWith(" Collections")) {
val lore = item.getLore()
if (lore.any { it.contains("Click to view!") }) {
@@ -152,7 +139,7 @@ class ItemDisplayOverlayFeatures {
}
}
- if (SkyHanniMod.feature.inventory.itemNumberAsStackSize.contains(11)) {
+ if (SkyHanniMod.feature.inventory.itemNumberAsStackSize.contains(10)) {
if (itemName.contains("Rancher's Boots")) {
for (line in item.getLore()) {
rangerBootsSpeedCapPattern.matchMatcher(line) {
@@ -162,7 +149,7 @@ class ItemDisplayOverlayFeatures {
}
}
- if (SkyHanniMod.feature.inventory.itemNumberAsStackSize.contains(12)) {
+ if (SkyHanniMod.feature.inventory.itemNumberAsStackSize.contains(11)) {
if (item.getInternalName_old() == "LARVA_HOOK") {
for (line in item.getLore()) {
"§7§7You may harvest §6(?<amount>.).*".toPattern().matchMatcher(line) {
@@ -177,7 +164,7 @@ class ItemDisplayOverlayFeatures {
}
}
- if (SkyHanniMod.feature.inventory.itemNumberAsStackSize.contains(13)) {
+ if (SkyHanniMod.feature.inventory.itemNumberAsStackSize.contains(12)) {
if (item.getInternalName_old() == "POTION") {
item.name?.let {
"Dungeon (?<level>.*) Potion".toPattern().matchMatcher(it.removeColor()) {