From 0239bf2fb623863164da37df7f059d29805ed1b9 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sun, 20 Jun 2021 01:16:36 +0800 Subject: Add registerRecipeFiller for checking recipe types --- .../rei/plugin/client/DefaultClientPlugin.java | 18 +++++++++--------- .../common/displays/brewing/DefaultBrewingDisplay.java | 7 +++++++ 2 files changed, 16 insertions(+), 9 deletions(-) (limited to 'default-plugin/src/main') diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java index 4a229a3c2..cfbfa0da2 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java @@ -112,7 +112,7 @@ public class DefaultClientPlugin implements REIClientPlugin, BuiltinClientPlugin @Override public void registerBrewingRecipe(Ingredient input, Ingredient ingredient, ItemStack output) { - DisplayRegistry.getInstance().add(new DefaultBrewingDisplay(new BrewingRecipe(input, ingredient, output))); + DisplayRegistry.getInstance().add(new BrewingRecipe(input, ingredient, output)); } @Override @@ -214,14 +214,14 @@ public class DefaultClientPlugin implements REIClientPlugin, BuiltinClientPlugin @Override public void registerDisplays(DisplayRegistry registry) { - registry.registerFiller(ShapelessRecipe.class, DefaultShapelessDisplay::new); - registry.registerFiller(ShapedRecipe.class, DefaultShapedDisplay::new); - registry.registerFiller(SmeltingRecipe.class, DefaultSmeltingDisplay::new); - registry.registerFiller(SmokingRecipe.class, DefaultSmokingDisplay::new); - registry.registerFiller(BlastingRecipe.class, DefaultBlastingDisplay::new); - registry.registerFiller(CampfireCookingRecipe.class, DefaultCampfireDisplay::new); - registry.registerFiller(StonecutterRecipe.class, DefaultStoneCuttingDisplay::new); - registry.registerFiller(UpgradeRecipe.class, DefaultSmithingDisplay::new); + registry.registerRecipeFiller(ShapelessRecipe.class, RecipeType.CRAFTING, DefaultShapelessDisplay::new); + registry.registerRecipeFiller(ShapedRecipe.class, RecipeType.CRAFTING, DefaultShapedDisplay::new); + registry.registerRecipeFiller(SmeltingRecipe.class, RecipeType.SMELTING, DefaultSmeltingDisplay::new); + registry.registerRecipeFiller(SmokingRecipe.class, RecipeType.SMOKING, DefaultSmokingDisplay::new); + registry.registerRecipeFiller(BlastingRecipe.class, RecipeType.BLASTING, DefaultBlastingDisplay::new); + registry.registerRecipeFiller(CampfireCookingRecipe.class, RecipeType.CAMPFIRE_COOKING, DefaultCampfireDisplay::new); + registry.registerRecipeFiller(StonecutterRecipe.class, RecipeType.STONECUTTING, DefaultStoneCuttingDisplay::new); + registry.registerRecipeFiller(UpgradeRecipe.class, RecipeType.SMITHING, DefaultSmithingDisplay::new); registry.registerFiller(BrewingRecipe.class, DefaultBrewingDisplay::new); for (Map.Entry entry : AbstractFurnaceBlockEntity.getFuel().entrySet()) { registry.add(new DefaultFuelDisplay(Collections.singletonList(EntryIngredients.of(entry.getKey())), Collections.emptyList(), entry.getValue())); diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/brewing/DefaultBrewingDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/brewing/DefaultBrewingDisplay.java index 08bd8ca1d..2da4f7d21 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/brewing/DefaultBrewingDisplay.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/brewing/DefaultBrewingDisplay.java @@ -38,11 +38,18 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; +import org.jetbrains.annotations.ApiStatus; import java.util.ArrayList; import java.util.Collections; import java.util.List; +/** + * The default display for brewing recipes. + * + * @see BrewingRecipe + */ +@ApiStatus.Internal public class DefaultBrewingDisplay implements Display { private EntryStack output; private EntryIngredient reactant, input; -- cgit