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 | |
| 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')
44 files changed, 140 insertions, 129 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt index a989d60d1..783f79f49 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt @@ -3,7 +3,7 @@ package at.hannibal2.skyhanni.features.bazaar import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.* import at.hannibal2.skyhanni.utils.* -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.name import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName @@ -23,7 +23,7 @@ class BazaarApi { private var currentSearchedItem = "" fun getBazaarDataByName(name: String): BazaarData? = - NEUItems.getInternalNameOrNull(name)?.let { getBazaarDataByInternalName(it) } + NEUItems.getRawInternalNameOrNull(name)?.let { getBazaarDataByInternalName(it) } fun getBazaarDataByInternalName(internalName: String) = internalName.asInternalName().getBazaarData() @@ -31,7 +31,7 @@ class BazaarApi { holder.getData(this) } else null - fun isBazaarItem(stack: ItemStack) = isBazaarItem(stack.getInternalName()) + fun isBazaarItem(stack: ItemStack) = isBazaarItem(stack.getInternalName_old()) fun NEUInternalName.isBazaarItem() = NEUItems.manager.auctionManager.getBazaarInfo(asString()) != null diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt index a2106bf15..e37d14df8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt @@ -2,7 +2,7 @@ package at.hannibal2.skyhanni.features.bazaar import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.InventoryCloseEvent -import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName +import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_old import at.hannibal2.skyhanni.utils.ItemUtils.nameWithEnchantment import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.NEUItems @@ -39,14 +39,14 @@ class BazaarBestSellMethod { if (buyInstantly == null || buyInstantly.displayName != "§aBuy Instantly") return "" val bazaarItem = inv.getStackInSlot(13) ?: return "" - val internalName = NEUItems.getInternalNameOrNull(bazaarItem.displayName) ?: return "" + val internalName = NEUItems.getRawInternalNameOrNull(bazaarItem.displayName) ?: return "" var having = 0 for (slot in chest.inventorySlots) { if (slot == null) continue if (slot.slotNumber == slot.slotIndex) continue val stack = slot.stack ?: continue - if (internalName == stack.getInternalName()) { + if (internalName == stack.getInternalName_old()) { having += stack.stackSize } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt index 211fd94e5..ae956f2d8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt @@ -3,7 +3,7 @@ package at.hannibal2.skyhanni.features.bingo import at.hannibal2.skyhanni.SkyHanniMod 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.name import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.NEUItems @@ -90,7 +90,7 @@ class MinionCraftHelper { for (item in mainInventory) { val name = item?.name?.removeColor() ?: continue - val rawId = item.getInternalName() + val rawId = item.getInternalName_old() if (isMinionName(name)) { minions[name] = rawId } @@ -101,7 +101,7 @@ class MinionCraftHelper { for (item in mainInventory) { val name = item?.name?.removeColor() ?: continue - val rawId = item.getInternalName() + val rawId = item.getInternalName_old() if (!isMinionName(name)) { if (!allIngredients.contains(rawId)) continue if (!isAllowed(allMinions, rawId)) continue @@ -269,7 +269,7 @@ class MinionCraftHelper { val name = b.name ?: continue if (!name.startsWith("§e")) continue - val internalName = NEUItems.getInternalName("$name I").replace("MINION", "GENERATOR").replace(";", "_") + val internalName = NEUItems.getRawInternalName("$name I").replace("MINION", "GENERATOR").replace(";", "_") if (!tierOneMinionsDone.contains(internalName)) { tierOneMinionsDone.add(internalName) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/nextstep/CollectionStep.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/nextstep/CollectionStep.kt index 892bedcd1..bfa081288 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/nextstep/CollectionStep.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/nextstep/CollectionStep.kt @@ -5,5 +5,5 @@ import at.hannibal2.skyhanni.utils.NumberUtil class CollectionStep(collectionName: String, amountNeeded: Int) : ProgressionStep(NumberUtil.format(amountNeeded) + " $collectionName Collection", amountNeeded.toLong()) { - val internalName = NEUItems.getInternalName_new(collectionName) + val internalName = NEUItems.getInternalName(collectionName) }
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt index f8bf9943d..0b7097091 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt @@ -4,7 +4,7 @@ import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.IslandType import at.hannibal2.skyhanni.events.* import at.hannibal2.skyhanni.utils.BlockUtils.getBlockAt -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.LorenzVec import at.hannibal2.skyhanni.utils.toLorenzVec @@ -183,7 +183,7 @@ class GriffinBurrowParticleFinder { } private val ItemStack.isSpade - get() = this.getInternalName() == "ANCESTRAL_SPADE" + get() = getInternalName_old() == "ANCESTRAL_SPADE" class Burrow( var location: LorenzVec, diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishFillet.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishFillet.kt index 69c65aa15..18dfc5d7d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishFillet.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishFillet.kt @@ -2,7 +2,7 @@ package at.hannibal2.skyhanni.features.fishing.trophy import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.LorenzToolTipEvent -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.NEUItems import at.hannibal2.skyhanni.utils.NumberUtil @@ -16,7 +16,7 @@ class TrophyFishFillet { fun onTooltip(event: LorenzToolTipEvent) { if (!isEnabled()) return if (event.slot.inventory.name.contains("Sack")) return - val internalName = event.itemStack.getInternalName() + val internalName = event.itemStack.getInternalName_old() val trophyFishName = internalName.substringBeforeLast("_") .replace("_", "").lowercase() val trophyRarityName = internalName.substringAfterLast("_") diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt index 1a761f0ae..20b9cacdb 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt @@ -6,7 +6,7 @@ import at.hannibal2.skyhanni.events.InventoryCloseEvent import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent import at.hannibal2.skyhanni.features.garden.visitor.GardenVisitorFeatures import at.hannibal2.skyhanni.utils.ItemUtils -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 @@ -76,9 +76,9 @@ class AnitaMedalProfit { val (name, amount) = ItemUtils.readItemAmount(itemName) if (name == null) return - var internalName = NEUItems.getInternalNameOrNull(name) + var internalName = NEUItems.getRawInternalNameOrNull(name) if (internalName == null) { - internalName = item.getInternalName() + internalName = item.getInternalName_old() } val itemPrice = NEUItems.getPrice(internalName) * amount @@ -105,7 +105,7 @@ class AnitaMedalProfit { val bronze = medal.factorBronze * amount bronze * jacobTicketPrice } else { - val internalName = NEUItems.getInternalName(name) + val internalName = NEUItems.getRawInternalName(name) NEUItems.getPrice(internalName) * amount } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt index 8465ded13..4b64ce4fc 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt @@ -9,7 +9,7 @@ import at.hannibal2.skyhanni.events.* import at.hannibal2.skyhanni.features.garden.CropType.Companion.getTurboCrop import at.hannibal2.skyhanni.features.garden.GardenAPI.addCropIcon import at.hannibal2.skyhanni.features.garden.GardenAPI.getCropType -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.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList @@ -158,7 +158,7 @@ class FarmingFortuneDisplay { var greenThumbFortune = 0.0 fun getToolFortune(tool: ItemStack?): Double { - val internalName = tool?.getInternalName() ?: return 0.0 + val internalName = tool?.getInternalName_old() ?: return 0.0 if (internalName == "THEORETICAL_HOE") { return 0.0 } @@ -212,7 +212,7 @@ class FarmingFortuneDisplay { val armorAbilityFortune = "§7.*§7Grants §6(?<bonus>.*)☘.*".toPattern() var pieces = 0 for (line in item?.getLore()!!) { - if (item.getInternalName().contains("LOTUS")) { + if (item.getInternalName_old().contains("LOTUS")) { lotusAbilityPattern.matchMatcher(line) { return group("bonus").toDouble() } @@ -239,9 +239,9 @@ class FarmingFortuneDisplay { displayedFortune = match[1]!!.value.toDouble() reforgeFortune = match[2]?.value?.toDouble() ?: 0.0 - itemBaseFortune = if (tool.getInternalName().contains("LOTUS")) 5.0 + itemBaseFortune = if (tool.getInternalName_old().contains("LOTUS")) 5.0 else displayedFortune - reforgeFortune - enchantmentFortune - (tool.getFarmingForDummiesCount() ?: 0 ) * 1.0 - greenThumbFortune = if (tool.getInternalName().contains("LOTUS")) { + greenThumbFortune = if (tool.getInternalName_old().contains("LOTUS")) { displayedFortune - reforgeFortune - itemBaseFortune } else 0.0 } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt index 64952a625..083770c6f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt @@ -12,7 +12,7 @@ import at.hannibal2.skyhanni.features.garden.farming.GardenCropSpeed import at.hannibal2.skyhanni.features.garden.inventory.SkyMartCopperPrice import at.hannibal2.skyhanni.utils.BlockUtils.isBabyCrop import at.hannibal2.skyhanni.utils.InventoryUtils -import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName +import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_old import at.hannibal2.skyhanni.utils.LocationUtils.isPlayerInside import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzVec @@ -103,7 +103,7 @@ object GardenAPI { private fun getToolInHand(toolItem: ItemStack?, crop: CropType?): String? { if (crop != null) return crop.cropName - val internalName = toolItem?.getInternalName() ?: return null + val internalName = toolItem?.getInternalName_old() ?: return null return if (isOtherTool(internalName)) internalName else null } @@ -126,7 +126,7 @@ object GardenAPI { fun inGarden() = LorenzUtils.inSkyBlock && LorenzUtils.skyBlockIsland == IslandType.GARDEN fun ItemStack.getCropType(): CropType? { - val internalName = getInternalName() + val internalName = getInternalName_old() return CropType.entries.firstOrNull { internalName.startsWith(it.toolName) } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/ToolTooltipTweaks.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/ToolTooltipTweaks.kt index 4e578e6f7..c9350e6c8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/ToolTooltipTweaks.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/ToolTooltipTweaks.kt @@ -5,7 +5,7 @@ import at.hannibal2.skyhanni.events.LorenzToolTipEvent import at.hannibal2.skyhanni.features.garden.FarmingFortuneDisplay.Companion.getAbilityFortune import at.hannibal2.skyhanni.features.garden.GardenAPI.getCropType import at.hannibal2.skyhanni.features.garden.fortuneguide.FFGuideGUI -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.SkyBlockItemModifierUtils.getFarmingForDummiesCount import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getReforgeName @@ -139,7 +139,7 @@ class ToolTooltipTweaks { } // Fixing a hypixel bug. TODO remove once hypixel fixes it. - if (itemStack.getInternalName().contains("LOTUS")) { + if (itemStack.getInternalName_old().contains("LOTUS")) { event.toolTip.replaceAll { it.replace("Kills:", "Visitors:") } } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/GardenComposterInventoryFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/GardenComposterInventoryFeatures.kt index 67e6f0197..287c1d4bb 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/GardenComposterInventoryFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/GardenComposterInventoryFeatures.kt @@ -44,10 +44,12 @@ class GardenComposterInventoryFeatures { LorenzUtils.error("§c[SkyHanni] Could not read item '$line'") continue } - val internalName = NEUItems.getInternalNameOrNull(itemName) + val internalName = NEUItems.getRawInternalNameOrNull(itemName) if (internalName == null) { - LorenzUtils.chat("§c[SkyHanni] Error reading internal name for item '$itemName§c' " + - "(in GardenComposterInventoryFeatures)") + LorenzUtils.chat( + "§c[SkyHanni] Error reading internal name for item '$itemName§c' " + + "(in GardenComposterInventoryFeatures)" + ) continue } val lowestBin = NEUItems.getPrice(internalName) diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt index 1adbdf498..512610b2e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt @@ -14,7 +14,7 @@ import at.hannibal2.skyhanni.features.garden.GardenNextJacobContest import at.hannibal2.skyhanni.features.garden.farming.GardenCropSpeed.getSpeed import at.hannibal2.skyhanni.features.garden.farming.GardenCropSpeed.isSpeedDataEmpty import at.hannibal2.skyhanni.utils.InventoryUtils -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.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList @@ -130,7 +130,7 @@ object CropMoneyDisplay { extraMushroomCowPerkCoins = perSecond * 60 * 60 } - if (InventoryUtils.getItemInHand()?.getInternalName() + if (InventoryUtils.getItemInHand()?.getInternalName_old() ?.contains("DICER") == true && config.moneyPerHourDicer ) { var dicerDrops = 0.0 diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingArmorDrops.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingArmorDrops.kt index ea685338f..63d1a39a9 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingArmorDrops.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingArmorDrops.kt @@ -4,7 +4,7 @@ import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.* import at.hannibal2.skyhanni.features.garden.GardenAPI import at.hannibal2.skyhanni.utils.InventoryUtils -import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName +import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_old import at.hannibal2.skyhanni.utils.LorenzUtils.sortedDesc import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings @@ -102,7 +102,7 @@ class FarmingArmorDrops { private fun checkArmor() { val armorPieces = InventoryUtils.getArmor() - .mapNotNull { it?.getInternalName() } + .mapNotNull { it?.getInternalName_old() } .count { armorPattern.matcher(it).matches() } hasArmor = armorPieces > 1 } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt index b7c019475..c6ecce63c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt @@ -12,7 +12,7 @@ import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.features.garden.CropType import at.hannibal2.skyhanni.features.garden.GardenAPI import at.hannibal2.skyhanni.utils.InventoryUtils -import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName +import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_old import at.hannibal2.skyhanni.utils.LorenzUtils import com.google.gson.JsonObject import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @@ -101,7 +101,7 @@ object GardenCropSpeed { } else 0.0 GardenAPI.getCurrentlyFarmedCrop()?.let { val heldTool = InventoryUtils.getItemInHand() - val toolName = heldTool?.getInternalName() + val toolName = heldTool?.getInternalName_old() if (toolName?.contains("DICER") == true) { val lastCrop = lastBrokenCrop?.cropName?.lowercase() ?: "NONE" if (toolName.lowercase().contains(lastCrop)) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farmin |
