diff options
| author | Walker Selby <git@walkerselby.com> | 2023-10-20 19:32:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-20 20:32:09 +0200 |
| commit | 3dfb81b9d5aefce9a2448d5e9e1533a28b16f11e (patch) | |
| tree | 325914b6a03592e2cfe2249216b2b631401b5736 /src/main/java/at/hannibal2/skyhanni/features/slayer | |
| parent | c233f06f5d4c7b054eb7e34e3af51ee02a01387c (diff) | |
| download | skyhanni-3dfb81b9d5aefce9a2448d5e9e1533a28b16f11e.tar.gz skyhanni-3dfb81b9d5aefce9a2448d5e9e1533a28b16f11e.tar.bz2 skyhanni-3dfb81b9d5aefce9a2448d5e9e1533a28b16f11e.zip | |
Internal Changes: getInternalName Pt 2 (#548)
Internal Changes: getInternalName Pt 2 #548
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/slayer')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemsOnGround.kt | 3 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemsOnGround.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemsOnGround.kt index 7ff28f287..c3d5d9545 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemsOnGround.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemsOnGround.kt @@ -5,7 +5,6 @@ import at.hannibal2.skyhanni.data.SlayerAPI import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent import at.hannibal2.skyhanni.utils.EntityUtils import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName -import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_old import at.hannibal2.skyhanni.utils.ItemUtils.name import at.hannibal2.skyhanni.utils.LocationUtils import at.hannibal2.skyhanni.utils.LorenzUtils @@ -41,7 +40,7 @@ class SlayerItemsOnGround { if (SlayerAPI.ignoreSlayerDrop(name)) continue // happens in spiders den sometimes if (itemStack.item == Items.spawn_egg) continue - if (itemStack.getInternalName_old() == "") continue + if (itemStack.getInternalName().equals("")) continue val (itemName, price) = SlayerAPI.getItemNameAndPrice(itemStack.getInternalName(), itemStack.stackSize) if (config.minimumPrice > price) continue diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt index 4021209f6..0b98116a2 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt @@ -9,7 +9,7 @@ import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.LorenzTickEvent import at.hannibal2.skyhanni.events.SlayerChangeEvent -import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_old +import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.ItemUtils.nameWithEnchantment import at.hannibal2.skyhanni.utils.LorenzUtils @@ -123,7 +123,7 @@ class SlayerRngMeterDisplay { } else { storage.itemGoal = selectedItem.nameWithEnchantment val jsonObject = Constants.RNGSCORE["slayer"].asJsonObject.get(getCurrentSlayer()).asJsonObject - storage.goalNeeded = jsonObject.get(selectedItem.getInternalName_old()).asLong + storage.goalNeeded = jsonObject.get(selectedItem.getInternalName().asString()).asLong } update() } |