From 2567f766c7ec5df02adcabfacd02974c83c9c72a Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Fri, 24 Feb 2023 17:28:33 +0100 Subject: Used new neu method. --- .../hannibal2/skyhanni/features/minion/MinionCraftHelper.kt | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features/minion') diff --git a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionCraftHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionCraftHelper.kt index 898c7f34c..742a665f9 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionCraftHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionCraftHelper.kt @@ -1,12 +1,13 @@ package at.hannibal2.skyhanni.features.minion import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName import at.hannibal2.skyhanni.utils.ItemUtils.name import at.hannibal2.skyhanni.utils.LorenzUtils +import at.hannibal2.skyhanni.utils.NEUItems import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimal import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings import at.hannibal2.skyhanni.utils.StringUtils.removeColor -import io.github.moulberry.notenoughupdates.NotEnoughUpdates import io.github.moulberry.notenoughupdates.recipes.CraftingRecipe import io.github.moulberry.notenoughupdates.recipes.NeuRecipe import net.minecraft.client.Minecraft @@ -49,9 +50,7 @@ class MinionCraftHelper { for (item in mainInventory) { val name = item?.name?.removeColor() ?: continue - val rawId = NotEnoughUpdates.INSTANCE.manager.createItemResolutionQuery() - .withItemStack(item) - .resolveInternalName() ?: continue + val rawId = item.getInternalName() if (name.contains(" Minion ")) { minions[name] = rawId } else { @@ -79,7 +78,7 @@ class MinionCraftHelper { ) { val nextNumber = minionNumber + 1 display.add("$minionName Minion $minionNumber -> $nextNumber") - val recipes: List = NotEnoughUpdates.INSTANCE.manager.getAvailableUsagesFor(minionId) + val recipes: List = NEUItems.manager.getAvailableUsagesFor(minionId) for (recipe in recipes) { if (recipe !is CraftingRecipe) continue val output = recipe.output @@ -100,9 +99,7 @@ class MinionCraftHelper { val needAmount = need * multiplier val have = otherItems.getOrDefault(itemId, 0) val percentage = have.toDouble() / needAmount - val itemName = NotEnoughUpdates.INSTANCE.manager.createItemResolutionQuery() - .withKnownInternalName(rawId) - .resolveToItemStack()?.name ?: "§cName??§f" + val itemName = NEUItems.getItemStack(rawId).name ?: "§cName??§f" if (percentage >= 1) { display.add(" $itemName§8: §aDONE") display.add(" ") -- cgit