summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/minion
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-02-24 17:28:33 +0100
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-02-24 17:28:33 +0100
commit2567f766c7ec5df02adcabfacd02974c83c9c72a (patch)
tree5d8c304da55940429b2361cec264220261ea3763 /src/main/java/at/hannibal2/skyhanni/features/minion
parent0ef18631efce1a17b7397e3fcf835b11b9cfad9b (diff)
downloadskyhanni-2567f766c7ec5df02adcabfacd02974c83c9c72a.tar.gz
skyhanni-2567f766c7ec5df02adcabfacd02974c83c9c72a.tar.bz2
skyhanni-2567f766c7ec5df02adcabfacd02974c83c9c72a.zip
Used new neu method.
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/minion')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/minion/MinionCraftHelper.kt13
1 files changed, 5 insertions, 8 deletions
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<NeuRecipe> = NotEnoughUpdates.INSTANCE.manager.getAvailableUsagesFor(minionId)
+ val recipes: List<NeuRecipe> = 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(" ")