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/itemabilities | |
| 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/itemabilities')
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt index e64a56ed5..cc38ecbc3 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt @@ -4,7 +4,7 @@ import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.ClickType import at.hannibal2.skyhanni.events.BlockClickEvent import at.hannibal2.skyhanni.events.ReceiveParticleEvent -import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName +import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_old import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.toChromaColor import at.hannibal2.skyhanni.utils.RenderUtils @@ -33,7 +33,7 @@ class FireVeilWandParticles { if (!LorenzUtils.inSkyBlock) return if (event.clickType == ClickType.RIGHT_CLICK) { - val internalName = event.itemInHand?.getInternalName() ?: return + val internalName = event.itemInHand?.getInternalName_old() ?: return if (internalName == "FIRE_VEIL_WAND") { lastClick = System.currentTimeMillis() diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt index 330240ceb..7074f38a5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt @@ -6,7 +6,7 @@ import at.hannibal2.skyhanni.events.* import at.hannibal2.skyhanni.utils.InventoryUtils import at.hannibal2.skyhanni.utils.ItemUtils import at.hannibal2.skyhanni.utils.ItemUtils.cleanName -import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName +import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_old import at.hannibal2.skyhanni.utils.LorenzColor import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.between @@ -43,7 +43,7 @@ class ItemAbilityCooldown { ItemAbility.GYROKINETIC_WAND_LEFT.sound() } if (event.pitch == 1f && event.volume == 1f) { - val internalName = InventoryUtils.getItemInHand()?.getInternalName() ?: return + val internalName = InventoryUtils.getItemInHand()?.getInternalName_old() ?: return if (!internalName.equalsOneOf("SHADOW_FURY", "STARRED_SHADOW_FURY")) return ItemAbility.SHADOW_FURY.sound() @@ -154,7 +154,7 @@ class ItemAbilityCooldown { private fun handleItemClick(itemInHand: ItemStack?) { if (!LorenzUtils.inSkyBlock) return - itemInHand?.getInternalName()?.run { + itemInHand?.getInternalName_old()?.run { ItemAbility.getByInternalName(this)?.setItemClick() } } @@ -318,7 +318,7 @@ class ItemAbilityCooldown { private fun hasAbility(stack: ItemStack): MutableList<ItemAbility> { val itemName: String = stack.cleanName() - val internalName = stack.getInternalName() + val internalName = stack.getInternalName_old() val list = mutableListOf<ItemAbility>() for (ability in ItemAbility.entries) { |