1 files changed, 3 insertions, 24 deletions
diff --git a/src/main/kotlin/moe/nea/notenoughupdates/recipes/SBCraftingRecipe.kt b/src/main/kotlin/moe/nea/notenoughupdates/recipes/SBCraftingRecipe.kt
index 12bc1d3..9d7e9cc 100644
--- a/src/main/kotlin/moe/nea/notenoughupdates/recipes/SBCraftingRecipe.kt
+++ b/src/main/kotlin/moe/nea/notenoughupdates/recipes/SBCraftingRecipe.kt
@@ -2,7 +2,6 @@ package moe.nea.notenoughupdates.recipes
 
 import io.github.moulberry.repo.data.NEUCraftingRecipe
 import io.github.moulberry.repo.data.NEUIngredient
-import io.github.moulberry.repo.data.NEURecipe
 import me.shedaniel.math.Point
 import me.shedaniel.math.Rectangle
 import me.shedaniel.rei.api.client.gui.Renderer
@@ -10,31 +9,11 @@ import me.shedaniel.rei.api.client.gui.widgets.Widget
 import me.shedaniel.rei.api.client.gui.widgets.Widgets
 import me.shedaniel.rei.api.client.registry.display.DisplayCategory
 import me.shedaniel.rei.api.common.category.CategoryIdentifier
-import me.shedaniel.rei.api.common.display.Display
-import me.shedaniel.rei.api.common.entry.EntryIngredient
 import me.shedaniel.rei.api.common.util.EntryStacks
 import net.minecraft.block.Blocks
 import net.minecraft.text.Text
 import moe.nea.notenoughupdates.NotEnoughUpdates
 import moe.nea.notenoughupdates.rei.SBItemEntryDefinition
-import moe.nea.notenoughupdates.util.SkyblockId
-
-abstract class SBRecipe() : Display {
-    abstract val neuRecipe: NEURecipe
-    override fun getInputEntries(): List<EntryIngredient> {
-        return neuRecipe.allInputs.map {
-            val entryStack = SBItemEntryDefinition.getEntry(SkyblockId(it.itemId))
-            EntryIngredient.of(entryStack)
-        }
-    }
-
-    override fun getOutputEntries(): List<EntryIngredient> {
-        return neuRecipe.allOutputs.map {
-            val entryStack = SBItemEntryDefinition.getEntry(SkyblockId(it.itemId))
-            EntryIngredient.of(entryStack)
-        }
-    }
-}
 
 class SBCraftingRecipe(override val neuRecipe: NEUCraftingRecipe) : SBRecipe() {
     override fun getCategoryIdentifier(): CategoryIdentifier<*> = Category.catIdentifier
@@ -57,13 +36,13 @@ class SBCraftingRecipe(override val neuRecipe: NEUCraftingRecipe) : SBRecipe() {
                         val slot = Widgets.createSlot(Point(point.x + 1 + i * 18, point.y + 1 + j * 18)).markInput()
                         add(slot)
                         val item = display.neuRecipe.inputs[i + j * 3]
-                        if (item == null || item == NEUIngredient.SENTINEL_EMPTY) continue
-                        slot.entry(SBItemEntryDefinition.getEntry(SkyblockId(item.itemId))) // TODO: make use of stackable item entries
+                        if (item == NEUIngredient.SENTINEL_EMPTY) continue
+                        slot.entry(SBItemEntryDefinition.getEntry(item)) // TODO: make use of stackable item entries
                     }
                 }
                 add(
                     Widgets.createSlot(Point(point.x + 95, point.y + 19))
-                        .entry(SBItemEntryDefinition.getEntry(SkyblockId(display.neuRecipe.output.itemId)))
+                        .entry(SBItemEntryDefinition.getEntry(display.neuRecipe.output))
                         .disableBackground().markOutput()
                 )
             }