diff --git a/src/generated/resources/data/botania/recipes/elven_trade/lexicon_elven.json b/src/generated/resources/data/botania/recipes/elven_trade/lexicon_elven.json new file mode 100644 index 000000000..89cb21193 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/elven_trade/lexicon_elven.json @@ -0,0 +1,3 @@ +{ + "type": "botania:elven_trade_lexicon" +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index d85d3a68e..4865f44b9 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -64,7 +64,6 @@ public final class BotaniaAPI { public static Map pureDaisyRecipes = Collections.emptyMap(); public static Map manaInfusionRecipes = Collections.emptyMap(); public static Map runeAltarRecipes = Collections.emptyMap(); - public static Map elvenTradeRecipes = Collections.emptyMap(); public static Map brewRecipes = Collections.emptyMap(); public static Map oreWeights = Collections.emptyMap(); diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java index d75168e91..1e47e6227 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java @@ -25,6 +25,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.crafting.CraftingHelper; import net.minecraftforge.registries.ForgeRegistryEntry; +import vazkii.botania.common.crafting.AbstractElvenTradeRecipe; import vazkii.botania.common.crafting.ModRecipeTypes; import javax.annotation.Nonnull; @@ -33,8 +34,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -public class RecipeElvenTrade implements IRecipe { - private final ResourceLocation id; +public class RecipeElvenTrade extends AbstractElvenTradeRecipe { private final ImmutableList outputs; private final ImmutableList inputs; @@ -43,18 +43,12 @@ public class RecipeElvenTrade implements IRecipe { } public RecipeElvenTrade(ResourceLocation id, ItemStack[] outputs, Ingredient... inputs) { - this.id = id; + super(id); this.outputs = ImmutableList.copyOf(outputs); this.inputs = ImmutableList.copyOf(inputs); } - /** - * Attempts to match the recipe - * - * @param stacks Entire contents of the portal's buffer - * @return {@link Optional#empty()} if recipe doesn't match, Optional with a set of items used by recipe - * otherwise - */ + @Override public Optional> match(List stacks) { List inputsMissing = new ArrayList<>(inputs); List stacksToRemove = new ArrayList<>(); @@ -88,9 +82,7 @@ public class RecipeElvenTrade implements IRecipe { return inputsMissing.isEmpty() ? Optional.of(stacksToRemove) : Optional.empty(); } - /** - * If the recipe does not contain the item, it will be destroyed upon entering the portal. - */ + @Override public boolean containsItem(ItemStack stack) { for (Ingredient input : inputs) { if (input.test(stack)) { @@ -100,54 +92,23 @@ public class RecipeElvenTrade implements IRecipe { return false; } - @Override - public boolean matches(@Nonnull IInventory inv, @Nonnull World world) { - return false; - } - - @Nonnull - @Override - public ItemStack getCraftingResult(@Nonnull IInventory inv) { - return ItemStack.EMPTY; - } - - @Override - public boolean canFit(int width, int height) { - return false; - } - - @Nonnull - @Override - public ItemStack getRecipeOutput() { - return ItemStack.EMPTY; - } - - @Nonnull - @Override - public ResourceLocation getId() { - return id; - } - @Nonnull @Override public IRecipeSerializer getSerializer() { return ModRecipeTypes.ELVEN_TRADE_SERIALIZER; } - @Nonnull @Override - public IRecipeType getType() { - return ModRecipeTypes.ELVEN_TRADE_TYPE; - } - public List getInputs() { return inputs; } + @Override public List getOutputs() { return outputs; } + @Override public List getOutputs(List inputs) { return getOutputs(); } diff --git a/src/main/java/vazkii/botania/api/recipe/RegisterRecipesEvent.java b/src/main/java/vazkii/botania/api/recipe/RegisterRecipesEvent.java index a563a8e80..00c92ff3a 100644 --- a/src/main/java/vazkii/botania/api/recipe/RegisterRecipesEvent.java +++ b/src/main/java/vazkii/botania/api/recipe/RegisterRecipesEvent.java @@ -23,17 +23,15 @@ public class RegisterRecipesEvent extends Event { private final Consumer pureDaisy; private final Consumer manaInfusion; private final Consumer brew; - private final Consumer elvenTrade; private final Consumer apothecary; private final Consumer runeAltar; public RegisterRecipesEvent(Consumer pureDaisy, Consumer manaInfusion, - Consumer brew, Consumer elvenTrade, + Consumer brew, Consumer apothecary, Consumer runeAltar) { this.pureDaisy = pureDaisy; this.manaInfusion = manaInfusion; this.brew = brew; - this.elvenTrade = elvenTrade; this.apothecary = apothecary; this.runeAltar = runeAltar; } @@ -50,10 +48,6 @@ public class RegisterRecipesEvent extends Event { return brew; } - public Consumer elvenTrade() { - return elvenTrade; - } - public Consumer apothecary() { return apothecary; } diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index 31a0f30aa..45db7b339 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -31,7 +31,6 @@ import net.minecraft.util.ResourceLocation; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaItem; -import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.client.core.handler.CorporeaInputHandler; import vazkii.botania.client.gui.crafting.ContainerCraftingHalo; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeCategory; @@ -51,6 +50,8 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.block.tile.TileAlfPortal; import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.crafting.AbstractElvenTradeRecipe; +import vazkii.botania.common.crafting.LexiconElvenTradeRecipe; import vazkii.botania.common.crafting.recipe.AncientWillRecipe; import vazkii.botania.common.crafting.recipe.CompositeLensRecipe; import vazkii.botania.common.crafting.recipe.TerraPickTippingRecipe; @@ -184,10 +185,8 @@ public class JEIBotaniaPlugin implements IModPlugin { @Override public void onRuntimeAvailable(IJeiRuntime jeiRuntime) { IRecipeManager recipeRegistry = jeiRuntime.getRecipeManager(); - for (RecipeElvenTrade recipe : BotaniaAPI.elvenTradeRecipes.values()) { - List inputs = recipe.getInputs(); - List outputs = recipe.getOutputs(); - if (inputs.size() == 1 && outputs.size() == 1 && recipe.containsItem(outputs.get(0)) && outputs.get(0).getItem() != ModItems.lexicon) { + for (AbstractElvenTradeRecipe recipe : TileAlfPortal.elvenTradeRecipes(Minecraft.getInstance().world.getRecipeManager())) { + if (recipe instanceof LexiconElvenTradeRecipe) { recipeRegistry.hideRecipe(recipe, ElvenTradeRecipeCategory.UID); } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java index 3f63d148d..838527863 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java @@ -31,9 +31,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.crafting.AbstractElvenTradeRecipe; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; @@ -41,7 +41,7 @@ import javax.annotation.Nonnull; import java.util.Arrays; import java.util.List; -public class ElvenTradeRecipeCategory implements IRecipeCategory { +public class ElvenTradeRecipeCategory implements IRecipeCategory { public static final ResourceLocation UID = new ResourceLocation(LibMisc.MOD_ID, "elven_trade"); private final String localizedName; @@ -64,8 +64,8 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory getRecipeClass() { - return RecipeElvenTrade.class; + public Class getRecipeClass() { + return AbstractElvenTradeRecipe.class; } @Nonnull @@ -87,7 +87,7 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory> builder = ImmutableList.builder(); for (Ingredient i : recipe.getInputs()) { builder.add(Arrays.asList(i.getMatchingStacks())); @@ -97,7 +97,7 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory o : ingredients.getInputs(VanillaTypes.ITEM)) { recipeLayout.getItemStacks().init(index, true, posX, 0); diff --git a/src/main/java/vazkii/botania/client/patchouli/processor/ElvenTradeProcessor.java b/src/main/java/vazkii/botania/client/patchouli/processor/ElvenTradeProcessor.java index be3d47113..921452425 100644 --- a/src/main/java/vazkii/botania/client/patchouli/processor/ElvenTradeProcessor.java +++ b/src/main/java/vazkii/botania/client/patchouli/processor/ElvenTradeProcessor.java @@ -16,9 +16,8 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.client.patchouli.PatchouliUtils; +import vazkii.botania.common.crafting.AbstractElvenTradeRecipe; import vazkii.botania.common.crafting.ModRecipeTypes; import vazkii.patchouli.api.IComponentProcessor; import vazkii.patchouli.api.IVariableProvider; @@ -28,20 +27,20 @@ import java.util.List; import java.util.stream.Collectors; public class ElvenTradeProcessor implements IComponentProcessor { - private List recipes; + private List recipes; private int longestIngredientSize, mostInputs, mostOutputs; @Override public void setup(IVariableProvider variables) { - ImmutableList.Builder builder = ImmutableList.builder(); + ImmutableList.Builder builder = ImmutableList.builder(); for (String s : variables.get("recipes").split(";")) { IRecipe recipe = Minecraft.getInstance().world.getRecipeManager().getRecipes(ModRecipeTypes.ELVEN_TRADE_TYPE).get(new ResourceLocation(s)); - if (recipe instanceof RecipeElvenTrade) { - builder.add((RecipeElvenTrade) recipe); + if (recipe instanceof AbstractElvenTradeRecipe) { + builder.add((AbstractElvenTradeRecipe) recipe); } } recipes = builder.build(); - for (RecipeElvenTrade recipe : recipes) { + for (AbstractElvenTradeRecipe recipe : recipes) { List inputs = recipe.getInputs(); for (Ingredient ingredient : inputs) { int length = ingredient.getMatchingStacks().length; @@ -76,7 +75,7 @@ public class ElvenTradeProcessor implements IComponentProcessor { if (key.startsWith("output")) { int index = Integer.parseInt(key.substring(6)) - 1; if (index < mostOutputs) { - return recipes.stream().map(RecipeElvenTrade::getOutputs) + return recipes.stream().map(AbstractElvenTradeRecipe::getOutputs) .map(l -> index < l.size() ? l.get(index) : ItemStack.EMPTY) .map(PatchouliAPI.instance::serializeItemStack).collect(Collectors.joining(",")); } else { @@ -87,7 +86,7 @@ public class ElvenTradeProcessor implements IComponentProcessor { } private String interweaveIngredients(int inputIndex) { - List recipes = this.recipes.stream().map(RecipeElvenTrade::getInputs).map(ingredients -> { + List recipes = this.recipes.stream().map(AbstractElvenTradeRecipe::getInputs).map(ingredients -> { if (inputIndex < ingredients.size()) { return ingredients.get(inputIndex); } else { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index b9dfdadb9..cd7ab6278 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -14,7 +14,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.RecipeManager; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.ITickableTileEntity; @@ -28,10 +27,8 @@ import net.minecraft.world.Explosion; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.ElvenPortalUpdateEvent; import vazkii.botania.api.recipe.IElvenItem; -import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.client.fx.WispParticleData; @@ -41,6 +38,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.mana.BlockPool; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.crafting.AbstractElvenTradeRecipe; import vazkii.botania.common.crafting.ModRecipeTypes; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.lib.LibBlockNames; @@ -179,7 +177,7 @@ public class TileAlfPortal extends TileMod implements ITickableTileEntity { private boolean validateItemUsage(ItemEntity entity) { ItemStack inputStack = entity.getItem(); - for (RecipeElvenTrade recipe : elvenTradeRecipes(world.getRecipeManager())) { + for (AbstractElvenTradeRecipe recipe : elvenTradeRecipes(world.getRecipeManager())) { if (recipe.containsItem(inputStack)) { return true; } @@ -274,16 +272,16 @@ public class TileAlfPortal extends TileMod implements ITickableTileEntity { } } - public static List elvenTradeRecipes(RecipeManager rm) { + public static List elvenTradeRecipes(RecipeManager rm) { return rm.getRecipes(ModRecipeTypes.ELVEN_TRADE_TYPE).values().stream() - .filter(r -> r instanceof RecipeElvenTrade) - .map(r -> (RecipeElvenTrade) r) + .filter(r -> r instanceof AbstractElvenTradeRecipe) + .map(r -> (AbstractElvenTradeRecipe) r) .collect(Collectors.toList()); } private void resolveRecipes() { List pylons = locatePylons(); - for (RecipeElvenTrade recipe : elvenTradeRecipes(world.getRecipeManager())) { + for (AbstractElvenTradeRecipe recipe : elvenTradeRecipes(world.getRecipeManager())) { Optional> match = recipe.match(stacksIn); if (match.isPresent()) { if (consumeMana(pylons, 500, false)) { diff --git a/src/main/java/vazkii/botania/common/crafting/AbstractElvenTradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/AbstractElvenTradeRecipe.java new file mode 100644 index 000000000..de264edba --- /dev/null +++ b/src/main/java/vazkii/botania/common/crafting/AbstractElvenTradeRecipe.java @@ -0,0 +1,90 @@ +package vazkii.botania.common.crafting; + +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.item.crafting.IRecipeType; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; +import vazkii.botania.common.block.ModBlocks; + +import javax.annotation.Nonnull; +import java.util.List; +import java.util.Optional; + +public abstract class AbstractElvenTradeRecipe implements IRecipe { + private final ResourceLocation id; + + protected AbstractElvenTradeRecipe(ResourceLocation id) { + this.id = id; + } + + /** + * Attempts to match the recipe + * + * @param stacks Entire contents of the portal's buffer + * @return {@link Optional#empty()} if recipe doesn't match, Optional with a set of items used by recipe + * otherwise + */ + public abstract Optional> match(List stacks); + + /** + * If the recipe does not contain the item, it will be destroyed upon entering the portal. + */ + public abstract boolean containsItem(ItemStack stack); + + /** + * @return Preview of the inputs + */ + public abstract List getInputs(); + + /** + * @return Preview of the outputs + */ + public abstract List getOutputs(); + + /** + * Actually evaluate the recipe + */ + public abstract List getOutputs(List inputs); + + @Nonnull + @Override + public ItemStack getIcon() { + return new ItemStack(ModBlocks.alfPortal); + } + + @Override + public final ResourceLocation getId() { + return id; + } + + @Override + public final IRecipeType getType() { + return ModRecipeTypes.ELVEN_TRADE_TYPE; + } + + // Ignored IRecipe boilerplate + + @Override + public boolean matches(IInventory inv, World world) { + return false; + } + + @Override + public ItemStack getCraftingResult(IInventory inv) { + return ItemStack.EMPTY; + } + + @Override + public boolean canFit(int width, int height) { + return false; + } + + @Override + public ItemStack getRecipeOutput() { + return ItemStack.EMPTY; + } +} diff --git a/src/main/java/vazkii/botania/common/crafting/LexiconElvenTradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/LexiconElvenTradeRecipe.java new file mode 100644 index 000000000..bf4666b3e --- /dev/null +++ b/src/main/java/vazkii/botania/common/crafting/LexiconElvenTradeRecipe.java @@ -0,0 +1,57 @@ +package vazkii.botania.common.crafting; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.ResourceLocation; +import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.item.ItemLexicon; +import vazkii.botania.common.item.ModItems; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Optional; + +public class LexiconElvenTradeRecipe extends AbstractElvenTradeRecipe { + LexiconElvenTradeRecipe(ResourceLocation id) { + super(id); + } + + @Override + public boolean containsItem(ItemStack stack) { + return stack.getItem() == ModItems.lexicon && !ItemNBTHelper.getBoolean(stack, ItemLexicon.TAG_ELVEN_UNLOCK, false); + } + + @Override + public List getInputs() { + return Collections.singletonList(Ingredient.fromItems(ModItems.lexicon)); + } + + @Override + public List getOutputs() { + ItemStack stack = new ItemStack(ModItems.lexicon); + stack.getOrCreateTag().putBoolean(ItemLexicon.TAG_ELVEN_UNLOCK, true); + return Collections.singletonList(stack); + } + + @Override + public Optional> match(List stacks) { + if (stacks.size() == 1 && stacks.get(0).getItem() == ModItems.lexicon && !ItemNBTHelper.getBoolean(stacks.get(0), ItemLexicon.TAG_ELVEN_UNLOCK, false)) { + return Optional.of(new ArrayList<>(stacks)); + } + return Optional.empty(); + } + + @Override + public List getOutputs(List inputs) { + ItemStack stack = inputs.get(0).copy(); + stack.getOrCreateTag().putBoolean(ItemLexicon.TAG_ELVEN_UNLOCK, true); + return Collections.singletonList(stack); + } + + @Override + public IRecipeSerializer getSerializer() { + return ModRecipeTypes.LEXICON_ELVEN_TRADE_SERIALIZER; + } +} diff --git a/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java deleted file mode 100644 index 7bda1a1fa..000000000 --- a/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * This class is distributed as part of the Botania Mod. - * Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - */ -package vazkii.botania.common.crafting; - -import net.minecraft.block.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -import vazkii.botania.api.recipe.RecipeElvenTrade; -import vazkii.botania.api.recipe.RegisterRecipesEvent; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.item.ItemLexicon; -import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibMisc; -import vazkii.botania.common.lib.ModTags; - -import java.util.Collections; -import java.util.List; -import java.util.Optional; - -import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; - -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) -public class ModElvenTradeRecipes { - - @SubscribeEvent - public static void register(RegisterRecipesEvent evt) { - ItemStack elvenLexicon = new ItemStack(ModItems.lexicon); - elvenLexicon.getOrCreateTag().putBoolean(ItemLexicon.TAG_ELVEN_UNLOCK, true); - evt.elvenTrade().accept(new RecipeLexicon(prefix("elven_lexicon"), elvenLexicon, Ingredient.fromStacks(new ItemStack(ModItems.lexicon)))); - } - - private static class RecipeLexicon extends RecipeElvenTrade { - RecipeLexicon(ResourceLocation id, ItemStack output, Ingredient input) { - super(id, output, input); - } - - @Override - public boolean containsItem(ItemStack stack) { - return super.containsItem(stack) && !ItemNBTHelper.getBoolean(stack, ItemLexicon.TAG_ELVEN_UNLOCK, false); - } - - @Override - public Optional> match(List stacks) { - if (stacks.size() == 1 && !ItemNBTHelper.getBoolean(stacks.get(0), ItemLexicon.TAG_ELVEN_UNLOCK, false)) { - return super.match(stacks); - } - return Optional.empty(); - } - - @Override - public List getOutputs(List inputs) { - ItemStack stack = inputs.get(0).copy(); - stack.getOrCreateTag().putBoolean(ItemLexicon.TAG_ELVEN_UNLOCK, true); - return Collections.singletonList(stack); - } - } -} diff --git a/src/main/java/vazkii/botania/common/crafting/ModRecipeTypes.java b/src/main/java/vazkii/botania/common/crafting/ModRecipeTypes.java index d0153a31e..26319e5f5 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModRecipeTypes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModRecipeTypes.java @@ -3,6 +3,7 @@ package vazkii.botania.common.crafting; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.IRecipeType; +import net.minecraft.item.crafting.SpecialRecipeSerializer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; import net.minecraftforge.event.RegistryEvent; @@ -17,14 +18,16 @@ import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public class ModRecipeTypes { - public static final IRecipeType ELVEN_TRADE_TYPE = new RecipeType<>(); + public static final IRecipeType ELVEN_TRADE_TYPE = new RecipeType<>(); public static final IRecipeSerializer ELVEN_TRADE_SERIALIZER = new RecipeElvenTrade.Serializer(); + public static final SpecialRecipeSerializer LEXICON_ELVEN_TRADE_SERIALIZER = new SpecialRecipeSerializer<>(LexiconElvenTradeRecipe::new); @SubscribeEvent public static void register(RegistryEvent.Register> evt) { ResourceLocation id = prefix("elven_trade"); Registry.register(Registry.RECIPE_TYPE, id, ELVEN_TRADE_TYPE); evt.getRegistry().register(ELVEN_TRADE_SERIALIZER.setRegistryName(id)); + evt.getRegistry().register(LEXICON_ELVEN_TRADE_SERIALIZER.setRegistryName(prefix("elven_trade_lexicon"))); } private static class RecipeType> implements IRecipeType { diff --git a/src/main/java/vazkii/botania/common/crafting/SyncHandler.java b/src/main/java/vazkii/botania/common/crafting/SyncHandler.java index de23c4f71..01da80df7 100644 --- a/src/main/java/vazkii/botania/common/crafting/SyncHandler.java +++ b/src/main/java/vazkii/botania/common/crafting/SyncHandler.java @@ -45,7 +45,6 @@ public class SyncHandler { Map pureDaisy = new HashMap<>(); Map manaInfusion = new HashMap<>(); Map brew = new HashMap<>(); - Map elvenTrade = new HashMap<>(); Map apothecary = new HashMap<>(); Map runeAltar = new HashMap<>(); @@ -53,7 +52,6 @@ public class SyncHandler { r -> pureDaisy.put(r.getId(), r), r -> manaInfusion.put(r.getId(), r), r -> brew.put(r.getId(), r), - r -> elvenTrade.put(r.getId(), r), r -> apothecary.put(r.getId(), r), r -> runeAltar.put(r.getId(), r) ); @@ -62,7 +60,6 @@ public class SyncHandler { BotaniaAPI.pureDaisyRecipes = ImmutableMap.copyOf(pureDaisy); BotaniaAPI.manaInfusionRecipes = ImmutableMap.copyOf(manaInfusion); BotaniaAPI.brewRecipes = ImmutableMap.copyOf(brew); - BotaniaAPI.elvenTradeRecipes = ImmutableMap.copyOf(elvenTrade); BotaniaAPI.petalRecipes = ImmutableMap.copyOf(apothecary); BotaniaAPI.runeAltarRecipes = ImmutableMap.copyOf(runeAltar); PacketHandler.HANDLER.send(PacketDistributor.ALL.noArg(), syncPacket()); @@ -70,7 +67,7 @@ public class SyncHandler { } private static PacketSyncRecipes syncPacket() { - return new PacketSyncRecipes(BotaniaAPI.brewRecipes, BotaniaAPI.elvenTradeRecipes, BotaniaAPI.manaInfusionRecipes, + return new PacketSyncRecipes(BotaniaAPI.brewRecipes, BotaniaAPI.manaInfusionRecipes, BotaniaAPI.petalRecipes, BotaniaAPI.pureDaisyRecipes, BotaniaAPI.runeAltarRecipes); } @@ -79,7 +76,6 @@ public class SyncHandler { @SubscribeEvent public static void clientLogout(ClientPlayerNetworkEvent.LoggedOutEvent evt) { BotaniaAPI.brewRecipes = Collections.emptyMap(); - BotaniaAPI.elvenTradeRecipes = Collections.emptyMap(); BotaniaAPI.manaInfusionRecipes = Collections.emptyMap(); BotaniaAPI.petalRecipes = Collections.emptyMap(); BotaniaAPI.pureDaisyRecipes = Collections.emptyMap(); diff --git a/src/main/java/vazkii/botania/common/network/PacketSyncRecipes.java b/src/main/java/vazkii/botania/common/network/PacketSyncRecipes.java index f9e4f370e..1a9fc71e9 100644 --- a/src/main/java/vazkii/botania/common/network/PacketSyncRecipes.java +++ b/src/main/java/vazkii/botania/common/network/PacketSyncRecipes.java @@ -29,15 +29,13 @@ import java.util.stream.Stream; public class PacketSyncRecipes { private Map brew; - private Map elven; private Map manaInfusion; private Map petal; private Map pureDaisy; private Map runeAltar; - public PacketSyncRecipes(Map brew, Map elven, Map manaInfusion, Map petal, Map pureDaisy, Map runeAltar) { + public PacketSyncRecipes(Map brew, Map manaInfusion, Map petal, Map pureDaisy, Map runeAltar) { this.brew = brew; - this.elven = elven; this.manaInfusion = manaInfusion; this.petal = petal; this.pureDaisy = pureDaisy; @@ -72,7 +70,6 @@ public class PacketSyncRecipes { Map brew = Stream.generate(() -> RecipeBrew.read(buf)) .limit(brewCount) .collect(Collectors.toMap(RecipeBrew::getId, r -> r)); - Map elven = Collections.emptyMap(); int manaInfusionCount = buf.readVarInt(); Map manaInfusion = Stream.generate(() -> RecipeManaInfusion.read(buf)) .limit(manaInfusionCount) @@ -89,7 +86,7 @@ public class PacketSyncRecipes { Map rune = Stream.generate(() -> RecipeRuneAltar.read(buf)) .limit(runeCount) .collect(Collectors.toMap(RecipeRuneAltar::getId, r -> r)); - return new PacketSyncRecipes(brew, elven, manaInfusion, petal, pureDaisy, rune); + return new PacketSyncRecipes(brew, manaInfusion, petal, pureDaisy, rune); } public void handle(Supplier ctx) { @@ -99,7 +96,6 @@ public class PacketSyncRecipes { return; } BotaniaAPI.brewRecipes = brew; - BotaniaAPI.elvenTradeRecipes = elven; BotaniaAPI.manaInfusionRecipes = manaInfusion; BotaniaAPI.petalRecipes = petal; BotaniaAPI.pureDaisyRecipes = pureDaisy; @@ -115,7 +111,7 @@ public class PacketSyncRecipes { private int loginIndex; public Login() { - this(new PacketSyncRecipes(BotaniaAPI.brewRecipes, BotaniaAPI.elvenTradeRecipes, + this(new PacketSyncRecipes(BotaniaAPI.brewRecipes, BotaniaAPI.manaInfusionRecipes, BotaniaAPI.petalRecipes, BotaniaAPI.pureDaisyRecipes, BotaniaAPI.runeAltarRecipes)); } diff --git a/src/main/java/vazkii/botania/data/ElvenTradeProvider.java b/src/main/java/vazkii/botania/data/ElvenTradeProvider.java index 1977c86f9..e56ea3887 100644 --- a/src/main/java/vazkii/botania/data/ElvenTradeProvider.java +++ b/src/main/java/vazkii/botania/data/ElvenTradeProvider.java @@ -3,6 +3,7 @@ package vazkii.botania.data; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import net.minecraft.block.Blocks; +import net.minecraft.data.CustomRecipeBuilder; import net.minecraft.data.DataGenerator; import net.minecraft.data.IFinishedRecipe; import net.minecraft.data.RecipeProvider; @@ -17,6 +18,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.ModRecipeTypes; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.ModTags; import javax.annotation.Nullable; @@ -54,6 +56,8 @@ public class ElvenTradeProvider extends RecipeProvider { consumer.accept(new FinishedRecipe(id("ender_pearl_return"), new ItemStack(Items.ENDER_PEARL), Ingredient.fromItems(Items.ENDER_PEARL))); consumer.accept(new FinishedRecipe(id("diamond_return"), new ItemStack(Items.DIAMOND), Ingredient.fromItems(Items.DIAMOND))); consumer.accept(new FinishedRecipe(id("diamond_block_return"), new ItemStack(Blocks.DIAMOND_BLOCK), Ingredient.fromItems(Blocks.DIAMOND_BLOCK))); + + CustomRecipeBuilder.func_218656_a(ModRecipeTypes.LEXICON_ELVEN_TRADE_SERIALIZER).build(consumer, id("lexicon_elven").toString()); } private static ResourceLocation id(String path) { @@ -100,7 +104,8 @@ public class ElvenTradeProvider extends RecipeProvider { return id; } - @Override public IRecipeSerializer getSerializer() { + @Override + public IRecipeSerializer getSerializer() { return ModRecipeTypes.ELVEN_TRADE_SERIALIZER; }