From fcd404d862b4b051474898076fcc06b406d1ea91 Mon Sep 17 00:00:00 2001 From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> Date: Sun, 7 Apr 2024 21:36:08 +1000 Subject: Backend: Remove a lot of deprecated code (#1371) Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com> --- .../features/garden/composter/ComposterOverlay.kt | 20 +++++++++----------- .../garden/farming/GardenCropMilestoneDisplay.kt | 13 +++++++------ .../features/garden/fortuneguide/FortuneUpgrade.kt | 1 + .../features/garden/fortuneguide/FortuneUpgrades.kt | 5 +++-- .../garden/fortuneguide/pages/UpgradePage.kt | 9 +++++---- .../garden/visitor/GardenVisitorDropStatistics.kt | 14 +++++++------- 6 files changed, 32 insertions(+), 30 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features/garden') diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt index 171aa503d..0d0494bf9 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt @@ -44,7 +44,6 @@ import at.hannibal2.skyhanni.utils.SimpleTimeMark import at.hannibal2.skyhanni.utils.SoundUtils import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher import at.hannibal2.skyhanni.utils.StringUtils.removeColor -import at.hannibal2.skyhanni.utils.TimeUtils import at.hannibal2.skyhanni.utils.TimeUtils.format import at.hannibal2.skyhanni.utils.renderables.Renderable import net.minecraftforge.fml.common.eventhandler.EventPriority @@ -54,7 +53,6 @@ import kotlin.math.ceil import kotlin.math.floor import kotlin.time.Duration import kotlin.time.Duration.Companion.milliseconds -import kotlin.time.DurationUnit object ComposterOverlay { @@ -320,20 +318,20 @@ object ComposterOverlay { list.add(fuelItem.getItemStack()) newList.add(list) - val timePerCompost = ComposterAPI.timePerCompost(null).toLong(DurationUnit.MILLISECONDS) + val timePerCompost = ComposterAPI.timePerCompost(null) val upgrade = if (maxLevel) null else extraComposterUpgrade - val timePerCompostPreview = ComposterAPI.timePerCompost(upgrade).toLong(DurationUnit.MILLISECONDS) - val format = TimeUtils.formatDuration(timePerCompost) + val timePerCompostPreview = ComposterAPI.timePerCompost(upgrade) + val format = timePerCompost.format() val formatPreview = - if (timePerCompostPreview != timePerCompost) " §c➜ §b" + TimeUtils.formatDuration(timePerCompostPreview) else "" + if (timePerCompostPreview != timePerCompost) " §c➜ §b" + timePerCompostPreview.format() else "" newList.addAsSingletonList(" §7Time per Compost: §b$format$formatPreview") val timeText = currentTimeType.display.lowercase() val timeMultiplier = if (currentTimeType != TimeType.COMPOST) { - (currentTimeType.multiplier * 1000 / (timePerCompost.toDouble())) + (currentTimeType.multiplier * 1000.0 / (timePerCompost.inWholeMilliseconds)) } else 1.0 val timeMultiplierPreview = if (currentTimeType != TimeType.COMPOST) { - (currentTimeType.multiplier * 1000 / (timePerCompostPreview.toDouble())) + (currentTimeType.multiplier * 1000.0 / (timePerCompostPreview.inWholeMilliseconds)) } else 1.0 val multiDropFactor = ComposterAPI.multiDropChance(null) + 1 @@ -491,8 +489,7 @@ object ComposterOverlay { return } - val havingInSacks = internalName.getAmountInSacksOrNull() - if (havingInSacks == null) { + val havingInSacks = internalName.getAmountInSacksOrNull() ?: run { ChatUtils.sendCommandToServer("gfs ${internalName.asString()} ${itemsNeeded - havingInInventory}") // TODO Add sack type repo data @@ -504,7 +501,8 @@ object ComposterOverlay { "sax" ) return - } else if (havingInSacks == 0L) { + } + if (havingInSacks == 0) { SoundUtils.playErrorSound() if (LorenzUtils.noTradeMode) { ChatUtils.chat("No $itemName §efound in sacks.") diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt index eec532ed1..112fce914 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt @@ -25,6 +25,7 @@ import at.hannibal2.skyhanni.utils.ConditionalUtils import at.hannibal2.skyhanni.utils.ConfigUtils import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.round +import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems import at.hannibal2.skyhanni.utils.SoundUtils import at.hannibal2.skyhanni.utils.TimeUnit @@ -162,11 +163,11 @@ object GardenCropMilestoneDisplay { } lineMap[2] = if (crop.isMaxed()) { - val haveFormat = LorenzUtils.formatInteger(counter) + val haveFormat = counter.addSeparators() Collections.singletonList("§7Counter: §e$haveFormat") } else { - val haveFormat = LorenzUtils.formatInteger(have) - val needFormat = LorenzUtils.formatInteger(need) + val haveFormat = have.addSeparators() + val needFormat = need.addSeparators() Collections.singletonList("§e$haveFormat§8/§e$needFormat") } @@ -194,7 +195,7 @@ object GardenCropMilestoneDisplay { } } - val format = LorenzUtils.formatInteger(farmingFortuneSpeed * 60) + val format = (farmingFortuneSpeed * 60).addSeparators() lineMap[4] = Collections.singletonList("§7Crops/Minute§8: §e$format") val formatBps = LorenzUtils.formatDouble(speed, config.blocksBrokenPrecision) lineMap[5] = Collections.singletonList("§7Blocks/Second§8: §e$formatBps") @@ -266,8 +267,8 @@ object GardenCropMilestoneDisplay { val have = counter - cropsForCurrentTier val need = cropsForNextTier - cropsForCurrentTier - val haveFormat = LorenzUtils.formatInteger(have) - val needFormat = LorenzUtils.formatInteger(need) + val haveFormat = have.addSeparators() + val needFormat = need.addSeparators() val missing = need - have diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrade.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrade.kt index e503dfc82..43b0c37d3 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrade.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrade.kt @@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.features.garden.fortuneguide data class FortuneUpgrade( val description: String, val costCopper: Int?, + //todo make into NEUInternalName val requiredItem: String, val itemQuantity: Int, val fortuneIncrease: Double, diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrades.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrades.kt index 2d33fd9b1..5abc89f80 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrades.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrades.kt @@ -14,7 +14,8 @@ import at.hannibal2.skyhanni.features.garden.fortuneguide.FFGuideGUI.Companion.g import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName import at.hannibal2.skyhanni.utils.ItemUtils.getItemRarityOrCommon import at.hannibal2.skyhanni.utils.ItemUtils.itemName -import at.hannibal2.skyhanni.utils.NEUItems +import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName +import at.hannibal2.skyhanni.utils.NEUItems.getPrice import at.hannibal2.skyhanni.utils.NumberUtil.addSuffix import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getEnchantments import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getFarmingForDummiesCount @@ -63,7 +64,7 @@ object FortuneUpgrades { // todo fix NEU price data not being loaded if run too early private fun MutableList.populateAndSort(style: Int) { this.map { upgrade -> - val cost = (NEUItems.getPrice(upgrade.requiredItem) * (upgrade.itemQuantity)).toInt() + val cost = (upgrade.requiredItem.asInternalName().getPrice() * upgrade.itemQuantity).toInt() upgrade.cost = cost upgrade.costPerFF = (cost / upgrade.fortuneIncrease).toInt() } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/UpgradePage.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/UpgradePage.kt index 5818566eb..e8134a337 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/UpgradePage.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/UpgradePage.kt @@ -4,8 +4,9 @@ import at.hannibal2.skyhanni.features.garden.fortuneguide.FFGuideGUI import at.hannibal2.skyhanni.features.garden.fortuneguide.FortuneUpgrades import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarApi import at.hannibal2.skyhanni.utils.GuiRenderUtils -import at.hannibal2.skyhanni.utils.ItemUtils.nameWithEnchantment -import at.hannibal2.skyhanni.utils.NEUItems +import at.hannibal2.skyhanni.utils.ItemUtils.itemName +import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName +import at.hannibal2.skyhanni.utils.NEUItems.getItemStack import at.hannibal2.skyhanni.utils.NumberUtil import net.minecraft.client.renderer.GlStateManager import net.minecraft.util.MathHelper @@ -56,8 +57,8 @@ class UpgradePage : FFGuideGUI.FFGuidePage() { for ((index, upgrade) in upgradeList.withIndex()) { if (adjustedY + 25 * index < FFGuideGUI.guiTop + 20) continue if (adjustedY + 25 * index > FFGuideGUI.guiTop + 160) continue - val upgradeItem = upgrade.requiredItem.let { NEUItems.getItemStack(it) } - var formattedUpgrade = upgradeItem.nameWithEnchantment ?: return + val upgradeItem = upgrade.requiredItem.asInternalName().getItemStack() + var formattedUpgrade = upgradeItem.itemName if (adjustedY + 25 * index - 5 < FFGuideGUI.lastClickedHeight && FFGuideGUI.lastClickedHeight < adjustedY + 25 * index + 10) { FFGuideGUI.lastClickedHeight = 0 BazaarApi.searchForBazaarItem(formattedUpgrade, upgrade.itemQuantity) diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt index 6639f42da..2031a2ff1 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt @@ -20,7 +20,7 @@ import at.hannibal2.skyhanni.utils.ConfigUtils import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.NumberUtil import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators -import at.hannibal2.skyhanni.utils.NumberUtil.formatNumber +import at.hannibal2.skyhanni.utils.NumberUtil.formatInt import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher import at.hannibal2.skyhanni.utils.StringUtils.removeColor @@ -107,33 +107,33 @@ object GardenVisitorDropStatistics { val storage = GardenAPI.storage?.visitorDrops ?: return copperPattern.matchMatcher(message) { - val amount = group("amount").formatNumber().toInt() + val amount = group("amount").formatInt() storage.copper += amount saveAndUpdate() } farmingExpPattern.matchMatcher(message) { - val amount = group("amount").formatNumber() + val amount = group("amount").formatInt() storage.farmingExp += amount saveAndUpdate() } gardenExpPattern.matchMatcher(message) { - val amount = group("amount").formatNumber().toInt() + val amount = group("amount").formatInt() if (amount > 80) return // some of the low visitor milestones will get through but will be minimal storage.gardenExp += amount saveAndUpdate() } bitsPattern.matchMatcher(message) { - val amount = group("amount").formatNumber().toInt() + val amount = group("amount").formatInt() storage.bits += amount saveAndUpdate() } mithrilPowderPattern.matchMatcher(message) { - val amount = group("amount").formatNumber().toInt() + val amount = group("amount").formatInt() storage.mithrilPowder += amount saveAndUpdate() } gemstonePowderPattern.matchMatcher(message) { - val amount = group("amount").formatNumber().toInt() + val amount = group("amount").formatInt() storage.gemstonePowder += amount saveAndUpdate() } -- cgit