From f5408ce8c85dda2bccbe78d8d2a505acc69aa9a0 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Tue, 25 Feb 2025 19:20:09 +0800 Subject: Fix custom ingredients --- .../shedaniel/rei/fabric/PlatformAdapterImpl.java | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 fabric/src/main/java/me/shedaniel/rei/fabric/PlatformAdapterImpl.java (limited to 'fabric/src/main/java') diff --git a/fabric/src/main/java/me/shedaniel/rei/fabric/PlatformAdapterImpl.java b/fabric/src/main/java/me/shedaniel/rei/fabric/PlatformAdapterImpl.java new file mode 100644 index 000000000..7a5ceef59 --- /dev/null +++ b/fabric/src/main/java/me/shedaniel/rei/fabric/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.fabric; + +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.getCustomIngredient() != null) { + 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); + } + } +} -- cgit