From 5f61d89501a4eadd99c805c973b1ef49a3a3aaee Mon Sep 17 00:00:00 2001 From: shedaniel Date: Tue, 16 Apr 2024 01:51:04 +0900 Subject: Fix merge conflicts --- .../plugin/client/categories/crafting/filler/ArmorDyeRecipeFiller.java | 3 ++- .../client/categories/crafting/filler/BannerDuplicateRecipeFiller.java | 3 ++- .../client/categories/crafting/filler/BookCloningRecipeFiller.java | 3 ++- .../plugin/client/categories/crafting/filler/CraftingRecipeFiller.java | 3 ++- .../client/categories/crafting/filler/FireworkRocketRecipeFiller.java | 3 ++- .../client/categories/crafting/filler/MapCloningRecipeFiller.java | 3 ++- .../client/categories/crafting/filler/MapExtendingRecipeFiller.java | 3 ++- .../categories/crafting/filler/ShieldDecorationRecipeFiller.java | 3 ++- .../client/categories/crafting/filler/ShulkerBoxColoringFiller.java | 3 ++- .../client/categories/crafting/filler/SuspiciousStewRecipeFiller.java | 3 ++- .../client/categories/crafting/filler/TippedArrowRecipeFiller.java | 3 ++- 11 files changed, 22 insertions(+), 11 deletions(-) (limited to 'default-plugin') diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/ArmorDyeRecipeFiller.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/ArmorDyeRecipeFiller.java index 2582beb51..73aa38bb5 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/ArmorDyeRecipeFiller.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/ArmorDyeRecipeFiller.java @@ -34,6 +34,7 @@ import net.minecraft.world.item.DyeItem; import net.minecraft.world.item.DyeableLeatherItem; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.ArmorDyeRecipe; +import net.minecraft.world.item.crafting.RecipeHolder; import java.util.ArrayList; import java.util.Collection; @@ -42,7 +43,7 @@ import java.util.Random; public class ArmorDyeRecipeFiller implements CraftingRecipeFiller { @Override - public Collection apply(ArmorDyeRecipe recipe) { + public Collection apply(RecipeHolder recipe) { List displays = new ArrayList<>(); List> toDye = EntryRegistry.getInstance().getEntryStacks().filter(entry -> entry.getValueType() == ItemStack.class && entry.castValue().getItem() instanceof DyeableLeatherItem).toList(); DyeColor[] colors = DyeColor.values(); diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/BannerDuplicateRecipeFiller.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/BannerDuplicateRecipeFiller.java index 127355293..f28eb8f43 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/BannerDuplicateRecipeFiller.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/BannerDuplicateRecipeFiller.java @@ -35,12 +35,13 @@ import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.BannerDuplicateRecipe; +import net.minecraft.world.item.crafting.RecipeHolder; import java.util.*; public class BannerDuplicateRecipeFiller implements CraftingRecipeFiller { @Override - public Collection apply(BannerDuplicateRecipe recipe) { + public Collection apply(RecipeHolder recipe) { List displays = new ArrayList<>(); Map>> displayMap = new HashMap<>(); diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/BookCloningRecipeFiller.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/BookCloningRecipeFiller.java index 74b3c0101..cab460f70 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/BookCloningRecipeFiller.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/BookCloningRecipeFiller.java @@ -34,6 +34,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.WrittenBookItem; import net.minecraft.world.item.crafting.BookCloningRecipe; +import net.minecraft.world.item.crafting.RecipeHolder; import java.util.ArrayList; import java.util.Collection; @@ -60,7 +61,7 @@ public class BookCloningRecipeFiller implements CraftingRecipeFiller apply(BookCloningRecipe recipe) { + public Collection apply(RecipeHolder recipe) { List displays = new ArrayList<>(); for (int i = 1; i <= 8; i++) { diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/CraftingRecipeFiller.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/CraftingRecipeFiller.java index ac575045b..8670ed6fc 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/CraftingRecipeFiller.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/CraftingRecipeFiller.java @@ -37,13 +37,14 @@ import me.shedaniel.rei.plugin.common.displays.crafting.DefaultCraftingDisplay; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.crafting.CraftingRecipe; +import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.item.crafting.RecipeType; import java.util.Collection; import java.util.List; import java.util.function.Function; -public interface CraftingRecipeFiller extends Function> { +public interface CraftingRecipeFiller extends Function, Collection> { default void registerCategories(CategoryRegistry registry) { } diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/FireworkRocketRecipeFiller.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/FireworkRocketRecipeFiller.java index d4a689df1..3a9f04b0f 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/FireworkRocketRecipeFiller.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/FireworkRocketRecipeFiller.java @@ -35,6 +35,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.FireworkRocketRecipe; +import net.minecraft.world.item.crafting.RecipeHolder; import java.util.ArrayList; import java.util.Collection; @@ -42,7 +43,7 @@ import java.util.List; public class FireworkRocketRecipeFiller implements CraftingRecipeFiller { @Override - public Collection apply(FireworkRocketRecipe recipe) { + public Collection apply(RecipeHolder recipe) { List displays = new ArrayList<>(); { EntryIngredient[] inputs = new EntryIngredient[4]; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/MapCloningRecipeFiller.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/MapCloningRecipeFiller.java index e36a6fd8f..e692668ca 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/MapCloningRecipeFiller.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/MapCloningRecipeFiller.java @@ -28,6 +28,7 @@ import me.shedaniel.rei.api.common.util.EntryIngredients; import me.shedaniel.rei.plugin.common.displays.crafting.DefaultCustomShapelessDisplay; import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.MapCloningRecipe; +import net.minecraft.world.item.crafting.RecipeHolder; import java.util.ArrayList; import java.util.Collection; @@ -35,7 +36,7 @@ import java.util.List; public class MapCloningRecipeFiller implements CraftingRecipeFiller { @Override - public Collection apply(MapCloningRecipe recipe) { + public Collection apply(RecipeHolder recipe) { List displays = new ArrayList<>(); displays.add(new DefaultCustomShapelessDisplay(recipe, diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/MapExtendingRecipeFiller.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/MapExtendingRecipeFiller.java index f5771ce5b..b01b45c4c 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/MapExtendingRecipeFiller.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/MapExtendingRecipeFiller.java @@ -33,6 +33,7 @@ import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.MapExtendingRecipe; +import net.minecraft.world.item.crafting.RecipeHolder; import java.util.ArrayList; import java.util.Collection; @@ -40,7 +41,7 @@ import java.util.List; public class MapExtendingRecipeFiller implements CraftingRecipeFiller { @Override - public Collection apply(MapExtendingRecipe recipe) { + public Collection apply(RecipeHolder recipe) { List displays = new ArrayList<>(); for (int i = 0; i < 4; i++) { diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/ShieldDecorationRecipeFiller.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/ShieldDecorationRecipeFiller.java index 38de05515..54272d078 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/ShieldDecorationRecipeFiller.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/ShieldDecorationRecipeFiller.java @@ -36,6 +36,7 @@ import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.*; +import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.item.crafting.ShieldDecorationRecipe; import net.minecraft.world.level.block.entity.BannerPattern; import net.minecraft.world.level.block.entity.BlockEntityType; @@ -72,7 +73,7 @@ public class ShieldDecorationRecipeFiller implements CraftingRecipeFiller apply(ShieldDecorationRecipe recipe) { + public Collection apply(RecipeHolder recipe) { List displays = new ArrayList<>(); EntryIngredient shield = EntryIngredients.of(Items.SHIELD); EntryIngredient.Builder inputsBuilder = EntryIngredient.builder(); diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/ShulkerBoxColoringFiller.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/ShulkerBoxColoringFiller.java index 1a1240925..a61c868f8 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/ShulkerBoxColoringFiller.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/ShulkerBoxColoringFiller.java @@ -30,6 +30,7 @@ import me.shedaniel.rei.plugin.common.displays.crafting.DefaultCustomShapelessDi import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.DyeItem; import net.minecraft.world.item.Items; +import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.item.crafting.ShulkerBoxColoring; import net.minecraft.world.level.block.ShulkerBoxBlock; @@ -39,7 +40,7 @@ import java.util.List; public class ShulkerBoxColoringFiller implements CraftingRecipeFiller { @Override - public Collection apply(ShulkerBoxColoring recipe) { + public Collection apply(RecipeHolder recipe) { List displays = new ArrayList<>(); EntryIngredient shulkerBox = EntryIngredients.of(Items.SHULKER_BOX); diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/SuspiciousStewRecipeFiller.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/SuspiciousStewRecipeFiller.java index fab4e4e70..c86ff4a63 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/SuspiciousStewRecipeFiller.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/SuspiciousStewRecipeFiller.java @@ -30,6 +30,7 @@ import me.shedaniel.rei.plugin.common.displays.crafting.DefaultCustomShapelessDi import net.minecraft.network.chat.Component; import net.minecraft.tags.ItemTags; import net.minecraft.world.item.Items; +import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.item.crafting.SuspiciousStewRecipe; import java.util.ArrayList; @@ -38,7 +39,7 @@ import java.util.List; public class SuspiciousStewRecipeFiller implements CraftingRecipeFiller { @Override - public Collection apply(SuspiciousStewRecipe recipe) { + public Collection apply(RecipeHolder recipe) { List displays = new ArrayList<>(); displays.add(new DefaultCustomShapelessDisplay(recipe, diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/TippedArrowRecipeFiller.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/TippedArrowRecipeFiller.java index e0d62e357..f544ae1e8 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/TippedArrowRecipeFiller.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/filler/TippedArrowRecipeFiller.java @@ -35,6 +35,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.alchemy.Potion; import net.minecraft.world.item.alchemy.PotionUtils; +import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.item.crafting.TippedArrowRecipe; import java.util.ArrayList; @@ -43,7 +44,7 @@ import java.util.List; public class TippedArrowRecipeFiller implements CraftingRecipeFiller { @Override - public Collection apply(TippedArrowRecipe recipe) { + public Collection apply(RecipeHolder recipe) { EntryIngredient arrowStack = EntryIngredient.of(EntryStacks.of(Items.ARROW)); ReferenceSet registeredPotions = new ReferenceOpenHashSet<>(); List displays = new ArrayList<>(); -- cgit