Fix custom ingredients

2 files changed, 51 insertions, 0 deletions

diff --git a/neoforge/src/main/java/me/shedaniel/rei/forge/PlatformAdapterImpl.java b/neoforge/src/main/java/me/shedaniel/rei/forge/PlatformAdapterImpl.java
new file mode 100644
index 000000000..4bc160624
--- /dev/null
+++ b/neoforge/src/main/java/me/shedaniel/rei/forge/PlatformAdapterImpl.java
@@ -0,0 +1,50 @@
+/*
+ * This file is licensed under the MIT License, part of Roughly Enough Items.
+ * Copyright (c) 2018, 2019, 2020, 2021, 2022, 2023 shedaniel
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package me.shedaniel.rei.forge;
+
+import me.shedaniel.rei.api.common.entry.EntryIngredient;
+import me.shedaniel.rei.api.common.entry.EntryStack;
+import me.shedaniel.rei.api.common.util.EntryIngredients;
+import me.shedaniel.rei.api.common.util.EntryStacks;
+import me.shedaniel.rei.impl.init.PlatformAdapter;
+import net.minecraft.world.item.crafting.Ingredient;
+
+public class PlatformAdapterImpl implements PlatformAdapter {
+    @Override
+    public EntryIngredient fromIngredient(Ingredient ingredient) {
+        if (ingredient.isEmpty()) return EntryIngredient.empty();
+        if (ingredient.isCustom()) {
+            EntryIngredient.Builder result = EntryIngredient.builder();
+            ingredient.items().forEach(item -> {
+                EntryStack<?> stack = EntryStacks.ofItemHolder(item);
+                if (!stack.isEmpty()) {
+                    result.add(stack);
+                }
+            });
+            return result.build();
+        } else {
+            return EntryIngredients.ofItemsHolderSet(ingredient.values);
+        }
+    }
+}
diff --git a/neoforge/src/main/resources/META-INF/services/me.shedaniel.rei.impl.init.PlatformAdapter b/neoforge/src/main/resources/META-INF/services/me.shedaniel.rei.impl.init.PlatformAdapter
new file mode 100644
index 000000000..62ad2e5b3
--- /dev/null
+++ b/neoforge/src/main/resources/META-INF/services/me.shedaniel.rei.impl.init.PlatformAdapter
@@ -0,0 +1 @@
+me.shedaniel.rei.forge.PlatformAdapterImpl
\ No newline at end of file