diff options
author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-08-09 13:50:53 +0200 |
---|---|---|
committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-08-09 13:50:53 +0200 |
commit | d19350d4b0b99f6b04680aba9686ddbe1e7df780 (patch) | |
tree | abb8859f13f2f03ebf9457624f8f2cbae6496b00 /src/main/java/at/hannibal2/skyhanni/features/slayer | |
parent | e04efa84f7d42ddcbe11eb65f25adc0e524a3aaa (diff) | |
download | skyhanni-d19350d4b0b99f6b04680aba9686ddbe1e7df780.tar.gz skyhanni-d19350d4b0b99f6b04680aba9686ddbe1e7df780.tar.bz2 skyhanni-d19350d4b0b99f6b04680aba9686ddbe1e7df780.zip |
Changing internalName to getInternalName_old, and getInternalName_new to internalName
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/slayer')
3 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemProfitTracker.kt index d67390349..57a7a5621 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemProfitTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemProfitTracker.kt @@ -10,7 +10,7 @@ import at.hannibal2.skyhanni.features.bazaar.BazaarApi.Companion.getBazaarData import at.hannibal2.skyhanni.features.bazaar.BazaarData import at.hannibal2.skyhanni.test.PriceSource import at.hannibal2.skyhanni.utils.* -import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull_new +import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull import at.hannibal2.skyhanni.utils.ItemUtils.name import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList import at.hannibal2.skyhanni.utils.LorenzUtils.addSelector @@ -135,7 +135,7 @@ object SlayerItemProfitTracker { val itemStack = item.entityItem val name = itemStack.name ?: return if (SlayerAPI.ignoreSlayerDrop(name)) return - val internalName = itemStack.getInternalNameOrNull_new() ?: return + val internalName = itemStack.getInternalNameOrNull() ?: return val (itemName, price) = SlayerAPI.getItemNameAndPrice(itemStack) addItemPickup(internalName, itemStack.stackSize) 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 e8b5204c3..375b2e86c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemsOnGround.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemsOnGround.kt @@ -3,7 +3,7 @@ package at.hannibal2.skyhanni.features.slayer import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.SlayerAPI 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 @@ -40,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() == "") continue + if (itemStack.getInternalName_old() == "") continue val (itemName, price) = SlayerAPI.getItemNameAndPrice(itemStack) 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 fb72cc33d..371aa5337 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt @@ -6,7 +6,7 @@ import at.hannibal2.skyhanni.data.ProfileStorageData import at.hannibal2.skyhanni.data.SlayerAPI import at.hannibal2.skyhanni.data.TitleUtils import at.hannibal2.skyhanni.events.* -import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName +import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_old import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.ItemUtils.nameWithEnchantment import at.hannibal2.skyhanni.utils.LorenzUtils @@ -127,7 +127,7 @@ class SlayerRngMeterDisplay { } else { storage.itemGoal = selectedItem.nameWithEnchantment val jsonObject = Constants.RNGSCORE["slayer"].asJsonObject.get(getCurrentSlayer()).asJsonObject - storage.goalNeeded = jsonObject.get(selectedItem.getInternalName()).asLong + storage.goalNeeded = jsonObject.get(selectedItem.getInternalName_old()).asLong } update() } |