diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java index cefab0139..81393cb89 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java @@ -10,21 +10,25 @@ */ package vazkii.botania.api.lexicon; +import com.google.common.base.CaseFormat; +import com.google.common.collect.ImmutableMap; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.google.gson.reflect.TypeToken; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.recipe.IModRecipe; import vazkii.botania.common.lexicon.page.PageBrew; import vazkii.botania.common.lexicon.page.PageCraftingRecipe; import vazkii.botania.common.lexicon.page.PageElvenRecipe; import vazkii.botania.common.lexicon.page.PageImage; +import vazkii.botania.common.lexicon.page.PageLoreText; import vazkii.botania.common.lexicon.page.PageManaInfusionRecipe; +import vazkii.botania.common.lexicon.page.PageModRecipe; +import vazkii.botania.common.lexicon.page.PageMultiblock; import vazkii.botania.common.lexicon.page.PagePetalRecipe; -import vazkii.botania.common.lexicon.page.PageRuneRecipe; import vazkii.botania.common.lexicon.page.PageTerrasteel; import vazkii.botania.common.lexicon.page.PageText; import vazkii.botania.common.lib.LibLexicon; @@ -34,17 +38,14 @@ import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import java.io.OutputStream; import java.io.OutputStreamWriter; -import java.lang.reflect.Type; -import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.stream.Collectors; @@ -119,62 +120,82 @@ public class LexiconEntry implements Comparable { } public void dump() { - File dir = Paths.get(".", "entries", category.getUnlocalizedName().substring(LibLexicon.CATEGORY_PREFIX.length())).toFile(); + Map multiblocks = ImmutableMap.builder() + .put("botania.page.terrasteel4", "botania:terra_plate") + .put("botania.page.manaEnchanting2", "botania:enchanter") + .put("botania.page.aIntro4", "botania:alfheim_portal") + .put("botania.page.gaiaRitual2", "botania:gaia_ritual").build(); + + File dir = Paths.get(".", "entries", fixCamelCase(category.getUnlocalizedName().substring(LibLexicon.CATEGORY_PREFIX.length()))).toFile(); if(!dir.exists()) dir.mkdirs(); - File f = new File(dir, this.unlocalizedName + ".json"); + File f = new File(dir, fixCamelCase(this.unlocalizedName) + ".json"); if (f.exists()) throw new RuntimeException("preexisting file " + f.getAbsolutePath()); Gson gson = new GsonBuilder().setPrettyPrinting().create(); - Type typ = new TypeToken>() {}.getType(); try (OutputStreamWriter os = new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(f)))) { Map entry = new LinkedHashMap<>(); entry.put("name", this.getUnlocalizedName()); - entry.put("category", category.getUnlocalizedName().substring("botania.category.".length())); + entry.put("category", fixCamelCase(category.getUnlocalizedName().substring("botania.category.".length()))); entry.put("icon", getIcon().getItem().getRegistryName().toString()); if (isPriority()) entry.put("priority", true); List pages = new ArrayList<>(); for(LexiconPage page : this.pages) { Map json = new LinkedHashMap<>(); + String unlocalizedName = page.getUnlocalizedName(); if (page instanceof PageText) { - json.put("type", "text"); - json.put("text", page.getUnlocalizedName()); + json.put("type", page instanceof PageLoreText ? "lore_page" : "text"); + json.put("text", unlocalizedName); } else if (page instanceof PageImage) { json.put("type", "image"); - json.put("text", page.getUnlocalizedName()); + json.put("text", unlocalizedName); json.put("images", Collections.singletonList(((PageImage) page).resource.toString())); } else if (page instanceof PageCraftingRecipe) { List> recipes = ((PageCraftingRecipe) page).getRecipes(); - json.put("type", recipes.size() == 1 ? "crafting" : "crafting_multi"); - json.put("text", page.getUnlocalizedName()); - if (recipes.size() == 1) + json.put("type", recipes.size() <= 2 ? "crafting" : "crafting_multi"); + json.put("text", unlocalizedName); + if (recipes.size() <= 2) { json.put("recipe", recipes.get(0).getId().toString()); - else - json.put("recipes", recipes.stream().map(r -> r.getId().toString()).collect(Collectors.toList())); + if(recipes.size() == 2) + json.put("recipe2", recipes.get(1).getId().toString()); + } else + json.put("recipes", recipes.stream().map(r -> r.getId().toString()).collect(Collectors.joining(";"))); } else if (page instanceof PageManaInfusionRecipe) { json.put("type", "mana_infusion"); - json.put("text", page.getUnlocalizedName()); - json.put("recipes", ((PageManaInfusionRecipe) page).getRecipes().stream().map(r -> r.getId().toString()).collect(Collectors.toList())); - } else if (page instanceof PagePetalRecipe) { - json.put("type", "petal_apothecary"); - json.put("text", page.getUnlocalizedName()); - json.put("recipes", ((PagePetalRecipe) page).getRecipes().stream().map(r -> r.getId().toString()).collect(Collectors.toList())); - } else if (page instanceof PageRuneRecipe) { - json.put("type", "runic_altar"); - json.put("text", page.getUnlocalizedName()); - json.put("recipes", ((PageRuneRecipe) page).getRecipes().stream().map(r -> r.getId().toString()).collect(Collectors.toList())); + json.put("text", unlocalizedName); + json.put("recipes", ((PageManaInfusionRecipe) page).getRecipes().stream().map(r -> r.getId().toString()).collect(Collectors.joining(";"))); + } else if (page instanceof PageModRecipe) { + json.put("type", page instanceof PagePetalRecipe ? "petal_apothecary" : "runic_altar"); + json.put("text", unlocalizedName); + List strings = ((PageModRecipe) page).getRecipes().stream().map(r -> r.getId().toString()).collect(Collectors.toList()); + if(strings.size() == 1) { + json.put("recipe", strings.get(0)); + } else { + json.put("recipes", strings); + } } else if (page instanceof PageElvenRecipe) { json.put("type", "elven_trade"); - json.put("text", page.getUnlocalizedName()); - json.put("recipes", ((PageElvenRecipe) page).getRecipes().stream().map(r -> r.getId().toString()).collect(Collectors.toList())); + json.put("text", unlocalizedName); + json.put("recipes", ((PageElvenRecipe) page).getRecipes().stream().map(r -> r.getId().toString()).collect(Collectors.joining(";"))); } else if (page instanceof PageBrew) { json.put("type", "brew"); - json.put("text", page.getUnlocalizedName()); - json.put("recipe", ((PageBrew) page).recipe.getId()); + json.put("text", ((PageBrew) page).text); + json.put("flavor", unlocalizedName); + json.put("recipe", ((PageBrew) page).recipe.getId().toString()); + } else if (page instanceof PageMultiblock) { + json.put("type", "multiblock"); + json.put("multiblock_id", multiblocks.get(unlocalizedName)); + json.put("text", unlocalizedName); + if (unlocalizedName.contains("terrasteel") || unlocalizedName.contains("aIntro")) { + json.put("symmetrical", true); + } + } else if(page instanceof PageTerrasteel) { + json.put("type", "terrasteel"); + json.put("text", unlocalizedName); } else { - json.put("type", "_unknown_" + page.getClass().getSimpleName()); - json.put("text", page.getUnlocalizedName()); + json.put("type", "_unknown_" + page.getClass().getSimpleName().toLowerCase(Locale.ROOT)); + json.put("text", unlocalizedName); } pages.add(json); } @@ -185,6 +206,17 @@ public class LexiconEntry implements Comparable { } } + private static String fixCamelCase(String s) { + if(LibLexicon.CATEGORY_FUNCTIONAL_FLOWERS.equals(s)) { + return "functional_flowers"; + } else if(LibLexicon.CATEGORY_GENERATION_FLOWERS.equals(s)) { + return "generating_flowers"; + } else if(s.length() == 6 && s.endsWith("Intro")) { + return "intro"; + } + return CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, s); + } + /** * Sets what pages you want this entry to have. */ diff --git a/src/main/java/vazkii/botania/api/recipe/IModRecipe.java b/src/main/java/vazkii/botania/api/recipe/IModRecipe.java index 878317d0c..cc97be60c 100644 --- a/src/main/java/vazkii/botania/api/recipe/IModRecipe.java +++ b/src/main/java/vazkii/botania/api/recipe/IModRecipe.java @@ -2,6 +2,7 @@ package vazkii.botania.api.recipe; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.ResourceLocation; import java.util.List; @@ -11,4 +12,5 @@ import java.util.List; public interface IModRecipe { List getInputs(); ItemStack getOutput(); + ResourceLocation getId(); } diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java index d8a6a3e44..be49c3a8e 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java @@ -59,6 +59,7 @@ public class RecipePetals implements IModRecipe { return ingredientsMissing.isEmpty(); } + @Override public ResourceLocation getId() { return id; } diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeRuneAltar.java b/src/main/java/vazkii/botania/api/recipe/RecipeRuneAltar.java index 189b80e0d..02fd3c3d0 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeRuneAltar.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeRuneAltar.java @@ -62,6 +62,7 @@ public class RecipeRuneAltar implements IModRecipe { return ingredientsMissing.isEmpty(); } + @Override public ResourceLocation getId() { return id; } diff --git a/src/main/java/vazkii/botania/client/patchouli/PatchouliUtils.java b/src/main/java/vazkii/botania/client/patchouli/PatchouliUtils.java new file mode 100644 index 000000000..c0db85bc5 --- /dev/null +++ b/src/main/java/vazkii/botania/client/patchouli/PatchouliUtils.java @@ -0,0 +1,74 @@ +/** + * This class was created by . It's 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 + * + * File Created @ [Sep 23 2019, 3:04 PM (GMT)] + */ +package vazkii.botania.client.patchouli; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import vazkii.patchouli.api.IComponentRenderContext; +import vazkii.patchouli.api.PatchouliAPI; +import vazkii.patchouli.client.book.gui.GuiBook; + +import java.util.ArrayList; +import java.util.List; +import java.util.StringJoiner; + +public class PatchouliUtils { + + /** + * Extracts the tick counter from the current render context, if possible. + * Note: uses Patchouli internals. TODO expose tick counter in the Patchouli API? + */ + public static int getBookTicksElapsed(IComponentRenderContext context) { + return context instanceof GuiBook ? ((GuiBook) context).ticksInBook : 0; + } + + /** + * Combines the ingredients, returning the first matching stack of each, then the second stack of each, etc. + * looping back ingredients that run out of matched stacks, until the ingredients reach the length + * of the longest ingredient in the recipe set. + *

+ * Note: As Patchouli internally converts the list of stacks into an ingredient, which will ignore empty stacks, + * empty ingredients will result in displaying stacks where nothing should be displayed instead. + * + * @param ingredients List of ingredients in the specific slot + * @param longestIngredientSize Longest ingredient in the entire recipe + * @return Serialized Patchouli ingredient string + */ + public static String interweaveIngredients(List ingredients, int longestIngredientSize) { + if(ingredients.size() == 1) { + return PatchouliAPI.instance.serializeIngredient(ingredients.get(0)); + } + + ItemStack[] empty = {ItemStack.EMPTY}; + List stacks = new ArrayList<>(); + for(Ingredient ingredient : ingredients) { + if(ingredient != null && !ingredient.hasNoMatchingItems()) { + stacks.add(ingredient.getMatchingStacks()); + } else { + stacks.add(empty); + } + } + StringJoiner joiner = new StringJoiner(","); + for(int i = 0; i < longestIngredientSize; i++) { + for(ItemStack[] stack : stacks) { + joiner.add(PatchouliAPI.instance.serializeItemStack(stack[i % stack.length])); + } + } + return joiner.toString(); + } + + /** + * Overload of the method above that uses the provided list's longest ingredient size. + */ + public static String interweaveIngredients(List ingredients) { + return interweaveIngredients(ingredients, ingredients.stream().mapToInt(ingr -> ingr.getMatchingStacks().length).max().orElse(1)); + } +} diff --git a/src/main/java/vazkii/botania/client/patchouli/component/ItemStackListComponent.java b/src/main/java/vazkii/botania/client/patchouli/component/ItemStackListComponent.java new file mode 100644 index 000000000..0b5b170e7 --- /dev/null +++ b/src/main/java/vazkii/botania/client/patchouli/component/ItemStackListComponent.java @@ -0,0 +1,69 @@ +/** + * This class was created by . It's 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 + * + * File Created @ [Sep 24 2019, 5:18 PM (GMT)] + */ +package vazkii.botania.client.patchouli.component; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import vazkii.botania.client.patchouli.PatchouliUtils; +import vazkii.botania.common.Botania; +import vazkii.patchouli.api.IComponentRenderContext; +import vazkii.patchouli.api.ICustomComponent; +import vazkii.patchouli.api.PatchouliAPI; +import vazkii.patchouli.api.VariableHolder; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.Arrays; + +// TODO: Remove when we don't need a bypass like that +/** + * A custom Patchouli component that is similiar to the default {@code item} type, but accepts + * air as a valid option in presence of other items. + * It does not support the {@code link_recipe} or the {@code framed} parameters. + * @deprecated For removal when Patchouli does not throw air away. + */ +@Deprecated +public class ItemStackListComponent implements ICustomComponent { + @VariableHolder + public String item; + + private transient int x, y; + private transient ItemStack[] stacks; + + @Override + public void build(int componentX, int componentY, int pageNum) { + this.x = componentX; + this.y = componentY; + this.stacks = Arrays.stream(splitSerializedStacks(item)) + .map(PatchouliAPI.instance::deserializeItemStack).toArray(ItemStack[]::new); + } + + @Override + public void render(IComponentRenderContext context, float pticks, int mouseX, int mouseY) { + int index = (PatchouliUtils.getBookTicksElapsed(context) / 20) % stacks.length; + context.renderItemStack(x, y, mouseX, mouseY, stacks[index]); + } + + private static final Method splitStacksFromSerializedIngredient = ObfuscationReflectionHelper.findMethod( + vazkii.patchouli.common.util.ItemStackUtil.class, "splitStacksFromSerializedIngredient", String.class); + + //TODO stop reflecting into Patchouli + private static String[] splitSerializedStacks(String ingredient) { + String[] strings; + try { + strings = (String[]) splitStacksFromSerializedIngredient.invoke(null, ingredient); + } catch (IllegalAccessException | InvocationTargetException e) { + Botania.LOGGER.error("Failed to access Patchouli internals", e); + return new String[]{"minecraft:air"}; + } + return strings; + } +} diff --git a/src/main/java/vazkii/botania/client/patchouli/component/ManaComponent.java b/src/main/java/vazkii/botania/client/patchouli/component/ManaComponent.java new file mode 100644 index 000000000..854f079d1 --- /dev/null +++ b/src/main/java/vazkii/botania/client/patchouli/component/ManaComponent.java @@ -0,0 +1,67 @@ +/** + * This class was created by . It's 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 + * + * File Created @ [Sep 08 2019, 10:31 PM (GMT)] + */ +package vazkii.botania.client.patchouli.component; + +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.resources.I18n; +import vazkii.botania.client.core.handler.HUDHandler; +import vazkii.botania.client.patchouli.PatchouliUtils; +import vazkii.botania.common.block.tile.mana.TilePool; +import vazkii.patchouli.api.IComponentRenderContext; +import vazkii.patchouli.api.ICustomComponent; +import vazkii.patchouli.api.VariableHolder; + +import java.util.Arrays; + +/** + * A custom component that renders a mana bar. + * It only has one custom parameter, {@code mana}, which is a semicolon-separated list of mana values. + * Setting x to {@code -1} will center the component. + */ +public class ManaComponent implements ICustomComponent { + private transient int x, y; + private transient int[] manaValues; + + @VariableHolder + public String mana; + + @Override + public void build(int componentX, int componentY, int pageNum) { + this.x = componentX != -1 ? componentX : 7; + this.y = componentY; + if(mana.length() > 0) { + this.manaValues = Arrays.stream(mana.split(";")).mapToInt(Integer::valueOf).toArray(); + } else { + this.manaValues = new int[]{0}; + } + } + + @Override + public void render(IComponentRenderContext context, float pticks, int mouseX, int mouseY) { + FontRenderer font = context.getFont(); + + String manaUsage = I18n.format("botaniamisc.manaUsage"); + font.drawString(manaUsage, x + 102 / 2 - font.getStringWidth(manaUsage) / 2, y, 0x66000000); + + int ratio = 10; + if(context.isAreaHovered(mouseX, mouseY, x, y - 2, 102, 5 + 20)) { + ratio = 1; + } + HUDHandler.renderManaBar(x, y + 10, 0x0000FF, 0.75F, + manaValues[PatchouliUtils.getBookTicksElapsed(context) % manaValues.length], TilePool.MAX_MANA / ratio); + + String ratioString = I18n.format("botaniamisc.ratio", ratio); + font.drawString(ratioString, x + 102 / 2 - font.getStringWidth(ratioString) / 2, y + 15, 0x99000000); + + //String stopStr = I18n.format("botaniamisc.shiftToStopSpin"); //TODO we get the vanilla font renderer and Patchouli is tighter than the lexicon + //font.drawString(stopStr, x + 102 / 2 - font.getStringWidth(ratioString) / 2, y + 20, 0x99000000); + } +} diff --git a/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponent.java b/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponent.java new file mode 100644 index 000000000..d789c5206 --- /dev/null +++ b/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponent.java @@ -0,0 +1,31 @@ +/** + * This class was created by . It's 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 + * + * File Created @ [Sep 20 2019, 8:49 PM (GMT)] + */ +package vazkii.botania.client.patchouli.component; + +import net.minecraft.item.crafting.Ingredient; +import vazkii.patchouli.api.PatchouliAPI; +import vazkii.patchouli.api.VariableHolder; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * Patchouli custom component that draws a rotating circle of items from a provided list. + */ +public class RotatingItemListComponent extends RotatingItemListComponentBase { + @VariableHolder + public List ingredients; + + @Override + protected List makeIngredients() { + return ingredients.stream().map(PatchouliAPI.instance::deserializeIngredient).collect(Collectors.toList()); + } +} diff --git a/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponentBase.java b/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponentBase.java new file mode 100644 index 000000000..1c388598d --- /dev/null +++ b/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponentBase.java @@ -0,0 +1,75 @@ +/** + * This class was created by . It's 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 + * + * File Created @ [Sep 20 2019, 2:59 PM (GMT)] + */ +package vazkii.botania.client.patchouli.component; + +import com.mojang.blaze3d.platform.GlStateManager; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.item.crafting.Ingredient; +import vazkii.botania.client.patchouli.PatchouliUtils; +import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.patchouli.api.IComponentRenderContext; +import vazkii.patchouli.api.ICustomComponent; + +import java.util.List; + +/** + * Base custom Patchouli component that draws a rotating circle of items. + * Size is 80x80. For a centered one, set X to -1. + * For usage with a specified list of items, see {@link RotatingItemListComponent}. + * For usage with a runic altar or petal apothecary recipes, see {@link RotatingRecipeComponent}. + */ +abstract class RotatingItemListComponentBase implements ICustomComponent { + protected transient List ingredients; + protected transient int x, y; + + @Override + public void build(int componentX, int componentY, int pageNum) { + this.x = componentX != -1 ? componentX : 17; + this.y = componentY; + this.ingredients = makeIngredients(); + } + + protected abstract List makeIngredients(); + + @Override + public void render(IComponentRenderContext context, float pticks, int mouseX, int mouseY) { + int degreePerInput = (int) (360F / ingredients.size()); + int ticksElapsed = PatchouliUtils.getBookTicksElapsed(context); + + float currentDegree = ConfigHandler.CLIENT.lexiconRotatingItems.get() + ? Screen.hasShiftDown() + ? ticksElapsed + : ticksElapsed + pticks + : 0; + + for(Ingredient input : ingredients) { + renderIngredientAtAngle(context, currentDegree, input, mouseX, mouseY); + + currentDegree += degreePerInput; + } + } + + private void renderIngredientAtAngle(IComponentRenderContext context, float angle, Ingredient ingredient, int mouseX, int mouseY) { + if(ingredient.hasNoMatchingItems()) + return; + + angle -= 90; + int radius = 32; + double xPos = x + Math.cos(angle * Math.PI / 180D) * radius + 32; + double yPos = y + Math.sin(angle * Math.PI / 180D) * radius + 32; + + GlStateManager.pushMatrix(); // This translation makes it not stuttery. It does not affect the tooltip as that is drawn separately later. + GlStateManager.translated(xPos - (int) xPos, yPos - (int) yPos, 0); + context.renderIngredient((int) xPos, (int) yPos, mouseX, mouseY, ingredient); + GlStateManager.popMatrix(); + } + +} diff --git a/src/main/java/vazkii/botania/client/patchouli/component/RotatingRecipeComponent.java b/src/main/java/vazkii/botania/client/patchouli/component/RotatingRecipeComponent.java new file mode 100644 index 000000000..cc80f698f --- /dev/null +++ b/src/main/java/vazkii/botania/client/patchouli/component/RotatingRecipeComponent.java @@ -0,0 +1,48 @@ +/** + * This class was created by . It's 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 + * + * File Created @ [Sep 20 2019, 8:49 PM (GMT)] + */ +package vazkii.botania.client.patchouli.component; + +import com.google.gson.annotations.SerializedName; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.ResourceLocation; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.recipe.IModRecipe; +import vazkii.patchouli.api.VariableHolder; + +import java.util.List; +import java.util.Map; + +/** + * Patchouli custom component that draws a rotating circle of items from the defined recipe. + */ +public class RotatingRecipeComponent extends RotatingItemListComponentBase { + @VariableHolder + @SerializedName("recipe_name") + public String recipeName; + + @VariableHolder + @SerializedName("recipe_type") + public String recipeType; + + @Override + protected List makeIngredients() { + Map map; + if("runic_altar".equals(recipeType)) { + map = BotaniaAPI.runeAltarRecipes; + } else if("petal_apothecary".equals(recipeType)) { + map = BotaniaAPI.petalRecipes; + } else { + throw new IllegalArgumentException("Type must be 'runic_altar' or 'petal_apothecary'!"); + } + IModRecipe recipe = map.get(new ResourceLocation(recipeName)); + return recipe.getInputs(); + } +} diff --git a/src/main/java/vazkii/botania/client/patchouli/component/TerraPlateComponent.java b/src/main/java/vazkii/botania/client/patchouli/component/TerraPlateComponent.java new file mode 100644 index 000000000..53783fa13 --- /dev/null +++ b/src/main/java/vazkii/botania/client/patchouli/component/TerraPlateComponent.java @@ -0,0 +1,76 @@ +/** + * This class was created by . It's 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 + * + * File Created @ [Sep 24 2019, 2:31 PM (GMT)] + */ +package vazkii.botania.client.patchouli.component; + +import com.mojang.blaze3d.platform.GlStateManager; +import net.minecraft.item.ItemStack; +import vazkii.patchouli.api.IComponentRenderContext; +import vazkii.patchouli.api.ICustomComponent; +import vazkii.patchouli.api.PatchouliAPI; +import vazkii.patchouli.api.VariableHolder; + +/** + * Patchouli custom component that draws provided stacks arranged like the Terrestial Agglomeration Plate multiblock. + * Size is 43 x 31. + * Parameters: corner, center, edge, plate can be provided to override default blocks. + */ +public class TerraPlateComponent implements ICustomComponent { + @VariableHolder + public String corner = "botania:livingrock"; + @VariableHolder + public String center = "botania:livingrock"; + @VariableHolder + public String edge = "minecraft:lapis_block"; + @VariableHolder + public String plate = "botania:terra_plate"; + + private transient int x, y; + private transient ItemStack cornerBlock, centerBlock, middleBlock, plateBlock; + + @Override + public void build(int componentX, int componentY, int pageNum) { + this.x = componentX; + this.y = componentY; + this.cornerBlock = PatchouliAPI.instance.deserializeItemStack(corner); + this.centerBlock = PatchouliAPI.instance.deserializeItemStack(center); + this.middleBlock = PatchouliAPI.instance.deserializeItemStack(edge); + this.plateBlock = PatchouliAPI.instance.deserializeItemStack(plate); + } + + @Override + public void render(IComponentRenderContext context, float pticks, int mouseX, int mouseY) { + GlStateManager.pushMatrix(); + GlStateManager.translatef(0F, 0F, -10.0f); + context.renderItemStack(x + 13, y + 1, mouseX, mouseY, cornerBlock); + + GlStateManager.translatef(0F, 0F, 5F); + context.renderItemStack(x + 20, y + 4, mouseX, mouseY, middleBlock); + context.renderItemStack(x + 7, y + 4, mouseX, mouseY, middleBlock); + + GlStateManager.translatef(0F, 0F, 5F); + context.renderItemStack(x + 13, y + 8, mouseX, mouseY, cornerBlock); + context.renderItemStack(x + 27, y + 8, mouseX, mouseY, centerBlock); + context.renderItemStack(x, y + 8, mouseX, mouseY, cornerBlock); + + GlStateManager.translatef(0F, 0F, 5F); + context.renderItemStack(x + 7, y + 12, mouseX, mouseY, middleBlock); + context.renderItemStack(x + 20, y + 12, mouseX, mouseY, middleBlock); + + GlStateManager.translatef(0F, 0F, 5F); + context.renderItemStack(x + 14, y + 15, mouseX, mouseY, cornerBlock); + + GlStateManager.translatef(0F, 0F, 5F); + context.renderItemStack(x + 13, y, mouseX, mouseY, plateBlock); + GlStateManager.translatef(0F, 0F, -10.0f); + + GlStateManager.popMatrix(); + } +} diff --git a/src/main/java/vazkii/botania/client/patchouli/processor/BrewRecipeProcessor.java b/src/main/java/vazkii/botania/client/patchouli/processor/BrewRecipeProcessor.java new file mode 100644 index 000000000..24a286b7f --- /dev/null +++ b/src/main/java/vazkii/botania/client/patchouli/processor/BrewRecipeProcessor.java @@ -0,0 +1,55 @@ +/** + * This class was created by . It's 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 + * + * File Created @ [Sep 22 2019, 7:03 PM (GMT)] + */ +package vazkii.botania.client.patchouli.processor; + +import net.minecraft.client.resources.I18n; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.recipe.RecipeBrew; +import vazkii.botania.common.item.ModItems; +import vazkii.patchouli.api.IComponentProcessor; +import vazkii.patchouli.api.IVariableProvider; +import vazkii.patchouli.api.PatchouliAPI; + +public class BrewRecipeProcessor implements IComponentProcessor { + private RecipeBrew recipe; + + @Override + public void setup(IVariableProvider variables) { + this.recipe = BotaniaAPI.brewRecipes.get(new ResourceLocation(variables.get("recipe"))); + } + + @Override + public String process(String key) { + if(recipe == null) { + return null; + } else if(key.equals("heading")) { + return I18n.format("botaniamisc.brewOf", I18n.format(recipe.getBrew().getUnlocalizedName())); + } else if(key.equals("vial")) { + return PatchouliAPI.instance.serializeItemStack(recipe.getOutput(new ItemStack(ModItems.vial))); + } else if(key.equals("flask")) { + return PatchouliAPI.instance.serializeItemStack(recipe.getOutput(new ItemStack(ModItems.flask))); + } else if(key.startsWith("input")) { + int requestedIndex = Integer.parseInt(key.substring(5)) - 1; + int indexOffset = (6 - recipe.getInputs().size()) / 2; //Center the brew ingredients + int index = requestedIndex - indexOffset; + + if(index < recipe.getInputs().size() && index >= 0) + return PatchouliAPI.instance.serializeIngredient(recipe.getInputs().get(index)); + else + return null; + } else if(key.equals("is_offset")) { + return Boolean.toString(recipe.getInputs().size() % 2 == 0); + } + return null; + } +} diff --git a/src/main/java/vazkii/botania/client/patchouli/processor/ElvenTradeProcessor.java b/src/main/java/vazkii/botania/client/patchouli/processor/ElvenTradeProcessor.java new file mode 100644 index 000000000..ee9ff20d2 --- /dev/null +++ b/src/main/java/vazkii/botania/client/patchouli/processor/ElvenTradeProcessor.java @@ -0,0 +1,93 @@ +/** + * This class was created by . It's 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 + * + * File Created @ [Sep 09 2019, 10:20 PM (GMT)] + */ +package vazkii.botania.client.patchouli.processor; + +import com.google.common.collect.ImmutableList; +import net.minecraft.item.ItemStack; +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.patchouli.api.IComponentProcessor; +import vazkii.patchouli.api.IVariableProvider; +import vazkii.patchouli.api.PatchouliAPI; + +import java.util.List; +import java.util.stream.Collectors; + +public class ElvenTradeProcessor implements IComponentProcessor { + private List recipes; + private int longestIngredientSize, mostInputs, mostOutputs; + + @Override + public void setup(IVariableProvider variables) { + ImmutableList.Builder builder = ImmutableList.builder(); + for(String s : variables.get("recipes").split(";")) { + RecipeElvenTrade recipeElvenTrade = BotaniaAPI.elvenTradeRecipes.get(new ResourceLocation(s)); + if(recipeElvenTrade != null) { + builder.add(recipeElvenTrade); + } + } + recipes = builder.build(); + for(RecipeElvenTrade recipe : recipes) { + List inputs = recipe.getInputs(); + for(Ingredient ingredient : inputs) { + int length = ingredient.getMatchingStacks().length; + if(length > longestIngredientSize) { + longestIngredientSize = length; + } + } + if(inputs.size() > mostInputs) { + mostInputs = inputs.size(); + } + if(recipe.getOutputs().size() > mostOutputs) { + mostOutputs = recipe.getOutputs().size(); + } + } + } + + @Override + public String process(String key) { + if(recipes.isEmpty()) { + return null; + } + if(key.equals("heading")) { + return recipes.get(0).getOutputs().get(0).getDisplayName().getString(); + } else if(key.startsWith("input")) { + int index = Integer.parseInt(key.substring(5)) - 1; + if(index < mostInputs) + return interweaveIngredients(index); + else + return null; + } + if(key.startsWith("output")) { + int index = Integer.parseInt(key.substring(6)) - 1; + if(index < mostOutputs) + return recipes.stream().map(RecipeElvenTrade::getOutputs) + .map(l -> index < l.size() ? l.get(index) : ItemStack.EMPTY) + .map(PatchouliAPI.instance::serializeItemStack).collect(Collectors.joining(",")); + else + return null; + } + return null; + } + + private String interweaveIngredients(int inputIndex) { + List recipes = this.recipes.stream().map(RecipeElvenTrade::getInputs).map(ingredients -> { + if(inputIndex < ingredients.size()) { + return ingredients.get(inputIndex); + } else return Ingredient.EMPTY; + }).collect(Collectors.toList()); + return PatchouliUtils.interweaveIngredients(recipes, longestIngredientSize); + } + +} diff --git a/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java b/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java new file mode 100644 index 000000000..58c6450a7 --- /dev/null +++ b/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java @@ -0,0 +1,72 @@ +/** + * This class was created by . It's 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 + * + * File Created @ [Sep 09 2019, 9:34 PM (GMT)] + */ +package vazkii.botania.client.patchouli.processor; + +import com.google.common.collect.ImmutableList; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.recipe.RecipeManaInfusion; +import vazkii.botania.client.patchouli.PatchouliUtils; +import vazkii.patchouli.api.IComponentProcessor; +import vazkii.patchouli.api.IVariableProvider; +import vazkii.patchouli.api.PatchouliAPI; + +import java.util.List; +import java.util.stream.Collectors; + +public class ManaInfusionProcessor implements IComponentProcessor { + private List recipes; + private boolean hasCustomHeading; + + @Override + public void setup(IVariableProvider variables) { + ImmutableList.Builder builder = ImmutableList.builder(); + for(String s : variables.get("recipes").split(";")) { + RecipeManaInfusion recipe = BotaniaAPI.manaInfusionRecipes.get(new ResourceLocation(s)); + if(recipe != null) { + builder.add(recipe); + } + } + this.recipes = builder.build(); + this.hasCustomHeading = variables.has("heading"); + } + + @Override + public String process(String key) { + if(recipes.isEmpty()) { + return null; + } + switch (key) { + case "heading": + if(!hasCustomHeading) + return recipes.get(0).getOutput().getDisplayName().getString(); + return null; + case "input": + return PatchouliUtils.interweaveIngredients(recipes.stream().map(RecipeManaInfusion::getInput).collect(Collectors.toList())); + case "output": + return recipes.stream().map(RecipeManaInfusion::getOutput).map(PatchouliAPI.instance::serializeItemStack).collect(Collectors.joining(",")); + case "catalyst": + return recipes.stream().map(RecipeManaInfusion::getCatalyst) + .map(state -> { + if(state == null) + return ItemStack.EMPTY; + return new ItemStack(state.getBlock().asItem()); + }) + .map(PatchouliAPI.instance::serializeItemStack) + .collect(Collectors.joining(",")); + case "mana": + return recipes.stream().mapToInt(RecipeManaInfusion::getManaToConsume).mapToObj(Integer::toString).collect(Collectors.joining(";")); + } + return null; + } +} + diff --git a/src/main/java/vazkii/botania/client/patchouli/processor/MultiCraftingProcessor.java b/src/main/java/vazkii/botania/client/patchouli/processor/MultiCraftingProcessor.java new file mode 100644 index 000000000..ae219e6ae --- /dev/null +++ b/src/main/java/vazkii/botania/client/patchouli/processor/MultiCraftingProcessor.java @@ -0,0 +1,99 @@ +/** + * This class was created by . It's 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 + * + * File Created @ [Sep 24 2019, 6:55 PM (GMT)] + */ +package vazkii.botania.client.patchouli.processor; + +import net.minecraft.client.Minecraft; +import net.minecraft.inventory.CraftingInventory; +import net.minecraft.item.crafting.ICraftingRecipe; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.IRecipeType; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.crafting.IShapedRecipe; +import vazkii.botania.client.patchouli.PatchouliUtils; +import vazkii.botania.common.Botania; +import vazkii.patchouli.api.IComponentProcessor; +import vazkii.patchouli.api.IVariableProvider; +import vazkii.patchouli.api.PatchouliAPI; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +public class MultiCraftingProcessor implements IComponentProcessor { + private List recipes; + private boolean shapeless = true; + private int longestIngredientSize = 0; + + @Override + public void setup(IVariableProvider variables) { + Map> recipeMap = Minecraft.getInstance().world.getRecipeManager().getRecipes(IRecipeType.CRAFTING); + String[] names = variables.get("recipes").split(";"); + this.recipes = new ArrayList<>(); + for(String name : names) { + IRecipe recipe = recipeMap.get(new ResourceLocation(name)); + if(recipe != null) { + recipes.add((ICraftingRecipe) recipe); + if(shapeless) { + shapeless = !(recipe instanceof IShapedRecipe); + } + for(Ingredient ingredient : recipe.getIngredients()) { + int size = ingredient.getMatchingStacks().length; + if(longestIngredientSize < size) { + longestIngredientSize = size; + } + } + } + } + } + + @Override + public String process(String key) { + if(recipes.isEmpty()) { + return null; + } + if(key.startsWith("input")) { + int index = Integer.parseInt(key.substring(5)) - 1; + int shapedX = index % 3; + int shapedY = index / 3; + List ingredients = new ArrayList<>(); + for(ICraftingRecipe recipe : recipes) { + if(recipe instanceof IShapedRecipe) { + IShapedRecipe shaped = (IShapedRecipe) recipe; + if(shaped.getRecipeWidth() < shapedX + 1) { + ingredients.add(Ingredient.EMPTY); + } else { + if(recipe.getId().getPath().contains("floating")) { + Botania.LOGGER.error("test"); + } + int realIndex = index - (shapedY * (3 - shaped.getRecipeWidth())); + NonNullList list = recipe.getIngredients(); + ingredients.add(list.size() > realIndex ? list.get(realIndex) : Ingredient.EMPTY); + } + + } else { + NonNullList list = recipe.getIngredients(); + ingredients.add(list.size() > index ? list.get(index) : Ingredient.EMPTY); + } + } + return PatchouliUtils.interweaveIngredients(ingredients, longestIngredientSize); + } + if(key.equals("output")) { + return recipes.stream().map(IRecipe::getRecipeOutput).map(PatchouliAPI.instance::serializeItemStack).collect(Collectors.joining(",")); + } + if(key.equals("shapeless")) { + return Boolean.toString(shapeless); + } + return null; + } +} diff --git a/src/main/java/vazkii/botania/client/patchouli/processor/PetalApothecaryProcessor.java b/src/main/java/vazkii/botania/client/patchouli/processor/PetalApothecaryProcessor.java new file mode 100644 index 000000000..632a650af --- /dev/null +++ b/src/main/java/vazkii/botania/client/patchouli/processor/PetalApothecaryProcessor.java @@ -0,0 +1,43 @@ +/** + * This class was created by . It's 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 + * + * File Created @ [Sep 10 2019, 9:32 PM (GMT)] + */ +package vazkii.botania.client.patchouli.processor; + +import net.minecraft.util.ResourceLocation; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.recipe.IModRecipe; +import vazkii.patchouli.api.IComponentProcessor; +import vazkii.patchouli.api.IVariableProvider; +import vazkii.patchouli.api.PatchouliAPI; + +public class PetalApothecaryProcessor implements IComponentProcessor { + protected IModRecipe recipe; + + @Override + public void setup(IVariableProvider variables) { + this.recipe = BotaniaAPI.petalRecipes.get(new ResourceLocation(variables.get("recipe"))); + } + + @Override + public String process(String key) { + if(recipe == null) { + return null; + } + switch (key) { + case "recipe": + return recipe.getId().toString(); + case "output": + return PatchouliAPI.instance.serializeItemStack(recipe.getOutput()); + case "heading": + return recipe.getOutput().getDisplayName().getString(); + } + return null; + } +} diff --git a/src/main/java/vazkii/botania/client/patchouli/processor/RunicAltarProcessor.java b/src/main/java/vazkii/botania/client/patchouli/processor/RunicAltarProcessor.java new file mode 100644 index 000000000..345722d37 --- /dev/null +++ b/src/main/java/vazkii/botania/client/patchouli/processor/RunicAltarProcessor.java @@ -0,0 +1,30 @@ +/** + * This class was created by . It's 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 + * + * File Created @ [Sep 10 2019, 9:52 AM (GMT)] + */ +package vazkii.botania.client.patchouli.processor; + +import net.minecraft.util.ResourceLocation; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.recipe.RecipeRuneAltar; +import vazkii.patchouli.api.IVariableProvider; + +public class RunicAltarProcessor extends PetalApothecaryProcessor { + @Override + public void setup(IVariableProvider variables) { + this.recipe = BotaniaAPI.runeAltarRecipes.get(new ResourceLocation(variables.get("recipe"))); + } + + @Override + public String process(String key) { + if(key.equals("mana")) + return String.valueOf(((RecipeRuneAltar) recipe).getManaUsage()); + return super.process(key); + } +} diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 0a99ce5c8..724e10b31 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -54,6 +54,8 @@ import vazkii.botania.common.lib.LibLexicon; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.ResourceLocationHelper; +import java.io.File; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -967,8 +969,8 @@ public final class LexiconData { laputaShard = new AlfheimLexiconEntry(LibLexicon.TOOL_LAPUTA_SHARD, categoryTools); laputaShard.setLexiconPages(new PageText("0"), new PageText("2"), - new PageCraftingRecipe("1", inGroup("laputashard_upgrade").negate(), ModItems.laputaShard), - new PageCraftingRecipe("3", inGroup("laputashard_upgrade"), ModItems.laputaShard)); + new PageCraftingRecipe("1", inGroup("laputa_shard_upgrade").negate(), ModItems.laputaShard), + new PageCraftingRecipe("3", inGroup("laputa_shard_upgrade"), ModItems.laputaShard)); virus = new AlfheimLexiconEntry(LibLexicon.TOOL_VIRUS, categoryTools); virus.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModItems.necroVirus), @@ -1110,8 +1112,8 @@ public final class LexiconData { flightTiara = new AlfheimLexiconEntry(LibLexicon.ENDER_FLIGHT_TIARA, categoryEnder); flightTiara.setLexiconPages(new PageText("0"), new PageText("4"), new PageText("5"), new PageText("6"), - new PageCraftingRecipe("1", inGroup("flighttiara_wings").negate(), ModItems.flightTiara), new PageText("2"), - new PageCraftingRecipe("3", inGroup("flighttiara_wings"), ModItems.flightTiara)); + new PageCraftingRecipe("1", inGroup("flight_tiara_wings").negate(), ModItems.flightTiara), new PageText("2"), + new PageCraftingRecipe("3", inGroup("flight_tiara_wings"), ModItems.flightTiara)); corporea = new AlfheimLexiconEntry(LibLexicon.ENDER_CORPOREA, categoryEnder); corporea.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), @@ -1456,10 +1458,15 @@ public final class LexiconData { } Botania.LOGGER.info("Reloaded lexicon in {}", stopwatch.stop()); - Botania.LOGGER.info("Dumping lexicon entries"); - for (LexiconEntry e : BotaniaAPI.getAllEntries()) { - e.dump(); - } + File dir = Paths.get(".", "entries").toFile(); + if(!dir.exists()) { + Botania.LOGGER.info("Dumping lexicon entries"); + for (LexiconEntry e : BotaniaAPI.getAllEntries()) { + e.dump(); + } + } else { + Botania.LOGGER.info("Preexisting file {}, aborting lexicon dump", dir.getAbsolutePath()); + } } private static Predicate> GOG_RECIPE = recipe -> recipe.getId().getPath().contains("garden_of_glass"); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java index 294275c93..ca56bb1e2 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java @@ -36,7 +36,7 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage { private static final RecipeBrew DUMMY = new RecipeBrew(new ResourceLocation(LibMisc.MOD_ID, "dummy"), BotaniaAPI.fallbackBrew); public final RecipeBrew recipe; - private String text; + public String text; public PageBrew(Brew brew, String unlocalizedName, String bottomText) { super(bottomText); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index ecbfb2662..ba2465eb2 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -179,7 +179,7 @@ public class PageCraftingRecipe extends PageRecipe { } } if(list.isEmpty()) { - Botania.LOGGER.info("Could not find mana infusion recipes for items {}, using dummy", (Object) this.outputItems); + Botania.LOGGER.info("Could not find crafting recipes for items {}, using dummy for {}", (Object) this.outputItems, this.unlocalizedName); return DUMMY; } else { list.sort((r1, r2) -> { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index 6269a3a7f..346f5258e 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -189,7 +189,7 @@ public class PageManaInfusionRecipe extends PageRecipe { } } if(list.isEmpty()) { - Botania.LOGGER.warn("Could not find mana infusion recipes for items {}, using dummy", (Object) outputItems); + Botania.LOGGER.warn("Could not find mana infusion recipes for items {}, using dummy for {}", (Object) outputItems, this.unlocalizedName); return DUMMY; } else { list.sort((r1, r2) -> { diff --git a/src/main/resources/assets/botania/textures/gui/entries/elven_garde_left.png b/src/main/resources/assets/botania/textures/gui/entries/elven_garde_left.png new file mode 100644 index 000000000..b5acf0da4 Binary files /dev/null and b/src/main/resources/assets/botania/textures/gui/entries/elven_garde_left.png differ diff --git a/src/main/resources/assets/botania/textures/gui/paper_left.png b/src/main/resources/assets/botania/textures/gui/paper_left.png new file mode 100644 index 000000000..65fc58a10 Binary files /dev/null and b/src/main/resources/assets/botania/textures/gui/paper_left.png differ diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/elf_message.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/elf_message.json index 659432c41..a18298e0f 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/elf_message.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/elf_message.json @@ -5,35 +5,38 @@ "priority": true, "pages": [ { - "type": "image", - "text": "botania.page.elfMessage0", - "images": [ - "botania:textures/gui/entries/elven_garde.png" - ] + "type": "lore_page", + "elven_garde": "true" }, { - "type": "text", - "text": "botania.page.elfMessage1" + "type": "lore_page", + "text": "botania.page.elfMessage1", + "right_side": "true" }, { - "type": "text", - "text": "botania.page.elfMessage2" + "type": "lore_page", + "text": "botania.page.elfMessage2", + "left_side": "true" }, { - "type": "text", - "text": "botania.page.elfMessage3" + "type": "lore_page", + "text": "botania.page.elfMessage3", + "right_side": "true" }, { - "type": "text", - "text": "botania.page.elfMessage4" + "type": "lore_page", + "text": "botania.page.elfMessage4", + "left_side": "true" }, { - "type": "text", - "text": "botania.page.elfMessage5" + "type": "lore_page", + "text": "botania.page.elfMessage5", + "right_side": "true" }, { - "type": "text", - "text": "botania.page.elfMessage6" + "type": "lore_page", + "text": "botania.page.elfMessage6", + "left_side": "true" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/elf_resources.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/elf_resources.json index 9c6eae672..edf864376 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/elf_resources.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/elf_resources.json @@ -11,9 +11,7 @@ { "type": "elven_trade", "text": "botania.page.elfResources1", - "recipes": [ - "botania:dreamwood" - ] + "recipes": "botania:dreamwood" }, { "type": "text", @@ -27,25 +25,17 @@ { "type": "elven_trade", "text": "botania.page.elfResources3", - "recipes": [ - "botania:elementium", - "botania:elementium_block" - ] + "recipes": "botania:elementium;botania:elementium_block" }, { "type": "elven_trade", "text": "botania.page.elfResources4", - "recipes": [ - "botania:pixie_dust" - ] + "recipes": "botania:pixie_dust" }, { "type": "elven_trade", "text": "botania.page.elfResources5", - "recipes": [ - "botania:dragonstone", - "botania:dragonstone_block" - ] + "recipes": "botania:dragonstone;botania:dragonstone_block" }, { "type": "text", @@ -54,9 +44,7 @@ { "type": "elven_trade", "text": "botania.page.elfResources7", - "recipes": [ - "botania:elf_quartz" - ] + "recipes": "botania:elf_quartz" }, { "type": "text", @@ -65,9 +53,7 @@ { "type": "elven_trade", "text": "botania.page.elfResources9", - "recipes": [ - "botania:elf_glass" - ] + "recipes": "botania:elf_glass" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/elven_lore.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/elven_lore.json index fc1a6f3cf..dca33f761 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/elven_lore.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/elven_lore.json @@ -8,31 +8,31 @@ "text": "botania.page.elvenLore0" }, { - "type": "text", + "type": "lore_page", "text": "botania.page.elvenLore1" }, { - "type": "text", + "type": "lore_page", "text": "botania.page.elvenLore2" }, { - "type": "text", + "type": "lore_page", "text": "botania.page.elvenLore3" }, { - "type": "text", + "type": "lore_page", "text": "botania.page.elvenLore4" }, { - "type": "text", + "type": "lore_page", "text": "botania.page.elvenLore5" }, { - "type": "text", + "type": "lore_page", "text": "botania.page.elvenLore6" }, { - "type": "text", + "type": "lore_page", "text": "botania.page.elvenLore7" } ] diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/flowers.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/flowers.json index 5fbbad4f4..e4d7c243a 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/flowers.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/flowers.json @@ -22,24 +22,7 @@ { "type": "crafting_multi", "text": "botania.page.flowers3", - "recipes": [ - "botania:petal_white", - "botania:petal_orange", - "botania:petal_magenta", - "botania:petal_light_blue", - "botania:petal_yellow", - "botania:petal_lime", - "botania:petal_pink", - "botania:petal_gray", - "botania:petal_silver", - "botania:petal_cyan", - "botania:petal_purple", - "botania:petal_blue", - "botania:petal_brown", - "botania:petal_green", - "botania:petal_red", - "botania:petal_black" - ] + "recipes": "botania:petal_white;botania:petal_orange;botania:petal_magenta;botania:petal_light_blue;botania:petal_yellow;botania:petal_lime;botania:petal_pink;botania:petal_gray;botania:petal_silver;botania:petal_cyan;botania:petal_purple;botania:petal_blue;botania:petal_brown;botania:petal_green;botania:petal_red;botania:petal_black" }, { "type": "crafting", @@ -49,24 +32,7 @@ { "type": "crafting_multi", "text": "botania.page.flowers5", - "recipes": [ - "botania:dye_white", - "botania:dye_orange", - "botania:dye_magenta", - "botania:dye_light_blue", - "botania:dye_yellow", - "botania:dye_lime", - "botania:dye_pink", - "botania:dye_gray", - "botania:dye_silver", - "botania:dye_cyan", - "botania:dye_purple", - "botania:dye_blue", - "botania:dye_brown", - "botania:dye_green", - "botania:dye_red", - "botania:dye_black" - ] + "recipes": "botania:dye_white;botania:dye_orange;botania:dye_magenta;botania:dye_light_blue;botania:dye_yellow;botania:dye_lime;botania:dye_pink;botania:dye_gray;botania:dye_silver;botania:dye_cyan;botania:dye_purple;botania:dye_blue;botania:dye_brown;botania:dye_green;botania:dye_red;botania:dye_black" }, { "type": "text", @@ -93,67 +59,17 @@ { "type": "crafting_multi", "text": "botania.page.flowers11", - "recipes": [ - "botania:petal_white_double", - "botania:petal_orange_double", - "botania:petal_magenta_double", - "botania:petal_light_blue_double", - "botania:petal_yellow_double", - "botania:petal_lime_double", - "botania:petal_pink_double", - "botania:petal_gray_double", - "botania:petal_silver_double", - "botania:petal_cyan_double", - "botania:petal_purple_double", - "botania:petal_blue_double", - "botania:petal_brown_double", - "botania:petal_green_double", - "botania:petal_red_double", - "botania:petal_black_double" - ] + "recipes": "botania:petal_white_double;botania:petal_orange_double;botania:petal_magenta_double;botania:petal_light_blue_double;botania:petal_yellow_double;botania:petal_lime_double;botania:petal_pink_double;botania:petal_gray_double;botania:petal_silver_double;botania:petal_cyan_double;botania:petal_purple_double;botania:petal_blue_double;botania:petal_brown_double;botania:petal_green_double;botania:petal_red_double;botania:petal_black_double" }, { "type": "crafting_multi", "text": "botania.page.flowers9", - "recipes": [ - "botania:white_petal_block", - "botania:orange_petal_block", - "botania:magenta_petal_block", - "botania:light_blue_petal_block", - "botania:yellow_petal_block", - "botania:lime_petal_block", - "botania:pink_petal_block", - "botania:gray_petal_block", - "botania:light_gray_petal_block", - "botania:cyan_petal_block", - "botania:purple_petal_block", - "botania:blue_petal_block", - "botania:brown_petal_block", - "botania:green_petal_block", - "botania:red_petal_block", - "botania:black_petal_block" - ] + "recipes": "botania:white_petal_block;botania:orange_petal_block;botania:magenta_petal_block;botania:light_blue_petal_block;botania:yellow_petal_block;botania:lime_petal_block;botania:pink_petal_block;botania:gray_petal_block;botania:light_gray_petal_block;botania:cyan_petal_block;botania:purple_petal_block;botania:blue_petal_block;botania:brown_petal_block;botania:green_petal_block;botania:red_petal_block;botania:black_petal_block" }, { "type": "crafting_multi", "text": "botania.page.flowers13", - "recipes": [ - "botania:conversions/orange_petal_block_deconstruct", - "botania:conversions/magenta_petal_block_deconstruct", - "botania:conversions/light_blue_petal_block_deconstruct", - "botania:conversions/yellow_petal_block_deconstruct", - "botania:conversions/lime_petal_block_deconstruct", - "botania:conversions/pink_petal_block_deconstruct", - "botania:conversions/gray_petal_block_deconstruct", - "botania:conversions/silver_petal_block_deconstruct", - "botania:conversions/cyan_petal_block_deconstruct", - "botania:conversions/purple_petal_block_deconstruct", - "botania:conversions/blue_petal_block_deconstruct", - "botania:conversions/brown_petal_block_deconstruct", - "botania:conversions/green_petal_block_deconstruct", - "botania:conversions/red_petal_block_deconstruct", - "botania:conversions/black_petal_block_deconstruct" - ] + "recipes": "botania:conversions/white_petal_block_deconstruct;botania:conversions/orange_petal_block_deconstruct;botania:conversions/magenta_petal_block_deconstruct;botania:conversions/light_blue_petal_block_deconstruct;botania:conversions/yellow_petal_block_deconstruct;botania:conversions/lime_petal_block_deconstruct;botania:conversions/pink_petal_block_deconstruct;botania:conversions/gray_petal_block_deconstruct;botania:conversions/silver_petal_block_deconstruct;botania:conversions/cyan_petal_block_deconstruct;botania:conversions/purple_petal_block_deconstruct;botania:conversions/blue_petal_block_deconstruct;botania:conversions/brown_petal_block_deconstruct;botania:conversions/green_petal_block_deconstruct;botania:conversions/red_petal_block_deconstruct;botania:conversions/black_petal_block_deconstruct" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/pure_daisy.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/pure_daisy.json index c4348c1ce..1c9667463 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/pure_daisy.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/pure_daisy.json @@ -27,9 +27,7 @@ { "type": "petal_apothecary", "text": "botania.page.pureDaisy3", - "recipes": [ - "botania:pure_daisy" - ] + "recipe": "botania:pure_daisy" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/rune_altar.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/rune_altar.json index 8db08fb30..e47b70b87 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/rune_altar.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/rune_altar.json @@ -36,114 +36,82 @@ { "type": "runic_altar", "text": "botania.page.runeAltar4", - "recipes": [ - "botania:water" - ] + "recipe": "botania:water" }, { "type": "runic_altar", "text": "botania.page.runeAltar5", - "recipes": [ - "botania:earth" - ] + "recipe": "botania:earth" }, { "type": "runic_altar", "text": "botania.page.runeAltar6", - "recipes": [ - "botania:air" - ] + "recipe": "botania:air" }, { "type": "runic_altar", "text": "botania.page.runeAltar7", - "recipes": [ - "botania:fire" - ] + "recipe": "botania:fire" }, { "type": "runic_altar", "text": "botania.page.runeAltar8", - "recipes": [ - "botania:spring" - ] + "recipe": "botania:spring" }, { "type": "runic_altar", "text": "botania.page.runeAltar9", - "recipes": [ - "botania:summer" - ] + "recipe": "botania:summer" }, { "type": "runic_altar", "text": "botania.page.runeAltar10", - "recipes": [ - "botania:autumn" - ] + "recipe": "botania:autumn" }, { "type": "runic_altar", "text": "botania.page.runeAltar11", - "recipes": [ - "botania:winter" - ] + "recipe": "botania:winter" }, { "type": "runic_altar", "text": "botania.page.runeAltar12", - "recipes": [ - "botania:mana" - ] + "recipe": "botania:mana" }, { "type": "runic_altar", "text": "botania.page.runeAltar13", - "recipes": [ - "botania:lust" - ] + "recipe": "botania:lust" }, { "type": "runic_altar", "text": "botania.page.runeAltar14", - "recipes": [ - "botania:gluttony" - ] + "recipe": "botania:gluttony" }, { "type": "runic_altar", "text": "botania.page.runeAltar15", - "recipes": [ - "botania:greed" - ] + "recipe": "botania:greed" }, { "type": "runic_altar", "text": "botania.page.runeAltar16", - "recipes": [ - "botania:sloth" - ] + "recipe": "botania:sloth" }, { "type": "runic_altar", "text": "botania.page.runeAltar17", - "recipes": [ - "botania:wrath" - ] + "recipe": "botania:wrath" }, { "type": "runic_altar", "text": "botania.page.runeAltar18", - "recipes": [ - "botania:envy" - ] + "recipe": "botania:envy" }, { "type": "runic_altar", "text": "botania.page.runeAltar19", - "recipes": [ - "botania:pride" - ] + "recipe": "botania:pride" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/terrasteel.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/terrasteel.json index 9a951f7c4..7886b8f89 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/terrasteel.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/terrasteel.json @@ -19,11 +19,11 @@ { "type": "multiblock", "multiblock_id": "botania:terra_plate", - "symmetrical": true, - "text": "botania.page.terrasteel4" + "text": "botania.page.terrasteel4", + "symmetrical": true }, { - "type": "tmp_terrasteel", + "type": "terrasteel", "text": "botania.page.terrasteel3" } ] diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/wand.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/wand.json index fa03d00fd..1b02a0643 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/wand.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/wand.json @@ -19,264 +19,7 @@ { "type": "crafting_multi", "text": "botania.page.wand3", - "recipes": [ - "botania:wands/twigwand_magenta_lime", - "botania:wands/twigwand_purple_green", - "botania:wands/twigwand_orange_pink", - "botania:wands/twigwand_orange_green", - "botania:wands/twigwand_brown_red", - "botania:wands/twigwand_blue_silver", - "botania:wands/twigwand_light_blue_light_blue", - "botania:wands/twigwand_light_blue_silver", - "botania:wands/twigwand_light_blue_magenta", - "botania:wands/twigwand_magenta_blue", - "botania:wands/twigwand_silver_magenta", - "botania:wands/twigwand_purple_purple", - "botania:wands/twigwand_white_green", - "botania:wands/twigwand_green_magenta", - "botania:wands/twigwand_gray_silver", - "botania:wands/twigwand_lime_cyan", - "botania:wands/twigwand_green_silver", - "botania:wands/twigwand_orange_blue", - "botania:wands/twigwand_blue_light_blue", - "botania:wands/twigwand_cyan_pink", - "botania:wands/twigwand_yellow_orange", - "botania:wands/twigwand_purple_orange", - "botania:wands/twigwand_purple_black", - "botania:wands/twigwand_yellow_pink", - "botania:wands/twigwand_green_lime", - "botania:wands/twigwand_red_light_blue", - "botania:wands/twigwand_white_yellow", - "botania:wands/twigwand_cyan_magenta", - "botania:wands/twigwand_silver_cyan", - "botania:wands/twigwand_lime_red", - "botania:wands/twigwand_white_purple", - "botania:wands/twigwand_yellow_red", - "botania:wands/twigwand_orange_cyan", - "botania:wands/twigwand_silver_light_blue", - "botania:wands/twigwand_white_red", - "botania:wands/twigwand_green_blue", - "botania:wands/twigwand_silver_yellow", - "botania:wands/twigwand_red_gray", - "botania:wands/twigwand_red_purple", - "botania:wands/twigwand_yellow_lime", - "botania:wands/twigwand_black_black", - "botania:wands/twigwand_blue_brown", - "botania:wands/twigwand_pink_white", - "botania:wands/twigwand_cyan_cyan", - "botania:wands/twigwand_yellow_blue", - "botania:wands/twigwand_purple_gray", - "botania:wands/twigwand_red_magenta", - "botania:wands/twigwand_light_blue_black", - "botania:wands/twigwand_yellow_purple", - "botania:wands/twigwand_purple_red", - "botania:wands/twigwand_blue_green", - "botania:wands/twigwand_pink_gray", - "botania:wands/twigwand_green_pink", - "botania:wands/twigwand_black_cyan", - "botania:wands/twigwand_light_blue_red", - "botania:wands/twigwand_gray_light_blue", - "botania:wands/twigwand_light_blue_green", - "botania:wands/twigwand_cyan_light_blue", - "botania:wands/twigwand_brown_gray", - "botania:wands/twigwand_silver_red", - "botania:wands/twigwand_black_brown", - "botania:wands/twigwand_blue_black", - "botania:wands/twigwand_cyan_orange", - "botania:wands/twigwand_silver_orange", - "botania:wands/twigwand_light_blue_gray", - "botania:wands/twigwand_silver_purple", - "botania:wands/twigwand_magenta_magenta", - "botania:wands/twigwand_pink_cyan", - "botania:wands/twigwand_magenta_purple", - "botania:wands/twigwand_orange_white", - "botania:wands/twigwand_blue_lime", - "botania:wands/twigwand_gray_red", - "botania:wands/twigwand_black_magenta", - "botania:wands/twigwand_white_gray", - "botania:wands/twigwand_brown_white", - "botania:wands/twigwand_blue_blue", - "botania:wands/twigwand_blue_white", - "botania:wands/twigwand_green_white", - "botania:wands/twigwand_light_blue_brown", - "botania:wands/twigwand_green_cyan", - "botania:wands/twigwand_green_orange", - "botania:wands/twigwand_cyan_red", - "botania:wands/twigwand_green_purple", - "botania:wands/twigwand_white_light_blue", - "botania:wands/twigwand_pink_magenta", - "botania:wands/twigwand_lime_lime", - "botania:wands/twigwand_black_green", - "botania:wands/twigwand_orange_light_blue", - "botania:wands/twigwand_green_red", - "botania:wands/twigwand_pink_silver", - "botania:wands/twigwand_cyan_yellow", - "botania:wands/twigwand_brown_blue", - "botania:wands/twigwand_blue_red", - "botania:wands/twigwand_orange_magenta", - "botania:wands/twigwand_silver_lime", - "botania:wands/twigwand_brown_silver", - "botania:wands/twigwand_lime_blue", - "botania:wands/twigwand_blue_pink", - "botania:wands/twigwand_lime_silver", - "botania:wands/twigwand_magenta_gray", - "botania:wands/twigwand_brown_lime", - "botania:wands/twigwand_red_orange", - "botania:wands/twigwand_orange_red", - "botania:wands/twigwand_magenta_silver", - "botania:wands/twigwand_purple_brown", - "botania:wands/twigwand_orange_lime", - "botania:wands/twigwand_orange_black", - "botania:wands/twigwand_white_orange", - "botania:wands/twigwand_silver_blue", - "botania:wands/twigwand_pink_purple", - "botania:wands/twigwand_lime_purple", - "botania:wands/twigwand_orange_brown", - "botania:wands/twigwand_lime_magenta", - "botania:wands/twigwand_lime_pink", - "botania:wands/twigwand_purple_yellow", - "botania:wands/twigwand_silver_silver", - "botania:wands/twigwand_green_green", - "botania:wands/twigwand_brown_green", - "botania:wands/twigwand_gray_gray", - "botania:wands/twigwand_silver_pink", - "botania:wands/twigwand_red_yellow", - "botania:wands/twigwand_yellow_cyan", - "botania:wands/twigwand_blue_magenta", - "botania:wands/twigwand_black_white", - "botania:wands/twigwand_blue_cyan", - "botania:wands/twigwand_pink_brown", - "botania:wands/twigwand_brown_orange", - "botania:wands/twigwand_yellow_black", - "botania:wands/twigwand_yellow_silver", - "botania:wands/twigwand_lime_gray", - "botania:wands/twigwand_brown_black", - "botania:wands/twigwand_green_black", - "botania:wands/twigwand_gray_orange", - "botania:wands/twigwand_red_red", - "botania:wands/twigwand_yellow_gray", - "botania:wands/twigwand_silver_gray", - "botania:wands/twigwand_lime_orange", - "botania:wands/twigwand_pink_lime", - "botania:wands/twigwand_green_yellow", - "botania:wands/twigwand_silver_black", - "botania:wands/twigwand_gray_purple", - "botania:wands/twigwand_light_blue_yellow", - "botania:wands/twigwand_brown_pink", - "botania:wands/twigwand_blue_yellow", - "botania:wands/twigwand_brown_brown", - "botania:wands/twigwand_lime_green", - "botania:wands/twigwand_green_brown", - "botania:wands/twigwand_white_silver", - "botania:wands/twigwand_pink_blue", - "botania:wands/twigwand_blue_purple", - "botania:wands/twigwand_pink_black", - "botania:wands/twigwand_magenta_red", - "botania:wands/twigwand_yellow_brown", - "botania:wands/twigwand_brown_magenta", - "botania:wands/twigwand_magenta_brown", - "botania:wands/twigwand_brown_purple", - "botania:wands/twigwand_gray_yellow", - "botania:wands/twigwand_cyan_gray", - "botania:wands/twigwand_purple_cyan", - "botania:wands/twigwand_light_blue_orange", - "botania:wands/twigwand_purple_magenta", - "botania:wands/twigwand_light_blue_purple", - "botania:wands/twigwand_lime_black", - "botania:wands/twigwand_silver_brown", - "botania:wands/twigwand_black_gray", - "botania:wands/twigwand_silver_green", - "botania:wands/twigwand_light_blue_blue", - "botania:wands/twigwand_magenta_yellow", - "botania:wands/twigwand_green_light_blue", - "botania:wands/twigwand_magenta_green", - "botania:wands/twigwand_brown_light_blue", - "botania:wands/twigwand_lime_brown", - "botania:wands/twigwand_light_blue_lime", - "botania:wands/twigwand_pink_green", - "botania:wands/twigwand_brown_yellow", - "botania:wands/twigwand_pink_pink", - "botania:wands/twigwand_red_cyan", - "botania:wands/twigwand_gray_white", - "botania:wands/twigwand_purple_pink", - "botania:wands/twigwand_cyan_white", - "botania:wands/twigwand_brown_cyan", - "botania:wands/twigwand_blue_orange", - "botania:wands/twigwand_orange_silver", - "botania:wands/twigwand_purple_silver", - "botania:wands/twigwand_orange_gray", - "botania:wands/twigwand_black_yellow", - "botania:wands/twigwand_red_silver", - "botania:wands/twigwand_light_blue_pink", - "botania:wands/twigwand_yellow_green", - "botania:wands/twigwand_pink_orange", - "botania:wands/twigwand_pink_light_blue", - "botania:wands/twigwand_magenta_black", - "botania:wands/twigwand_red_white", - "botania:wands/twigwand_lime_yellow", - "botania:wands/twigwand_gray_black", - "botania:wands/twigwand_black_blue", - "botania:wands/twigwand_green_gray", - "botania:wands/twigwand_lime_light_blue", - "botania:wands/twigwand_white_cyan", - "botania:wands/twigwand_gray_blue", - "botania:wands/twigwand_magenta_orange", - "botania:wands/twigwand_magenta_light_blue", - "botania:wands/twigwand_orange_purple", - "botania:wands/twigwand_yellow_light_blue", - "botania:wands/twigwand_purple_light_blue", - "botania:wands/twigwand_black_lime", - "botania:wands/twigwand_gray_magenta", - "botania:wands/twigwand_purple_white", - "botania:wands/twigwand_gray_pink", - "botania:wands/twigwand_white_brown", - "botania:wands/twigwand_black_orange", - "botania:wands/twigwand_purple_blue", - "botania:wands/twigwand_white_white", - "botania:wands/twigwand_gray_lime", - "botania:wands/twigwand_black_pink", - "botania:wands/twigwand_light_blue_white", - "botania:wands/twigwand_red_pink", - "botania:wands/twigwand_cyan_green", - "botania:wands/twigwand_purple_lime", - "botania:wands/twigwand_yellow_white", - "botania:wands/twigwand_magenta_white", - "botania:wands/twigwand_red_green", - "botania:wands/twigwand_cyan_silver", - "botania:wands/twigwand_white_magenta", - "botania:wands/twigwand_pink_yellow", - "botania:wands/twigwand_magenta_cyan", - "botania:wands/twigwand_silver_white", - "botania:wands/twigwand_white_pink", - "botania:wands/twigwand_cyan_purple", - "botania:wands/twigwand_light_blue_cyan", - "botania:wands/twigwand_gray_green", - "botania:wands/twigwand_cyan_black", - "botania:wands/twigwand_black_silver", - "botania:wands/twigwand_white_black", - "botania:wands/twigwand_black_light_blue", - "botania:wands/twigwand_magenta_pink", - "botania:wands/twigwand_orange_yellow", - "botania:wands/twigwand_red_black", - "botania:wands/twigwand_white_blue", - "botania:wands/twigwand_black_purple", - "botania:wands/twigwand_blue_gray", - "botania:wands/twigwand_cyan_lime", - "botania:wands/twigwand_pink_red", - "botania:wands/twigwand_red_lime", - "botania:wands/twigwand_black_red", - "botania:wands/twigwand_cyan_brown", - "botania:wands/twigwand_lime_white", - "botania:wands/twigwand_yellow_magenta", - "botania:wands/twigwand_white_lime", - "botania:wands/twigwand_gray_cyan", - "botania:wands/twigwand_orange_orange", - "botania:wands/twigwand_cyan_blue", - "botania:wands/twigwand_red_blue", - "botania:wands/twigwand_yellow_yellow", - "botania:wands/twigwand_gray_brown", - "botania:wands/twigwand_red_brown" - ] + "recipes": "botania:wands/twigwand_magenta_lime;botania:wands/twigwand_purple_green;botania:wands/twigwand_orange_pink;botania:wands/twigwand_orange_green;botania:wands/twigwand_brown_red;botania:wands/twigwand_blue_silver;botania:wands/twigwand_light_blue_light_blue;botania:wands/twigwand_light_blue_silver;botania:wands/twigwand_light_blue_magenta;botania:wands/twigwand_magenta_blue;botania:wands/twigwand_silver_magenta;botania:wands/twigwand_purple_purple;botania:wands/twigwand_white_green;botania:wands/twigwand_green_magenta;botania:wands/twigwand_gray_silver;botania:wands/twigwand_lime_cyan;botania:wands/twigwand_green_silver;botania:wands/twigwand_orange_blue;botania:wands/twigwand_blue_light_blue;botania:wands/twigwand_cyan_pink;botania:wands/twigwand_yellow_orange;botania:wands/twigwand_purple_orange;botania:wands/twigwand_purple_black;botania:wands/twigwand_yellow_pink;botania:wands/twigwand_green_lime;botania:wands/twigwand_red_light_blue;botania:wands/twigwand_white_yellow;botania:wands/twigwand_cyan_magenta;botania:wands/twigwand_silver_cyan;botania:wands/twigwand_lime_red;botania:wands/twigwand_white_purple;botania:wands/twigwand_yellow_red;botania:wands/twigwand_orange_cyan;botania:wands/twigwand_silver_light_blue;botania:wands/twigwand_white_red;botania:wands/twigwand_green_blue;botania:wands/twigwand_silver_yellow;botania:wands/twigwand_red_gray;botania:wands/twigwand_red_purple;botania:wands/twigwand_yellow_lime;botania:wands/twigwand_black_black;botania:wands/twigwand_blue_brown;botania:wands/twigwand_pink_white;botania:wands/twigwand_cyan_cyan;botania:wands/twigwand_yellow_blue;botania:wands/twigwand_purple_gray;botania:wands/twigwand_red_magenta;botania:wands/twigwand_light_blue_black;botania:wands/twigwand_yellow_purple;botania:wands/twigwand_purple_red;botania:wands/twigwand_blue_green;botania:wands/twigwand_pink_gray;botania:wands/twigwand_green_pink;botania:wands/twigwand_black_cyan;botania:wands/twigwand_light_blue_red;botania:wands/twigwand_gray_light_blue;botania:wands/twigwand_light_blue_green;botania:wands/twigwand_cyan_light_blue;botania:wands/twigwand_brown_gray;botania:wands/twigwand_silver_red;botania:wands/twigwand_black_brown;botania:wands/twigwand_blue_black;botania:wands/twigwand_cyan_orange;botania:wands/twigwand_silver_orange;botania:wands/twigwand_light_blue_gray;botania:wands/twigwand_silver_purple;botania:wands/twigwand_magenta_magenta;botania:wands/twigwand_pink_cyan;botania:wands/twigwand_magenta_purple;botania:wands/twigwand_orange_white;botania:wands/twigwand_blue_lime;botania:wands/twigwand_gray_red;botania:wands/twigwand_black_magenta;botania:wands/twigwand_white_gray;botania:wands/twigwand_brown_white;botania:wands/twigwand_blue_blue;botania:wands/twigwand_blue_white;botania:wands/twigwand_green_white;botania:wands/twigwand_light_blue_brown;botania:wands/twigwand_green_cyan;botania:wands/twigwand_green_orange;botania:wands/twigwand_cyan_red;botania:wands/twigwand_green_purple;botania:wands/twigwand_white_light_blue;botania:wands/twigwand_pink_magenta;botania:wands/twigwand_lime_lime;botania:wands/twigwand_black_green;botania:wands/twigwand_orange_light_blue;botania:wands/twigwand_green_red;botania:wands/twigwand_pink_silver;botania:wands/twigwand_cyan_yellow;botania:wands/twigwand_brown_blue;botania:wands/twigwand_blue_red;botania:wands/twigwand_orange_magenta;botania:wands/twigwand_silver_lime;botania:wands/twigwand_brown_silver;botania:wands/twigwand_lime_blue;botania:wands/twigwand_blue_pink;botania:wands/twigwand_lime_silver;botania:wands/twigwand_magenta_gray;botania:wands/twigwand_brown_lime;botania:wands/twigwand_red_orange;botania:wands/twigwand_orange_red;botania:wands/twigwand_magenta_silver;botania:wands/twigwand_purple_brown;botania:wands/twigwand_orange_lime;botania:wands/twigwand_orange_black;botania:wands/twigwand_white_orange;botania:wands/twigwand_silver_blue;botania:wands/twigwand_pink_purple;botania:wands/twigwand_lime_purple;botania:wands/twigwand_orange_brown;botania:wands/twigwand_lime_magenta;botania:wands/twigwand_lime_pink;botania:wands/twigwand_purple_yellow;botania:wands/twigwand_silver_silver;botania:wands/twigwand_green_green;botania:wands/twigwand_brown_green;botania:wands/twigwand_gray_gray;botania:wands/twigwand_silver_pink;botania:wands/twigwand_red_yellow;botania:wands/twigwand_yellow_cyan;botania:wands/twigwand_blue_magenta;botania:wands/twigwand_black_white;botania:wands/twigwand_blue_cyan;botania:wands/twigwand_pink_brown;botania:wands/twigwand_brown_orange;botania:wands/twigwand_yellow_black;botania:wands/twigwand_yellow_silver;botania:wands/twigwand_lime_gray;botania:wands/twigwand_brown_black;botania:wands/twigwand_green_black;botania:wands/twigwand_gray_orange;botania:wands/twigwand_red_red;botania:wands/twigwand_yellow_gray;botania:wands/twigwand_silver_gray;botania:wands/twigwand_lime_orange;botania:wands/twigwand_pink_lime;botania:wands/twigwand_green_yellow;botania:wands/twigwand_silver_black;botania:wands/twigwand_gray_purple;botania:wands/twigwand_light_blue_yellow;botania:wands/twigwand_brown_pink;botania:wands/twigwand_blue_yellow;botania:wands/twigwand_brown_brown;botania:wands/twigwand_lime_green;botania:wands/twigwand_green_brown;botania:wands/twigwand_white_silver;botania:wands/twigwand_pink_blue;botania:wands/twigwand_blue_purple;botania:wands/twigwand_pink_black;botania:wands/twigwand_magenta_red;botania:wands/twigwand_yellow_brown;botania:wands/twigwand_brown_magenta;botania:wands/twigwand_magenta_brown;botania:wands/twigwand_brown_purple;botania:wands/twigwand_gray_yellow;botania:wands/twigwand_cyan_gray;botania:wands/twigwand_purple_cyan;botania:wands/twigwand_light_blue_orange;botania:wands/twigwand_purple_magenta;botania:wands/twigwand_light_blue_purple;botania:wands/twigwand_lime_black;botania:wands/twigwand_silver_brown;botania:wands/twigwand_black_gray;botania:wands/twigwand_silver_green;botania:wands/twigwand_light_blue_blue;botania:wands/twigwand_magenta_yellow;botania:wands/twigwand_green_light_blue;botania:wands/twigwand_magenta_green;botania:wands/twigwand_brown_light_blue;botania:wands/twigwand_lime_brown;botania:wands/twigwand_light_blue_lime;botania:wands/twigwand_pink_green;botania:wands/twigwand_brown_yellow;botania:wands/twigwand_pink_pink;botania:wands/twigwand_red_cyan;botania:wands/twigwand_gray_white;botania:wands/twigwand_purple_pink;botania:wands/twigwand_cyan_white;botania:wands/twigwand_brown_cyan;botania:wands/twigwand_blue_orange;botania:wands/twigwand_orange_silver;botania:wands/twigwand_purple_silver;botania:wands/twigwand_orange_gray;botania:wands/twigwand_black_yellow;botania:wands/twigwand_red_silver;botania:wands/twigwand_light_blue_pink;botania:wands/twigwand_yellow_green;botania:wands/twigwand_pink_orange;botania:wands/twigwand_pink_light_blue;botania:wands/twigwand_magenta_black;botania:wands/twigwand_red_white;botania:wands/twigwand_lime_yellow;botania:wands/twigwand_gray_black;botania:wands/twigwand_black_blue;botania:wands/twigwand_green_gray;botania:wands/twigwand_lime_light_blue;botania:wands/twigwand_white_cyan;botania:wands/twigwand_gray_blue;botania:wands/twigwand_magenta_orange;botania:wands/twigwand_magenta_light_blue;botania:wands/twigwand_orange_purple;botania:wands/twigwand_yellow_light_blue;botania:wands/twigwand_purple_light_blue;botania:wands/twigwand_black_lime;botania:wands/twigwand_gray_magenta;botania:wands/twigwand_purple_white;botania:wands/twigwand_gray_pink;botania:wands/twigwand_white_brown;botania:wands/twigwand_black_orange;botania:wands/twigwand_purple_blue;botania:wands/twigwand_white_white;botania:wands/twigwand_gray_lime;botania:wands/twigwand_black_pink;botania:wands/twigwand_light_blue_white;botania:wands/twigwand_red_pink;botania:wands/twigwand_cyan_green;botania:wands/twigwand_purple_lime;botania:wands/twigwand_yellow_white;botania:wands/twigwand_magenta_white;botania:wands/twigwand_red_green;botania:wands/twigwand_cyan_silver;botania:wands/twigwand_white_magenta;botania:wands/twigwand_pink_yellow;botania:wands/twigwand_magenta_cyan;botania:wands/twigwand_silver_white;botania:wands/twigwand_white_pink;botania:wands/twigwand_cyan_purple;botania:wands/twigwand_light_blue_cyan;botania:wands/twigwand_gray_green;botania:wands/twigwand_cyan_black;botania:wands/twigwand_black_silver;botania:wands/twigwand_white_black;botania:wands/twigwand_black_light_blue;botania:wands/twigwand_magenta_pink;botania:wands/twigwand_orange_yellow;botania:wands/twigwand_red_black;botania:wands/twigwand_white_blue;botania:wands/twigwand_black_purple;botania:wands/twigwand_blue_gray;botania:wands/twigwand_cyan_lime;botania:wands/twigwand_pink_red;botania:wands/twigwand_red_lime;botania:wands/twigwand_black_red;botania:wands/twigwand_cyan_brown;botania:wands/twigwand_lime_white;botania:wands/twigwand_yellow_magenta;botania:wands/twigwand_white_lime;botania:wands/twigwand_gray_cyan;botania:wands/twigwand_orange_orange;botania:wands/twigwand_cyan_blue;botania:wands/twigwand_red_blue;botania:wands/twigwand_yellow_yellow;botania:wands/twigwand_gray_brown;botania:wands/twigwand_red_brown" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/brewery.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/brewery.json index ed63a27c0..d3eee3dd1 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/brewery.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/brewery.json @@ -27,67 +27,80 @@ }, { "type": "brew", - "text": "botania.page.brewery5b", + "text": "botania.page.brewery5a", + "flavor": "botania.page.brewery5b", "recipe": "botania:speed" }, { "type": "brew", - "text": "botania.page.brewery6b", + "text": "botania.page.brewery6a", + "flavor": "botania.page.brewery6b", "recipe": "botania:strength" }, { "type": "brew", - "text": "botania.page.brewery7b", + "text": "botania.page.brewery7a", + "flavor": "botania.page.brewery7b", "recipe": "botania:haste" }, { "type": "brew", - "text": "botania.page.brewery8b", + "text": "botania.page.brewery8a", + "flavor": "botania.page.brewery8b", "recipe": "botania:healing" }, { "type": "brew", - "text": "botania.page.brewery9b", + "text": "botania.page.brewery9a", + "flavor": "botania.page.brewery9b", "recipe": "botania:jump_boost" }, { "type": "brew", - "text": "botania.page.brewery10b", + "text": "botania.page.brewery10a", + "flavor": "botania.page.brewery10b", "recipe": "botania:regeneration" }, { "type": "brew", - "text": "botania.page.brewery17b", + "text": "botania.page.brewery17a", + "flavor": "botania.page.brewery17b", "recipe": "botania:weak_regeneration" }, { "type": "brew", - "text": "botania.page.brewery11b", + "text": "botania.page.brewery11a", + "flavor": "botania.page.brewery11b", "recipe": "botania:resistance" }, { "type": "brew", - "text": "botania.page.brewery12b", + "text": "botania.page.brewery12a", + "flavor": "botania.page.brewery12b", "recipe": "botania:fire_resistance" }, { "type": "brew", - "text": "botania.page.brewery13b", + "text": "botania.page.brewery13a", + "flavor": "botania.page.brewery13b", "recipe": "botania:water_breathing" }, { "type": "brew", - "text": "botania.page.brewery14b", + "text": "botania.page.brewery14a", + "flavor": "botania.page.brewery14b", "recipe": "botania:invisibility" }, { "type": "brew", - "text": "botania.page.brewery15b", + "text": "botania.page.brewery15a", + "flavor": "botania.page.brewery15b", "recipe": "botania:night_vision" }, { "type": "brew", - "text": "botania.page.brewery16b", + "text": "botania.page.brewery16a", + "flavor": "botania.page.brewery16b", "recipe": "botania:absorption" } ] diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/complex_brews.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/complex_brews.json index 620fb2df4..5fdaf1672 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/complex_brews.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/complex_brews.json @@ -9,37 +9,44 @@ }, { "type": "brew", - "text": "botania.page.complexBrews1b", + "text": "botania.page.complexBrews1a", + "flavor": "botania.page.complexBrews1b", "recipe": "botania:overload" }, { "type": "brew", - "text": "botania.page.complexBrews2b", + "text": "botania.page.complexBrews2a", + "flavor": "botania.page.complexBrews2b", "recipe": "botania:soul_cross" }, { "type": "brew", - "text": "botania.page.complexBrews3b", + "text": "botania.page.complexBrews3a", + "flavor": "botania.page.complexBrews3b", "recipe": "botania:feather_feet" }, { "type": "brew", - "text": "botania.page.complexBrews4b", + "text": "botania.page.complexBrews4a", + "flavor": "botania.page.complexBrews4b", "recipe": "botania:emptiness" }, { "type": "brew", - "text": "botania.page.complexBrews5b", + "text": "botania.page.complexBrews5a", + "flavor": "botania.page.complexBrews5b", "recipe": "botania:bloodthirst" }, { "type": "brew", - "text": "botania.page.complexBrews6b", + "text": "botania.page.complexBrews6a", + "flavor": "botania.page.complexBrews6b", "recipe": "botania:allure" }, { "type": "brew", - "text": "botania.page.complexBrews7b", + "text": "botania.page.complexBrews7a", + "flavor": "botania.page.complexBrews7b", "recipe": "botania:clear" } ] diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/craft_crate.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/craft_crate.json index a29c72a78..b8d002b5d 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/craft_crate.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/craft_crate.json @@ -47,17 +47,7 @@ { "type": "crafting_multi", "text": "botania.page.craftCrate9", - "recipes": [ - "botania:pattern_1_1", - "botania:pattern_2_2", - "botania:pattern_1_2", - "botania:pattern_2_1", - "botania:pattern_1_3", - "botania:pattern_3_1", - "botania:pattern_2_3", - "botania:pattern_3_2", - "botania:pattern_donut" - ] + "recipes": "botania:pattern_1_1;botania:pattern_2_2;botania:pattern_1_2;botania:pattern_2_1;botania:pattern_1_3;botania:pattern_3_1;botania:pattern_2_3;botania:pattern_3_2;botania:pattern_donut" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json index a76a6ab33..9196d6fbb 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json @@ -15,235 +15,132 @@ { "type": "mana_infusion", "text": "botania.page.manaAlchemy2", - "recipes": [ - "botania:rotten_flesh_to_leather" - ] + "recipes": "botania:rotten_flesh_to_leather" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy3", - "recipes": [ - "botania:birch_to_jungle_log", - "botania:oak_to_spruce_log", - "botania:dark_oak_to_oak_log", - "botania:spruce_to_birch_log", - "botania:jungle_to_acacia_log", - "botania:acacia_to_dark_oak_log" - ] + "recipes": "botania:spruce_to_birch_log;botania:birch_to_jungle_log;botania:acacia_to_dark_oak_log;botania:oak_to_spruce_log;botania:jungle_to_acacia_log;botania:dark_oak_to_oak_log" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy4", - "recipes": [ - "botania:acacia_to_dark_oak_sapling", - "botania:birch_to_jungle_sapling", - "botania:dark_oak_to_oak_sapling", - "botania:oak_to_spruce_sapling", - "botania:jungle_to_acacia_sapling", - "botania:spruce_to_birch_sapling" - ] + "recipes": "botania:birch_to_jungle_sapling;botania:oak_to_spruce_sapling;botania:jungle_to_acacia_sapling;botania:acacia_to_dark_oak_sapling;botania:spruce_to_birch_sapling;botania:dark_oak_to_oak_sapling" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy5", - "recipes": [ - "botania:redstone_to_glowstone", - "botania:glowstone_deconstruct" - ] + "recipes": "botania:redstone_to_glowstone;botania:glowstone_deconstruct" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy6", - "recipes": [ - "botania:quartz_deconstruct", - "botania:dark_quartz_deconstruct", - "botania:mana_quartz_deconstruct", - "botania:blaze_quartz_deconstruct", - "botania:lavender_quartz_deconstruct", - "botania:red_quartz_deconstruct", - "botania:elf_quartz_deconstruct" - ] + "recipes": "botania:quartz_deconstruct;botania:dark_quartz_deconstruct;botania:mana_quartz_deconstruct;botania:blaze_quartz_deconstruct;botania:lavender_quartz_deconstruct;botania:red_quartz_deconstruct;botania:elf_quartz_deconstruct" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy7", - "recipes": [ - "botania:chiseled_stone_bricks" - ] + "recipes": "botania:chiseled_stone_bricks" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy8", - "recipes": [ - "botania:ice" - ] + "recipes": "botania:ice" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy9", - "recipes": [ - "botania:vine_to_lily_pad", - "botania:lily_pad_to_vine" - ] + "recipes": "botania:vine_to_lily_pad;botania:lily_pad_to_vine" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy10", - "recipes": [ - "botania:pufferfish_to_cod", - "botania:cod_to_salmon", - "botania:salmon_to_tropical_fish", - "botania:tropical_fish_to_pufferfish" - ] + "recipes": "botania:pufferfish_to_cod;botania:cod_to_salmon;botania:salmon_to_tropical_fish;botania:tropical_fish_to_pufferfish" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy11", - "recipes": [ - "botania:cocoa_to_wheat", - "botania:wheat_to_potato", - "botania:potato_unpoison", - "botania:potato_to_carrot", - "botania:carrot_to_beetroot", - "botania:beetroot_to_melon", - "botania:melon_to_pumpkin", - "botania:pumpkin_to_cocoa" - ] + "recipes": "botania:cocoa_to_wheat;botania:wheat_to_potato;botania:potato_unpoison;botania:potato_to_carrot;botania:carrot_to_beetroot;botania:beetroot_to_melon;botania:melon_to_pumpkin;botania:pumpkin_to_cocoa" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy12", - "recipes": [ - "botania:wheat_to_potato", - "botania:potato_unpoison" - ] + "recipes": "botania:wheat_to_potato;botania:potato_unpoison" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy13", - "recipes": [ - "botania:blaze_rod_to_nether_wart" - ] + "recipes": "botania:blaze_rod_to_nether_wart" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy14", - "recipes": [ - "botania:flint_to_gunpowder" - ] + "recipes": "botania:flint_to_gunpowder" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy15", - "recipes": [ - "botania:book_to_name_tag" - ] + "recipes": "botania:book_to_name_tag" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy16", - "recipes": [ - "botania:wool_deconstruct" - ] + "recipes": "botania:wool_deconstruct" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy17", - "recipes": [ - "botania:cactus_to_slime", - "botania:slime_to_cactus" - ] + "recipes": "botania:cactus_to_slime;botania:slime_to_cactus" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy18", - "recipes": [ - "botania:ender_pearl_from_ghast_tear" - ] + "recipes": "botania:ender_pearl_from_ghast_tear" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy19", - "recipes": [ - "botania:glowstone_to_redstone", - "botania:redstone_to_glowstone", - "botania:glowstone_deconstruct" - ] + "recipes": "botania:glowstone_to_redstone;botania:redstone_to_glowstone;botania:glowstone_deconstruct" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy20", - "recipes": [ - "botania:cobble_to_sand" - ] + "recipes": "botania:cobble_to_sand" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy21", - "recipes": [ - "botania:terracotta_to_red_sand" - ] + "recipes": "botania:terracotta_to_red_sand" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy26", - "recipes": [ - "botania:granite_to_andesite", - "botania:stone_to_andesite", - "botania:andesite_to_diorite", - "botania:diorite_to_granite" - ] + "recipes": "botania:granite_to_andesite;botania:stone_to_andesite;botania:andesite_to_diorite;botania:diorite_to_granite" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy22", - "recipes": [ - "botania:clay_deconstruct", - "botania:brick_deconstruct" - ] + "recipes": "botania:clay_deconstruct;botania:brick_deconstruct" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy27", - "recipes": [ - "botania:chorus_fruit_to_flower" - ] + "recipes": "botania:chorus_fruit_to_flower" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy24", - "recipes": [ - "botania:fern_to_dead_bush", - "botania:dead_bush_to_grass", - "botania:grass_to_fern" - ] + "recipes": "botania:fern_to_dead_bush;botania:dead_bush_to_grass;botania:grass_to_fern" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy25", - "recipes": [ - "botania:dandelion_to_poppy", - "botania:poppy_to_blue_orchid", - "botania:blue_orchid_to_allium", - "botania:allium_to_azure_bluet", - "botania:azure_bluet_to_red_tulip", - "botania:red_tulip_to_orange_tulip", - "botania:orange_tulip_to_white_tulip", - "botania:white_tulip_to_pink_tulip", - "botania:pink_tulip_to_oxeye_daisy", - "botania:oxeye_daisy_to_sunflower", - "botania:sunflower_to_lilac", - "botania:lilac_to_rose_bush", - "botania:rose_bush_to_peony", - "botania:peony_to_dandelion" - ] + "recipes": "botania:dandelion_to_poppy;botania:poppy_to_blue_orchid;botania:blue_orchid_to_allium;botania:allium_to_azure_bluet;botania:azure_bluet_to_red_tulip;botania:red_tulip_to_orange_tulip;botania:orange_tulip_to_white_tulip;botania:white_tulip_to_pink_tulip;botania:pink_tulip_to_oxeye_daisy;botania:oxeye_daisy_to_sunflower;botania:sunflower_to_lilac;botania:lilac_to_rose_bush;botania:rose_bush_to_peony;botania:peony_to_dandelion" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy23", - "recipes": [ - "botania:coarse_dirt" - ] + "recipes": "botania:coarse_dirt" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_conjuration.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_conjuration.json index 7b7998334..f156acf3f 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_conjuration.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_conjuration.json @@ -15,77 +15,52 @@ { "type": "mana_infusion", "text": "botania.page.manaConjuration2", - "recipes": [ - "botania:redstone_dupe" - ] + "recipes": "botania:redstone_dupe" }, { "type": "mana_infusion", "text": "botania.page.manaConjuration3", - "recipes": [ - "botania:glowstone_dupe" - ] + "recipes": "botania:glowstone_dupe" }, { "type": "mana_infusion", "text": "botania.page.manaConjuration4", - "recipes": [ - "botania:quartz_dupe" - ] + "recipes": "botania:quartz_dupe" }, { "type": "mana_infusion", "text": "botania.page.manaConjuration5", - "recipes": [ - "botania:coal_dupe" - ] + "recipes": "botania:coal_dupe" }, { "type": "mana_infusion", "text": "botania.page.manaConjuration6", - "recipes": [ - "botania:snowball_dupe" - ] + "recipes": "botania:snowball_dupe" }, { "type": "mana_infusion", "text": "botania.page.manaConjuration7", - "recipes": [ - "botania:netherrack_dupe" - ] + "recipes": "botania:netherrack_dupe" }, { "type": "mana_infusion", "text": "botania.page.manaConjuration8", - "recipes": [ - "botania:soul_sand_dupe" - ] + "recipes": "botania:soul_sand_dupe" }, { "type": "mana_infusion", "text": "botania.page.manaConjuration9", - "recipes": [ - "botania:gravel_dupe" - ] + "recipes": "botania:gravel_dupe" }, { "type": "mana_infusion", "text": "botania.page.manaConjuration10", - "recipes": [ - "botania:jungle_leaves_dupe", - "botania:spruce_leaves_dupe", - "botania:birch_leaves_dupe", - "botania:acacia_leaves_dupe", - "botania:dark_oak_leaves_dupe", - "botania:oak_leaves_dupe" - ] + "recipes": "botania:oak_leaves_dupe;botania:jungle_leaves_dupe;botania:acacia_leaves_dupe;botania:spruce_leaves_dupe;botania:dark_oak_leaves_dupe;botania:birch_leaves_dupe" }, { "type": "mana_infusion", "text": "botania.page.manaConjuration11", - "recipes": [ - "botania:grass" - ] + "recipes": "botania:grass" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/flight_tiara.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/flight_tiara.json index 9f413643e..c497ff52d 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/flight_tiara.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/flight_tiara.json @@ -20,28 +20,18 @@ "text": "botania.page.flightTiara6" }, { - "type": "crafting_multi", + "type": "crafting", "text": "botania.page.flightTiara1", - "recipes": [ - "botania:flighttiara_5", - "botania:flighttiara_4", - "botania:flighttiara_7", - "botania:flighttiara_6", - "botania:flighttiara_1", - "botania:flighttiara_0", - "botania:flighttiara_3", - "botania:flighttiara_2", - "botania:flighttiara_8" - ] + "recipe": "botania:flighttiara_0" }, { "type": "text", "text": "botania.page.flightTiara2" }, { - "type": "crafting", + "type": "crafting_multi", "text": "botania.page.flightTiara3", - "recipe": "botania:dummy" + "recipes": "botania:flighttiara_5;botania:flighttiara_4;botania:flighttiara_7;botania:flighttiara_6;botania:flighttiara_1;botania:flighttiara_3;botania:flighttiara_2;botania:flighttiara_8" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/piston_relay.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/piston_relay.json index 962e81d7a..0214efa7c 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/piston_relay.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/piston_relay.json @@ -14,9 +14,7 @@ { "type": "mana_infusion", "text": "botania.page.pistonRelay2", - "recipes": [ - "botania:piston_relay" - ] + "recipes": "botania:piston_relay" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/red_string.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/red_string.json index a36621771..14dd085a6 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/red_string.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/red_string.json @@ -12,12 +12,10 @@ "text": "botania.page.redString1" }, { - "type": "crafting_multi", + "type": "crafting", "text": "botania.page.redString2", - "recipes": [ - "botania:red_string", - "botania:red_string_alt" - ] + "recipe": "botania:red_string", + "recipe2": "botania:red_string_alt" }, { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/agricarnation.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/agricarnation.json index 1870402b0..002c7c8de 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/agricarnation.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/agricarnation.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.agricarnation1", - "recipes": [ - "botania:agricarnation" - ] + "recipe": "botania:agricarnation" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/bellethorne.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/bellethorne.json index 0d0c5ad95..9718a794e 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/bellethorne.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/bellethorne.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.bellethorne1", - "recipes": [ - "botania:bellethorn" - ] + "recipe": "botania:bellethorn" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/bergamute.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/bergamute.json index de3ea6933..1eafb4e9f 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/bergamute.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/bergamute.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.bergamute1", - "recipes": [ - "botania:bergamute" - ] + "recipe": "botania:bergamute" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/bubbell.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/bubbell.json index 22b50a2e1..026bdb80f 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/bubbell.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/bubbell.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.bubbell1", - "recipes": [ - "botania:bubbell" - ] + "recipe": "botania:bubbell" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/clayconia.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/clayconia.json index 1dca092af..c4c7335e5 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/clayconia.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/clayconia.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.clayconia1", - "recipes": [ - "botania:clayconia" - ] + "recipe": "botania:clayconia" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/daffomill.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/daffomill.json index 183bf1281..0eac935ca 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/daffomill.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/daffomill.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.daffomill1", - "recipes": [ - "botania:daffomill" - ] + "recipe": "botania:daffomill" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/dreadthorne.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/dreadthorne.json index 39351c1e5..5c609d7c0 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/dreadthorne.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/dreadthorne.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.dreadthorne1", - "recipes": [ - "botania:dreadthorn" - ] + "recipe": "botania:dreadthorn" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/exoflame.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/exoflame.json index f1aee5769..a14b66922 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/exoflame.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/exoflame.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.exoflame1", - "recipes": [ - "botania:exoflame" - ] + "recipe": "botania:exoflame" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/fallen_kanade.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/fallen_kanade.json index 9d5756e4a..fa2108b07 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/fallen_kanade.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/fallen_kanade.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.fallenKanade1", - "recipes": [ - "botania:fallen_kanade" - ] + "recipe": "botania:fallen_kanade" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/flower_shrinking.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/flower_shrinking.json index 74184c6cc..b99fb54a1 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/flower_shrinking.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/flower_shrinking.json @@ -11,16 +11,7 @@ { "type": "mana_infusion", "text": "botania.page.flowerShrinking1", - "recipes": [ - "botania:bubbell_chibi", - "botania:rannuncarpus_chibi", - "botania:marimorphosis_chibi", - "botania:clayconia_chibi", - "botania:solegnolia_chibi", - "botania:bellethorn_chibi", - "botania:hopperhock_chibi", - "botania:agricarnation_chibi" - ] + "recipes": "botania:solegnolia_chibi;botania:rannuncarpus_chibi;botania:bellethorn_chibi;botania:marimorphosis_chibi;botania:bubbell_chibi;botania:clayconia_chibi;botania:hopperhock_chibi;botania:agricarnation_chibi" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/heisei_dream.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/heisei_dream.json index 14ffc3137..b874a783f 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/heisei_dream.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/heisei_dream.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.heiseiDream1", - "recipes": [ - "botania:heisei_dream" - ] + "recipe": "botania:heisei_dream" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/hopperhock.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/hopperhock.json index e0af4d000..35ea6624d 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/hopperhock.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/hopperhock.json @@ -14,9 +14,7 @@ { "type": "petal_apothecary", "text": "botania.page.hopperhock2", - "recipes": [ - "botania:hopperhock" - ] + "recipe": "botania:hopperhock" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/hyacidus.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/hyacidus.json index 2e8fb7bc4..b571d4424 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/hyacidus.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/hyacidus.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.hyacidus1", - "recipes": [ - "botania:hyacidus" - ] + "recipe": "botania:hyacidus" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/jaded_amaranthus.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/jaded_amaranthus.json index d7ec22efb..15415c2e4 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/jaded_amaranthus.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/jaded_amaranthus.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.jadedAmaranthus1", - "recipes": [ - "botania:jaded_amaranthus" - ] + "recipe": "botania:jaded_amaranthus" }, { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/jiyuulia.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/jiyuulia.json index 0442a4d02..0d710bb69 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/jiyuulia.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/jiyuulia.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.jiyuulia1", - "recipes": [ - "botania:jiyuulia" - ] + "recipe": "botania:jiyuulia" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/loonium.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/loonium.json index 02ef23434..543482424 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/loonium.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/loonium.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.loonium1", - "recipes": [ - "botania:loonium" - ] + "recipe": "botania:loonium" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/marimorphosis.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/marimorphosis.json index 38a93f72b..1eaa07323 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/marimorphosis.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/marimorphosis.json @@ -17,23 +17,12 @@ { "type": "petal_apothecary", "text": "botania.page.marimorphosis2", - "recipes": [ - "botania:marimorphosis" - ] + "recipe": "botania:marimorphosis" }, { "type": "crafting_multi", "text": "botania.page.marimorphosis3", - "recipes": [ - "botania:apothecary_forest", - "botania:apothecary_plains", - "botania:apothecary_mountain", - "botania:apothecary_fungal", - "botania:apothecary_swamp", - "botania:apotehcary_desert", - "botania:apothecary_taiga", - "botania:apothecary_mesa" - ] + "recipes": "botania:apothecary_forest;botania:apothecary_plains;botania:apothecary_mountain;botania:apothecary_fungal;botania:apothecary_swamp;botania:apotehcary_desert;botania:apothecary_taiga;botania:apothecary_mesa" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/medumone.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/medumone.json index 94978ecb4..62e75ee7e 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/medumone.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/medumone.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.medumone1", - "recipes": [ - "botania:medumone" - ] + "recipe": "botania:medumone" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/orechid.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/orechid.json index 2c7ba2f73..89d3be03a 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/orechid.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/orechid.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.orechid1", - "recipes": [ - "botania:orechid" - ] + "recipe": "botania:orechid" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/orechid_ignem.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/orechid_ignem.json index 15214742d..4d6abd4ff 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/orechid_ignem.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/orechid_ignem.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.orechidIgnem1", - "recipes": [ - "botania:orechid_ignem" - ] + "recipe": "botania:orechid_ignem" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/pollidisiac.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/pollidisiac.json index 67beaf22f..bb437ef8c 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/pollidisiac.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/pollidisiac.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.pollidisiac1", - "recipes": [ - "botania:pollidisiac" - ] + "recipe": "botania:pollidisiac" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/rannuncarpus.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/rannuncarpus.json index 0b123e146..62ad51d30 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/rannuncarpus.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/rannuncarpus.json @@ -14,9 +14,7 @@ { "type": "petal_apothecary", "text": "botania.page.rannuncarpus2", - "recipes": [ - "botania:rannuncarpus" - ] + "recipe": "botania:rannuncarpus" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/solegnolia.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/solegnolia.json index 7d5e93d7a..027b000e0 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/solegnolia.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/solegnolia.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.solegnolia1", - "recipes": [ - "botania:solegnolia" - ] + "recipe": "botania:solegnolia" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/spectranthemum.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/spectranthemum.json index e5b334731..08bb01704 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/spectranthemum.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/spectranthemum.json @@ -18,9 +18,7 @@ { "type": "petal_apothecary", "text": "botania.page.spectranthemum3", - "recipes": [ - "botania:spectranthemum" - ] + "recipe": "botania:spectranthemum" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/tangleberrie.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/tangleberrie.json index f21a0275e..956ba8264 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/tangleberrie.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/tangleberrie.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.tangleberrie1", - "recipes": [ - "botania:tangleberrie" - ] + "recipe": "botania:tangleberrie" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/tigerseye.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/tigerseye.json index 740fb2a3b..5cdc9e1a6 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/tigerseye.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/tigerseye.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.tigerseye1", - "recipes": [ - "botania:tigerseye" - ] + "recipe": "botania:tigerseye" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/vinculotus.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/vinculotus.json index 87f770282..09179baf9 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/vinculotus.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/vinculotus.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.vinculotus1", - "recipes": [ - "botania:vinculotus" - ] + "recipe": "botania:vinculotus" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/arcanerose.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/arcanerose.json index df3fa858b..08ae46018 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/arcanerose.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/arcanerose.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.arcanerose1", - "recipes": [ - "botania:rosa_arcana" - ] + "recipe": "botania:rosa_arcana" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/dandelifeon.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/dandelifeon.json index 74f1a18e9..e4a9fe423 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/dandelifeon.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/dandelifeon.json @@ -42,9 +42,7 @@ { "type": "petal_apothecary", "text": "botania.page.dandelifeon8", - "recipes": [ - "botania:dandelifeon" - ] + "recipe": "botania:dandelifeon" }, { "type": "crafting", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/endoflame.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/endoflame.json index d16bca37f..55a1549bc 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/endoflame.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/endoflame.json @@ -18,9 +18,7 @@ { "type": "petal_apothecary", "text": "botania.page.endoflame2", - "recipes": [ - "botania:endoflame" - ] + "recipe": "botania:endoflame" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/entropinnyum.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/entropinnyum.json index f2616857d..39ef10049 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/entropinnyum.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/entropinnyum.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.entropinnyum1", - "recipes": [ - "botania:entropinnyum" - ] + "recipe": "botania:entropinnyum" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/gourmaryllis.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/gourmaryllis.json index 897220574..71590152d 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/gourmaryllis.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/gourmaryllis.json @@ -18,9 +18,7 @@ { "type": "petal_apothecary", "text": "botania.page.gourmaryllis3", - "recipes": [ - "botania:gourmaryllis" - ] + "recipe": "botania:gourmaryllis" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/hydroangeas.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/hydroangeas.json index 435e8cb7e..2c777f226 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/hydroangeas.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/hydroangeas.json @@ -17,9 +17,7 @@ { "type": "petal_apothecary", "text": "botania.page.hydroangeas1", - "recipes": [ - "botania:hydroangeas" - ] + "recipe": "botania:hydroangeas" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/kekimurus.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/kekimurus.json index 2e110e1a7..54239fc19 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/kekimurus.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/kekimurus.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.kekimurus1", - "recipes": [ - "botania:kekimurus" - ] + "recipe": "botania:kekimurus" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/munchdew.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/munchdew.json index b40e6abf8..908962cc5 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/munchdew.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/munchdew.json @@ -14,9 +14,7 @@ { "type": "petal_apothecary", "text": "botania.page.munchdew2", - "recipes": [ - "botania:munchdew" - ] + "recipe": "botania:munchdew" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/narslimmus.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/narslimmus.json index d954ba8d1..1ab42b3fd 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/narslimmus.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/narslimmus.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.narslimmus1", - "recipes": [ - "botania:narslimmus" - ] + "recipe": "botania:narslimmus" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/rafflowsia.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/rafflowsia.json index 9f2b57889..2bffa722a 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/rafflowsia.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/rafflowsia.json @@ -10,9 +10,7 @@ { "type": "petal_apothecary", "text": "botania.page.rafflowsia1", - "recipes": [ - "botania:rafflowsia" - ] + "recipe": "botania:rafflowsia" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/shulk_me_not.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/shulk_me_not.json index 11db5af6b..f17f69175 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/shulk_me_not.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/shulk_me_not.json @@ -14,9 +14,7 @@ { "type": "petal_apothecary", "text": "botania.page.shulk_me_not2", - "recipes": [ - "botania:shulk_me_not" - ] + "recipe": "botania:shulk_me_not" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/spectrolus.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/spectrolus.json index 28dd4f249..01bea0400 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/spectrolus.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/spectrolus.json @@ -14,9 +14,7 @@ { "type": "petal_apothecary", "text": "botania.page.spectrolus2", - "recipes": [ - "botania:spectrolus" - ] + "recipe": "botania:spectrolus" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/thermalily.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/thermalily.json index ae9b227a5..9945134fd 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/thermalily.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/thermalily.json @@ -18,9 +18,7 @@ { "type": "petal_apothecary", "text": "botania.page.thermalily1", - "recipes": [ - "botania:thermalily" - ] + "recipe": "botania:thermalily" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/lens.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/lens.json index 34aee7c39..6289661cc 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/lens.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/lens.json @@ -169,12 +169,10 @@ "text": "botania.page.lens36" }, { - "type": "crafting_multi", + "type": "crafting", "text": "botania.page.lens37", - "recipes": [ - "botania:lens_light", - "botania:lens_light_alt" - ] + "recipe": "botania:lens_light", + "recipe2": "botania:lens_light_alt" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/manastar.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/manastar.json index 7794411d5..6799cdb1a 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/manastar.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/manastar.json @@ -11,9 +11,7 @@ { "type": "petal_apothecary", "text": "botania.page.manastar1", - "recipes": [ - "botania:manastar" - ] + "recipe": "botania:manastar" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/pool.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/pool.json index 12bad903a..0267d3388 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/pool.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/pool.json @@ -37,45 +37,32 @@ { "type": "mana_infusion", "text": "botania.page.pool3", - "recipes": [ - "botania:manasteel" - ] + "recipes": "botania:manasteel" }, { "type": "mana_infusion", "text": "botania.page.pool4", - "recipes": [ - "botania:mana_pearl" - ] + "recipes": "botania:mana_pearl" }, { "type": "mana_infusion", "text": "botania.page.pool5", - "recipes": [ - "botania:mana_diamond" - ] + "recipes": "botania:mana_diamond" }, { "type": "mana_infusion", "text": "botania.page.pool6", - "recipes": [ - "botania:mana_powder_dust", - "botania:mana_powder_dye" - ] + "recipes": "botania:mana_powder_dust;botania:mana_powder_dye" }, { "type": "mana_infusion", "text": "botania.page.pool11", - "recipes": [ - "botania:mana_glass" - ] + "recipes": "botania:mana_glass" }, { "type": "mana_infusion", "text": "botania.page.pool12", - "recipes": [ - "botania:mana_string" - ] + "recipes": "botania:mana_string" }, { "type": "crafting", @@ -85,9 +72,7 @@ { "type": "mana_infusion", "text": "botania.page.pool7", - "recipes": [ - "botania:mana_cookie" - ] + "recipes": "botania:mana_cookie" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/spark_upgrades.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/spark_upgrades.json index 358eb199c..5da7cc6e7 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/spark_upgrades.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/spark_upgrades.json @@ -26,12 +26,7 @@ { "type": "crafting_multi", "text": "botania.page.sparkUpgrades5", - "recipes": [ - "botania:spark_upgrade_dispersive", - "botania:spark_upgrade_dominant", - "botania:spark_upgrade_recessive", - "botania:spark_upgrade_isolated" - ] + "recipes": "botania:spark_upgrade_dispersive;botania:spark_upgrade_dominant;botania:spark_upgrade_recessive;botania:spark_upgrade_isolated" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/azulejo.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/azulejo.json index eb3e84827..d1c5b1634 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/azulejo.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/azulejo.json @@ -22,24 +22,7 @@ { "type": "crafting_multi", "text": "botania.page.azulejo3", - "recipes": [ - "botania:azulejo_0_alt", - "botania:azulejo_1", - "botania:azulejo_2", - "botania:azulejo_3", - "botania:azulejo_4", - "botania:azulejo_5", - "botania:azulejo_6", - "botania:azulejo_7", - "botania:azulejo_8", - "botania:azulejo_9", - "botania:azulejo_10", - "botania:azulejo_11", - "botania:azulejo_12", - "botania:azulejo_13", - "botania:azulejo_14", - "botania:azulejo_15" - ] + "recipes": "botania:azulejo_0_alt;botania:azulejo_1;botania:azulejo_2;botania:azulejo_3;botania:azulejo_4;botania:azulejo_5;botania:azulejo_6;botania:azulejo_7;botania:azulejo_8;botania:azulejo_9;botania:azulejo_10;botania:azulejo_11;botania:azulejo_12;botania:azulejo_13;botania:azulejo_14;botania:azulejo_15" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/decorative_blocks.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/decorative_blocks.json index 92d7b9275..65b36eb7d 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/decorative_blocks.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/decorative_blocks.json @@ -8,12 +8,10 @@ "text": "botania.page.decorativeBlocks0" }, { - "type": "crafting_multi", + "type": "crafting", "text": "botania.page.decorativeBlocks1", - "recipes": [ - "botania:slab_recombine/livingrock_bricks", - "botania:livingrock_bricks" - ] + "recipe": "botania:slab_recombine/livingrock_bricks", + "recipe2": "botania:livingrock_bricks" }, { "type": "crafting", @@ -31,12 +29,10 @@ "recipe": "botania:chiseled_livingrock_bricks" }, { - "type": "crafting_multi", + "type": "crafting", "text": "botania.page.decorativeBlocks5", - "recipes": [ - "botania:slab_recombine/livingwood_planks", - "botania:livingwood_planks" - ] + "recipe": "botania:slab_recombine/livingwood_planks", + "recipe2": "botania:livingwood_planks" }, { "type": "crafting", @@ -70,10 +66,7 @@ { "type": "mana_infusion", "text": "botania.page.decorativeBlocks12", - "recipes": [ - "botania:mana_quartz_deconstruct", - "botania:mana_quartz" - ] + "recipes": "botania:mana_quartz" }, { "type": "crafting", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/head_creating.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/head_creating.json index 7ae1b058d..e2858e3d7 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/head_creating.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/head_creating.json @@ -14,9 +14,7 @@ { "type": "runic_altar", "text": "botania.page.headCreating1", - "recipes": [ - "botania:head" - ] + "recipe": "botania:head" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/mushrooms.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/mushrooms.json index 28dcd8ceb..d977d67e3 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/mushrooms.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/mushrooms.json @@ -10,24 +10,7 @@ { "type": "crafting_multi", "text": "botania.page.mushrooms1", - "recipes": [ - "botania:mushroom_0", - "botania:mushroom_1", - "botania:mushroom_2", - "botania:mushroom_3", - "botania:mushroom_4", - "botania:mushroom_5", - "botania:mushroom_6", - "botania:mushroom_7", - "botania:mushroom_8", - "botania:mushroom_9", - "botania:mushroom_10", - "botania:mushroom_11", - "botania:mushroom_12", - "botania:mushroom_13", - "botania:mushroom_14", - "botania:mushroom_15" - ] + "recipes": "botania:mushroom_0;botania:mushroom_1;botania:mushroom_2;botania:mushroom_3;botania:mushroom_4;botania:mushroom_5;botania:mushroom_6;botania:mushroom_7;botania:mushroom_8;botania:mushroom_9;botania:mushroom_10;botania:mushroom_11;botania:mushroom_12;botania:mushroom_13;botania:mushroom_14;botania:mushroom_15" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/pavement.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/pavement.json index e0b360396..1656ac186 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/pavement.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/pavement.json @@ -10,14 +10,7 @@ { "type": "crafting_multi", "text": "botania.page.pavement1", - "recipes": [ - "botania:white_pavement", - "botania:black_pavement", - "botania:blue_pavement", - "botania:yellow_pavement", - "botania:red_pavement", - "botania:green_pavement" - ] + "recipes": "botania:white_pavement;botania:black_pavement;botania:blue_pavement;botania:yellow_pavement;botania:red_pavement;botania:green_pavement" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/shiny_flowers.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/shiny_flowers.json index 6b465d2c7..6a26c10cb 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/shiny_flowers.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/shiny_flowers.json @@ -14,46 +14,12 @@ { "type": "crafting_multi", "text": "botania.page.shinyFlowers1", - "recipes": [ - "botania:white_shiny_flower", - "botania:orange_shiny_flower", - "botania:magenta_shiny_flower", - "botania:light_blue_shiny_flower", - "botania:yellow_shiny_flower", - "botania:lime_shiny_flower", - "botania:pink_shiny_flower", - "botania:gray_shiny_flower", - "botania:light_gray_shiny_flower", - "botania:cyan_shiny_flower", - "botania:purple_shiny_flower", - "botania:blue_shiny_flower", - "botania:brown_shiny_flower", - "botania:green_shiny_flower", - "botania:red_shiny_flower", - "botania:black_shiny_flower" - ] + "recipes": "botania:white_shiny_flower;botania:orange_shiny_flower;botania:magenta_shiny_flower;botania:light_blue_shiny_flower;botania:yellow_shiny_flower;botania:lime_shiny_flower;botania:pink_shiny_flower;botania:gray_shiny_flower;botania:light_gray_shiny_flower;botania:cyan_shiny_flower;botania:purple_shiny_flower;botania:blue_shiny_flower;botania:brown_shiny_flower;botania:green_shiny_flower;botania:red_shiny_flower;botania:black_shiny_flower" }, { "type": "crafting_multi", "text": "botania.page.shinyFlowers2", - "recipes": [ - "botania:white_floating_flower", - "botania:orange_floating_flower", - "botania:magenta_floating_flower", - "botania:light_blue_floating_flower", - "botania:yellow_floating_flower", - "botania:lime_floating_flower", - "botania:pink_floating_flower", - "botania:gray_floating_flower", - "botania:light_gray_floating_flower", - "botania:cyan_floating_flower", - "botania:purple_floating_flower", - "botania:blue_floating_flower", - "botania:brown_floating_flower", - "botania:green_floating_flower", - "botania:red_floating_flower", - "botania:black_floating_flower" - ] + "recipes": "botania:white_floating_flower;botania:orange_floating_flower;botania:magenta_floating_flower;botania:light_blue_floating_flower;botania:yellow_floating_flower;botania:lime_floating_flower;botania:pink_floating_flower;botania:gray_floating_flower;botania:light_gray_floating_flower;botania:cyan_floating_flower;botania:purple_floating_flower;botania:blue_floating_flower;botania:brown_floating_flower;botania:green_floating_flower;botania:red_floating_flower;botania:black_floating_flower" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/tc_integration.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/tc_integration.json index be226f916..77171ffca 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/tc_integration.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/tc_integration.json @@ -23,9 +23,7 @@ { "type": "mana_infusion", "text": "botania.page.tcIntegration4", - "recipes": [ - "botania:dummy" - ] + "recipes": "botania:dummy" }, { "type": "text", @@ -33,7 +31,8 @@ }, { "type": "brew", - "text": "botania.page.tcIntegration6b", + "text": "botania.page.tcIntegration6a", + "flavor": "botania.page.tcIntegration6b", "recipe": "botania:dummy" } ] diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/tiny_potato.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/tiny_potato.json index 5e0e7fa4d..1fa035048 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/tiny_potato.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/tiny_potato.json @@ -14,9 +14,7 @@ { "type": "mana_infusion", "text": "botania.page.tinyPotato1", - "recipes": [ - "botania:tiny_potato" - ] + "recipes": "botania:tiny_potato" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/grass_seeds.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/grass_seeds.json index c73832fd0..5251f5624 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/grass_seeds.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/grass_seeds.json @@ -10,23 +10,17 @@ { "type": "mana_infusion", "text": "botania.page.grassSeeds1", - "recipes": [ - "botania:grass_seeds" - ] + "recipes": "botania:grass_seeds" }, { "type": "mana_infusion", "text": "botania.page.grassSeeds2", - "recipes": [ - "botania:podzol_seeds" - ] + "recipes": "botania:podzol_seeds" }, { "type": "mana_infusion", "text": "botania.page.grassSeeds3", - "recipes": [ - "botania:mycel_seeds" - ] + "recipes": "botania:mycel_seeds" }, { "type": "text", @@ -35,14 +29,7 @@ { "type": "crafting_multi", "text": "botania.page.grassSeeds5", - "recipes": [ - "botania:dry_seeds", - "botania:golden_seeds", - "botania:vivid_seeds", - "botania:scorched_seeds", - "botania:infused_seeds", - "botania:mutated_seeds" - ] + "recipes": "botania:dry_seeds;botania:golden_seeds;botania:vivid_seeds;botania:scorched_seeds;botania:infused_seeds;botania:mutated_seeds" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/laputa_shard.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/laputa_shard.json index edf8b79c2..30b9d7ceb 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/laputa_shard.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/laputa_shard.json @@ -12,35 +12,14 @@ "text": "botania.page.laputaShard2" }, { - "type": "crafting_multi", + "type": "crafting", "text": "botania.page.laputaShard1", - "recipes": [ - "botania:laputa_shard_2", - "botania:laputa_shard_1", - "botania:laputa_shard_4", - "botania:laputa_shard_3", - "botania:laputa_shard_0", - "botania:laputa_shard_9", - "botania:laputa_shard_6", - "botania:laputa_shard_5", - "botania:laputa_shard_8", - "botania:laputa_shard_7", - "botania:laputa_shard_11", - "botania:laputa_shard_10", - "botania:laputa_shard_13", - "botania:laputa_shard_12", - "botania:laputa_shard_19", - "botania:laputa_shard_18", - "botania:laputa_shard_15", - "botania:laputa_shard_14", - "botania:laputa_shard_17", - "botania:laputa_shard_16" - ] + "recipe": "botania:laputa_shard_0" }, { - "type": "crafting", + "type": "crafting_multi", "text": "botania.page.laputaShard3", - "recipe": "botania:dummy" + "recipes": "botania:laputa_shard_2;botania:laputa_shard_1;botania:laputa_shard_4;botania:laputa_shard_3;botania:laputa_shard_9;botania:laputa_shard_6;botania:laputa_shard_5;botania:laputa_shard_8;botania:laputa_shard_7;botania:laputa_shard_11;botania:laputa_shard_10;botania:laputa_shard_13;botania:laputa_shard_12;botania:laputa_shard_19;botania:laputa_shard_18;botania:laputa_shard_15;botania:laputa_shard_14;botania:laputa_shard_17;botania:laputa_shard_16" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/rainbow_rod.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/rainbow_rod.json index 33c9e84c0..51fb429f7 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/rainbow_rod.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/rainbow_rod.json @@ -26,20 +26,16 @@ "recipe": "botania:bifrost_perm" }, { - "type": "crafting_multi", + "type": "crafting", "text": "botania.page.rainbowRod4", - "recipes": [ - "botania:slab_recombine/shimmerrock", - "botania:shimmerrock" - ] + "recipe": "botania:slab_recombine/shimmerrock", + "recipe2": "botania:shimmerrock" }, { - "type": "crafting_multi", + "type": "crafting", "text": "botania.page.rainbowRod5", - "recipes": [ - "botania:slab_recombine/shimmerwood_planks", - "botania:shimmerwood_planks" - ] + "recipe": "botania:slab_recombine/shimmerwood_planks", + "recipe2": "botania:shimmerwood_planks" }, { "type": "crafting", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/brew.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/brew.json index e61f5e9dd..55af825d0 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/brew.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/brew.json @@ -1,10 +1,125 @@ { + "processor": "vazkii.botania.client.patchouli.processor.BrewRecipeProcessor", "components": [ + { + "type": "header", + "text": "#heading", + "x": -1, + "y": -1 + }, + { + "type": "item", + "item": "#vial", + "framed": "false", + "link_recipe": true, + "x": 41, + "y": 12 + }, + { + "type": "item", + "item": "#flask", + "framed": "false", + "link_recipe": true, + "x": 59, + "y": 12 + }, { "type": "text", - "text": "Hello this is a test of the template system!", - "x": 20, - "y": 30 + "text": "#text", + "y": 32 + }, + { + "type": "item", + "guard": "#is_offset", + "item": "#input1", + "framed": "false", + "x": 5, + "y": 110 + }, + { + "type": "item", + "guard": "#is_offset->inv", + "item": "#input1", + "framed": "false", + "x": 14, + "y": 110 + }, + { + "type": "item", + "guard": "#is_offset", + "item": "#input2", + "framed": "false", + "x": 23, + "y": 110 + }, + { + "type": "item", + "guard": "#is_offset->inv", + "item": "#input2", + "framed": "false", + "x": 32, + "y": 110 + }, + { + "type": "item", + "guard": "#is_offset", + "item": "#input3", + "framed": "false", + "x": 41, + "y": 110 + }, + { + "type": "item", + "guard": "#is_offset->inv", + "item": "#input3", + "framed": "false", + "x": 50, + "y": 110 + }, + { + "type": "item", + "guard": "#is_offset", + "item": "#input4", + "framed": "false", + "x": 59, + "y": 110 + }, + { + "type": "item", + "guard": "#is_offset->inv", + "item": "#input4", + "framed": "false", + "x": 68, + "y": 110 + }, + { + "type": "item", + "guard": "#is_offset", + "item": "#input5", + "framed": "false", + "x": 77, + "y": 110 + }, + { + "type": "item", + "guard": "#is_offset->inv", + "item": "#input5", + "framed": "false", + "x": 86, + "y": 110 + }, + { + "type": "item", + "guard": "#is_offset", + "item": "#input6", + "framed": "false", + "x": 95, + "y": 110 + }, + { + "type": "text", + "text": "#flavor", + "y": 130 } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/crafting_multi.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/crafting_multi.json index e61f5e9dd..fbf024c26 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/crafting_multi.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/crafting_multi.json @@ -1,10 +1,111 @@ { + "processor": "vazkii.botania.client.patchouli.processor.MultiCraftingProcessor", "components": [ + { + "type": "header", + "text": "heading", + "x": -1, + "y": -6 + }, + { + "type": "image", + "image": "patchouli:textures/gui/crafting.png", + "x": 7, + "y": 2, + "u": 0, + "v": 0, + "texture_width": 128, + "texture_height": 128, + "width": 100, + "height": 62 + }, + { + "type": "image", + "image": "patchouli:textures/gui/crafting.png", + "guard": "#shapeless", + "x": 71, + "y": 6, + "u": 0, + "v": 64, + "texture_width": 128, + "texture_height": 128, + "width": 11, + "height": 11 + }, + { + "type": "custom", + "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "item": "#input1", + "x": 12, + "y": 7 + }, + { + "type": "custom", + "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "item": "#input2", + "x": 31, + "y": 7 + }, + { + "type": "custom", + "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "item": "#input3", + "x": 50, + "y": 7 + }, + { + "type": "custom", + "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "item": "#input4", + "x": 12, + "y": 26 + }, + { + "type": "custom", + "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "item": "#input5", + "x": 31, + "y": 26 + }, + { + "type": "custom", + "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "item": "#input6", + "x": 50, + "y": 26 + }, + { + "type": "custom", + "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "item": "#input7", + "x": 12, + "y": 45 + }, + { + "type": "custom", + "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "item": "#input8", + "x": 31, + "y": 45 + }, + { + "type": "custom", + "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "item": "#input9", + "x": 50, + "y": 45 + }, + { + "type": "item", + "item": "#output", + "link_recipe": true, + "x": 88, + "y": 26 + }, { "type": "text", - "text": "Hello this is a test of the template system!", - "x": 20, - "y": 30 + "text": "#text", + "y": 69 } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/elven_trade.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/elven_trade.json index e61f5e9dd..a5eaeeedf 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/elven_trade.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/elven_trade.json @@ -1,10 +1,100 @@ { + "processor": "vazkii.botania.client.patchouli.processor.ElvenTradeProcessor", "components": [ + { + "type": "image", + "image": "botania:textures/gui/elven_trade_overlay.png", + "x": 4, + "y": 4, + "width": 73, + "height": 77, + "u": 19, + "v": 18 + }, + { + "type": "image", + "image": "botania:textures/blocks/alfheim_portal_swirl.png", + "x": 7, + "y": 22, + "width": 48, + "height": 48, + "u": 0, + "v": 0, + "texture_width": 48, + "texture_height": 768 + }, + { + "type": "custom", + "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "item": "#input1", + "framed": "false", + "x": 30, + "y": 0 + }, + { + "type": "custom", + "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "item": "#input2", + "framed": "false", + "x": 50, + "y": 0 + }, + { + "type": "custom", + "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "item": "#input3", + "framed": "false", + "x": 70, + "y": 0 + }, + { + "type": "custom", + "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "item": "#input4", + "framed": "false", + "x": 90, + "y": 0 + }, + { + "type": "custom", + "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "item": "#output1", + "framed": "false", + "link_recipe": true, + "x": 78, + "y": 40 + }, + { + "type": "custom", + "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "item": "#output2", + "framed": "false", + "link_recipe": true, + "x": 98, + "y": 40 + }, + { + "type": "custom", + "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "item": "#output3", + "framed": "false", + "link_recipe": true, + "x": 78, + "y": 60 + }, + { + "type": "custom", + "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "item": "#output4", + "framed": "false", + "link_recipe": true, + "x": 98, + "y": 60 + }, { "type": "text", - "text": "Hello this is a test of the template system!", - "x": 20, - "y": 30 + "text": "#text", + "y": 130 } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/lore_page.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/lore_page.json new file mode 100644 index 000000000..726884abb --- /dev/null +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/lore_page.json @@ -0,0 +1,42 @@ +{ + "components": [ + { + "type": "image", + "image": "botania:textures/gui/paper_left.png", + "guard": "#left_side->exists", + "x": -5, + "y": -10, + "width": 123, + "height": 163, + "u": 13, + "v": 9 + }, + { + "type": "image", + "image": "botania:textures/gui/paper.png", + "guard": "#right_side->exists", + "x": -5, + "y": -10, + "width": 123, + "height": 163, + "u": 13, + "v": 9 + }, + { + "type": "image", + "image": "botania:textures/gui/entries/elven_garde_left.png", + "guard": "#elven_garde->exists", + "x": -5, + "y": -10, + "width": 123, + "height": 163, + "u": 13, + "v": 9 + }, + { + "type": "text", + "text": "#text", + "y": -4 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/mana_infusion.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/mana_infusion.json index e61f5e9dd..cdb9f9562 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/mana_infusion.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/mana_infusion.json @@ -1,10 +1,63 @@ { + "processor": "vazkii.botania.client.patchouli.processor.ManaInfusionProcessor", "components": [ { - "type": "text", - "text": "Hello this is a test of the template system!", + "type": "image", + "image": "botania:textures/gui/mana_infusion_overlay.png", + "x": 1, + "y": 8, + "width": 116, + "height": 106, + "u": 17, + "v": 28 + }, + { + "type": "header", + "text": "#heading", + "x": -1, + "y": -1 + }, + { + "type": "item", + "item": "#input", + "framed": "false", "x": 20, - "y": 30 + "y": 33 + }, + { + "type": "custom", + "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "item": "#catalyst", + "framed": "false", + "x": 20, + "y": 57 + }, + { + "type": "item", + "item": "botania:mana_pool:0{RenderFull:1b}", + "framed": "false", + "x": 49, + "y": 33 + }, + { + "type": "item", + "item": "#output", + "framed": "false", + "link_recipe": true, + "x": 78, + "y": 33 + }, + { + "type": "custom", + "class": "vazkii.botania.client.patchouli.component.ManaComponent", + "x": -1, + "y": 90, + "mana": "#mana" + }, + { + "type": "text", + "text": "#text", + "y": 130 } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/petal_apothecary.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/petal_apothecary.json index e61f5e9dd..79946a953 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/petal_apothecary.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/petal_apothecary.json @@ -1,10 +1,49 @@ { + "processor": "vazkii.botania.client.patchouli.processor.PetalApothecaryProcessor", "components": [ + { + "type": "image", + "image": "botania:textures/gui/petal_overlay.png", + "x": 0, + "y": 8, + "width": 116, + "height": 106, + "u": 17, + "v": 8 + }, + { + "type": "header", + "text": "#heading", + "x": -1, + "y": -1 + }, + { + "type": "custom", + "class": "vazkii.botania.client.patchouli.component.RotatingRecipeComponent", + "x": -1, + "y": 21, + "recipe_type": "petal_apothecary", + "recipe_name": "#recipe" + }, + { + "type": "item", + "item": "#output", + "framed": "false", + "link_recipe": true, + "x": 87, + "y": 18 + }, + { + "type": "item", + "item": "botania:apothecary_default", + "framed": "false", + "x": 49, + "y": 53 + }, { "type": "text", - "text": "Hello this is a test of the template system!", - "x": 20, - "y": 30 + "text": "#text", + "y": 130 } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/runic_altar.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/runic_altar.json index e61f5e9dd..edf007f6d 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/runic_altar.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/runic_altar.json @@ -1,10 +1,56 @@ { + "processor": "vazkii.botania.client.patchouli.processor.RunicAltarProcessor", "components": [ + { + "type": "image", + "image": "botania:textures/gui/petal_overlay.png", + "x": 0, + "y": 8, + "width": 116, + "height": 106, + "u": 17, + "v": 8 + }, + { + "type": "header", + "text": "#heading", + "x": -1, + "y": -1 + }, + { + "type": "custom", + "class": "vazkii.botania.client.patchouli.component.RotatingRecipeComponent", + "x": -1, + "y": 21, + "recipe_type": "runic_altar", + "recipe_name": "#recipe" + }, + { + "type": "item", + "item": "#output", + "framed": "false", + "link_recipe": true, + "x": 87, + "y": 18 + }, + { + "type": "item", + "item": "botania:runic_altar", + "framed": "false", + "x": 49, + "y": 53 + }, + { + "type": "custom", + "class": "vazkii.botania.client.patchouli.component.ManaComponent", + "mana": "#mana", + "x": -1, + "y": 103 + }, { "type": "text", - "text": "Hello this is a test of the template system!", - "x": 20, - "y": 30 + "text": "#text", + "y": 130 } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/terrasteel.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/terrasteel.json new file mode 100644 index 000000000..fcd1d1644 --- /dev/null +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/terrasteel.json @@ -0,0 +1,49 @@ +{ + "components": [ + { + "type": "image", + "image": "botania:textures/gui/terrasteel_overlay.png", + "x": 50, + "y": 28, + "width": 15, + "height": 29, + "u": 65, + "v": 48 + }, + { + "type": "item", + "item": "botania:manasteel_ingot", + "x": 50, + "y": 60 + }, + { + "type": "item", + "item": "botania:mana_pearl", + "x": 31, + "y": 66 + }, + { + "type": "item", + "item": "botania:mana_diamond", + "x": 69, + "y": 66 + }, + { + "type": "item", + "item": "botania:terrasteel_ingot", + "x": 50, + "y": 10 + }, + { + "type": "custom", + "class": "vazkii.botania.client.patchouli.component.TerraPlateComponent", + "x": 36, + "y": 80 + }, + { + "type": "text", + "text": "#text", + "y": 120 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/tmp_terrasteel.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/tmp_terrasteel.json deleted file mode 100644 index e61f5e9dd..000000000 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/tmp_terrasteel.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "components": [ - { - "type": "text", - "text": "Hello this is a test of the template system!", - "x": 20, - "y": 30 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/conversions/white_petal_block_deconstruct.json b/src/main/resources/data/botania/recipes/conversions/white_petal_block_deconstruct.json index ed46f6bc5..15a747a82 100644 --- a/src/main/resources/data/botania/recipes/conversions/white_petal_block_deconstruct.json +++ b/src/main/resources/data/botania/recipes/conversions/white_petal_block_deconstruct.json @@ -3,6 +3,7 @@ "item": "botania:white_petal", "count": 9 }, + "group": "botania:petal_block_deconstruct", "ingredients": [ { "item": "botania:white_petal_block"