diff options
author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-02-24 17:28:33 +0100 |
---|---|---|
committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-02-24 17:28:33 +0100 |
commit | 2567f766c7ec5df02adcabfacd02974c83c9c72a (patch) | |
tree | 5d8c304da55940429b2361cec264220261ea3763 /src/main/java/at/hannibal2/skyhanni/features/garden | |
parent | 0ef18631efce1a17b7397e3fcf835b11b9cfad9b (diff) | |
download | skyhanni-2567f766c7ec5df02adcabfacd02974c83c9c72a.tar.gz skyhanni-2567f766c7ec5df02adcabfacd02974c83c9c72a.tar.bz2 skyhanni-2567f766c7ec5df02adcabfacd02974c83c9c72a.zip |
Used new neu method.
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/garden')
3 files changed, 4 insertions, 11 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextPlotPrice.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextPlotPrice.kt index 0612faaf7..096683798 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextPlotPrice.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextPlotPrice.kt @@ -4,7 +4,6 @@ import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.IslandType import at.hannibal2.skyhanni.utils.* import at.hannibal2.skyhanni.utils.ItemUtils.name -import io.github.moulberry.notenoughupdates.NotEnoughUpdates import net.minecraftforge.event.entity.player.ItemTooltipEvent import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @@ -34,9 +33,7 @@ class GardenNextPlotPrice { if (next) { val (itemName, amount) = ItemUtils.readItemAmount(line) if (itemName != null) { - val internalName = NEUItems.getInternalNameByName(itemName) - val auctionManager = NotEnoughUpdates.INSTANCE.manager.auctionManager - val lowestBin = auctionManager.getBazaarOrBin(internalName, false) + val lowestBin = NEUItems.getPrice(NEUItems.getInternalName(itemName)) val price = lowestBin * amount val format = NumberUtil.format(price) list[i] = list[i] + " §f(§6$format§f)" diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenVisitorFeatures.kt index b20c699cd..3f3784951 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenVisitorFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenVisitorFeatures.kt @@ -10,7 +10,6 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.ItemUtils.name import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings import at.hannibal2.skyhanni.utils.StringUtils.removeColor -import io.github.moulberry.notenoughupdates.NotEnoughUpdates import net.minecraft.client.Minecraft import net.minecraft.entity.EntityLivingBase import net.minecraft.network.play.client.C02PacketUseEntity @@ -126,9 +125,7 @@ class GardenVisitorFeatures { if (i > 1) { val (itemName, amount) = ItemUtils.readItemAmount(line) if (itemName != null) { - val internalName = NEUItems.getInternalNameByName(itemName) - val auctionManager = NotEnoughUpdates.INSTANCE.manager.auctionManager - val lowestBin = auctionManager.getBazaarOrBin(internalName, false) + val lowestBin = NEUItems.getPrice(NEUItems.getInternalName(itemName)) val price = lowestBin * amount totalPrice += price val format = NumberUtil.format(price) diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/SkyMartBestProfit.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/SkyMartBestProfit.kt index 83d46e1ff..2623b63a3 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/SkyMartBestProfit.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/SkyMartBestProfit.kt @@ -9,10 +9,10 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.ItemUtils.name import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.sortedDesc +import at.hannibal2.skyhanni.utils.NEUItems import at.hannibal2.skyhanni.utils.NumberUtil import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings import at.hannibal2.skyhanni.utils.StringUtils.removeColor -import io.github.moulberry.notenoughupdates.NotEnoughUpdates import net.minecraft.client.Minecraft import net.minecraftforge.client.event.GuiScreenEvent import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @@ -33,14 +33,13 @@ class SkyMartBestProfit { val priceMap = mutableMapOf<Pair<String, String>, Double>() - val auctionManager = NotEnoughUpdates.INSTANCE.manager.auctionManager for (stack in inventory.items.values) { for (line in stack.getLore()) { val matcher = pattern.matcher(line) if (!matcher.matches()) continue val internalName = stack.getInternalName() - val lowestBin = auctionManager.getBazaarOrBin(internalName, false) + val lowestBin = NEUItems.getPrice(internalName) if (lowestBin == -1.0) continue val amount = matcher.group(1).replace(",", "").toInt() |