diff --git a/build.gradle b/build.gradle index 3505c2dfe..fe807c2c8 100644 --- a/build.gradle +++ b/build.gradle @@ -99,8 +99,8 @@ test { dependencies { minecraft "net.minecraftforge:forge:${mc_version}-32.0.32" - compileOnly fg.deobf("vazkii.patchouli:Patchouli:1.16-36.188:api") - runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.16-36.188") + compileOnly fg.deobf("vazkii.patchouli:Patchouli:1.16-36.190:api") + runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.16-36.190") compileOnly fg.deobf("mezz.jei:jei-1.16.1:7.0.0.2:api") runtimeOnly fg.deobf("mezz.jei:jei-1.16.1:7.0.0.2") diff --git a/src/main/java/vazkii/botania/client/patchouli/PatchouliUtils.java b/src/main/java/vazkii/botania/client/patchouli/PatchouliUtils.java index 58a2c3b78..4f3e4c640 100644 --- a/src/main/java/vazkii/botania/client/patchouli/PatchouliUtils.java +++ b/src/main/java/vazkii/botania/client/patchouli/PatchouliUtils.java @@ -11,11 +11,13 @@ package vazkii.botania.client.patchouli; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; +import vazkii.patchouli.api.IVariable; import vazkii.patchouli.api.PatchouliAPI; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; -import java.util.StringJoiner; +import java.util.stream.Collectors; public class PatchouliUtils { @@ -28,9 +30,9 @@ public class PatchouliUtils { * @param longestIngredientSize Longest ingredient in the entire recipe * @return Serialized Patchouli ingredient string */ - public static String interweaveIngredients(List ingredients, int longestIngredientSize) { + public static IVariable interweaveIngredients(List ingredients, int longestIngredientSize) { if (ingredients.size() == 1) { - return PatchouliAPI.instance.serializeIngredient(ingredients.get(0)); + return IVariable.wrapList(Arrays.stream(ingredients.get(0).getMatchingStacks()).map(IVariable::from).collect(Collectors.toList())); } ItemStack[] empty = { ItemStack.EMPTY }; @@ -42,19 +44,19 @@ public class PatchouliUtils { stacks.add(empty); } } - StringJoiner joiner = new StringJoiner(","); + List list = new ArrayList<>(stacks.size() * longestIngredientSize); for (int i = 0; i < longestIngredientSize; i++) { for (ItemStack[] stack : stacks) { - joiner.add(PatchouliAPI.instance.serializeItemStack(stack[i % stack.length])); + list.add(IVariable.from(stack[i % stack.length])); } } - return joiner.toString(); + return IVariable.wrapList(list); } /** * Overload of the method above that uses the provided list's longest ingredient size. */ - public static String interweaveIngredients(List ingredients) { + public static IVariable 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/ManaComponent.java b/src/main/java/vazkii/botania/client/patchouli/component/ManaComponent.java index 234a6fa14..83702c796 100644 --- a/src/main/java/vazkii/botania/client/patchouli/component/ManaComponent.java +++ b/src/main/java/vazkii/botania/client/patchouli/component/ManaComponent.java @@ -8,6 +8,7 @@ */ package vazkii.botania.client.patchouli.component; +import com.google.common.collect.Streams; import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.client.Minecraft; @@ -19,9 +20,10 @@ import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.patchouli.api.IComponentRenderContext; import vazkii.patchouli.api.ICustomComponent; +import vazkii.patchouli.api.IVariable; import java.util.Arrays; -import java.util.function.Function; +import java.util.function.UnaryOperator; /** * A custom component that renders a mana bar. @@ -32,17 +34,12 @@ public class ManaComponent implements ICustomComponent { private transient int x, y; private transient int[] manaValues; - public String mana; + public IVariable 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 @@ -63,7 +60,8 @@ public class ManaComponent implements ICustomComponent { } @Override - public void onVariablesAvailable(Function lookup) { - mana = lookup.apply(mana); + public void onVariablesAvailable(UnaryOperator lookup) { + IVariable manaVar = lookup.apply(mana); + manaValues = manaVar.unwrap().isJsonArray() ? manaVar.asStream().map(IVariable::asNumber).mapToInt(Number::intValue).toArray() : new int[] { manaVar.asNumber(0).intValue() }; } } diff --git a/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponent.java b/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponent.java index 052a627ab..6d9f6de5a 100644 --- a/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponent.java +++ b/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponent.java @@ -10,27 +10,32 @@ package vazkii.botania.client.patchouli.component; import net.minecraft.item.crafting.Ingredient; +import vazkii.patchouli.api.IVariable; import vazkii.patchouli.api.PatchouliAPI; +import java.util.ArrayList; import java.util.List; -import java.util.function.Function; +import java.util.function.UnaryOperator; import java.util.stream.Collectors; /** * Patchouli custom component that draws a rotating circle of items from a provided list. */ public class RotatingItemListComponent extends RotatingItemListComponentBase { - public List ingredients; + public List ingredients; + + private transient List theIngredients = new ArrayList<>(); @Override protected List makeIngredients() { - return ingredients.stream().map(PatchouliAPI.instance::deserializeIngredient).collect(Collectors.toList()); + return theIngredients; } @Override - public void onVariablesAvailable(Function lookup) { + public void onVariablesAvailable(UnaryOperator lookup) { + theIngredients.clear(); for (int i = 0; i < ingredients.size(); i++) { - ingredients.set(i, lookup.apply(ingredients.get(i))); + theIngredients.add(lookup.apply(ingredients.get(i)).as(Ingredient.class)); } } } diff --git a/src/main/java/vazkii/botania/client/patchouli/component/RotatingRecipeComponent.java b/src/main/java/vazkii/botania/client/patchouli/component/RotatingRecipeComponent.java index 2a8a8c041..86430170a 100644 --- a/src/main/java/vazkii/botania/client/patchouli/component/RotatingRecipeComponent.java +++ b/src/main/java/vazkii/botania/client/patchouli/component/RotatingRecipeComponent.java @@ -16,10 +16,11 @@ import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; import vazkii.botania.common.crafting.ModRecipeTypes; +import vazkii.patchouli.api.IVariable; import java.util.List; import java.util.Map; -import java.util.function.Function; +import java.util.function.UnaryOperator; /** * Patchouli custom component that draws a rotating circle of items from the defined recipe. @@ -49,8 +50,8 @@ public class RotatingRecipeComponent extends RotatingItemListComponentBase { } @Override - public void onVariablesAvailable(Function lookup) { - recipeName = lookup.apply(recipeName); - recipeType = lookup.apply(recipeType); + public void onVariablesAvailable(UnaryOperator lookup) { + recipeName = lookup.apply(IVariable.wrap(recipeName)).asString(); + recipeType = lookup.apply(IVariable.wrap(recipeType)).asString(); } } diff --git a/src/main/java/vazkii/botania/client/patchouli/component/TerraPlateComponent.java b/src/main/java/vazkii/botania/client/patchouli/component/TerraPlateComponent.java index 4571181a1..f7261d3b2 100644 --- a/src/main/java/vazkii/botania/client/patchouli/component/TerraPlateComponent.java +++ b/src/main/java/vazkii/botania/client/patchouli/component/TerraPlateComponent.java @@ -14,9 +14,10 @@ import net.minecraft.item.ItemStack; import vazkii.patchouli.api.IComponentRenderContext; import vazkii.patchouli.api.ICustomComponent; +import vazkii.patchouli.api.IVariable; import vazkii.patchouli.api.PatchouliAPI; -import java.util.function.Function; +import java.util.function.UnaryOperator; /** * Patchouli custom component that draws provided stacks arranged like the Terrestial Agglomeration Plate multiblock. @@ -24,10 +25,10 @@ import java.util.function.Function; * Parameters: corner, center, edge, plate can be provided to override default blocks. */ public class TerraPlateComponent implements ICustomComponent { - public String corner = "botania:livingrock"; - public String center = "botania:livingrock"; - public String edge = "minecraft:lapis_block"; - public String plate = "botania:terra_plate"; + public IVariable corner = IVariable.wrap("botania:livingrock"); + public IVariable center = IVariable.wrap("botania:livingrock"); + public IVariable edge = IVariable.wrap("minecraft:lapis_block"); + public IVariable plate = IVariable.wrap("botania:terra_plate"); private transient int x, y; private transient ItemStack cornerBlock, centerBlock, middleBlock, plateBlock; @@ -36,10 +37,6 @@ public class TerraPlateComponent implements ICustomComponent { 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 @@ -72,10 +69,10 @@ public class TerraPlateComponent implements ICustomComponent { } @Override - public void onVariablesAvailable(Function lookup) { - corner = lookup.apply(corner); - center = lookup.apply(center); - edge = lookup.apply(edge); - plate = lookup.apply(plate); + public void onVariablesAvailable(UnaryOperator lookup) { + cornerBlock = lookup.apply(corner).as(ItemStack.class); + centerBlock = lookup.apply(center).as(ItemStack.class); + middleBlock = lookup.apply(edge).as(ItemStack.class); + plateBlock = lookup.apply(plate).as(ItemStack.class); } } diff --git a/src/main/java/vazkii/botania/client/patchouli/processor/BrewRecipeProcessor.java b/src/main/java/vazkii/botania/client/patchouli/processor/BrewRecipeProcessor.java index ceeb723a2..718d72570 100644 --- a/src/main/java/vazkii/botania/client/patchouli/processor/BrewRecipeProcessor.java +++ b/src/main/java/vazkii/botania/client/patchouli/processor/BrewRecipeProcessor.java @@ -19,15 +19,19 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.crafting.ModRecipeTypes; import vazkii.botania.common.item.ModItems; import vazkii.patchouli.api.IComponentProcessor; +import vazkii.patchouli.api.IVariable; import vazkii.patchouli.api.IVariableProvider; import vazkii.patchouli.api.PatchouliAPI; +import java.util.Arrays; +import java.util.stream.Collectors; + public class BrewRecipeProcessor implements IComponentProcessor { private IBrewRecipe recipe; @Override - public void setup(IVariableProvider variables) { - ResourceLocation id = new ResourceLocation(variables.get("recipe")); + public void setup(IVariableProvider variables) { + ResourceLocation id = new ResourceLocation(variables.get("recipe").asString()); IRecipe recipe = Minecraft.getInstance().world.getRecipeManager().getRecipes(ModRecipeTypes.BREW_TYPE).get(id); if (recipe instanceof IBrewRecipe) { this.recipe = (IBrewRecipe) recipe; @@ -37,27 +41,27 @@ public class BrewRecipeProcessor implements IComponentProcessor { } @Override - public String process(String key) { + public IVariable process(String key) { if (recipe == null) { return null; } else if (key.equals("heading")) { - return I18n.format("botaniamisc.brewOf", I18n.format(recipe.getBrew().getTranslationKey())); + return IVariable.wrap(I18n.format("botaniamisc.brewOf", I18n.format(recipe.getBrew().getTranslationKey()))); } else if (key.equals("vial")) { - return PatchouliAPI.instance.serializeItemStack(recipe.getOutput(new ItemStack(ModItems.vial))); + return IVariable.from(recipe.getOutput(new ItemStack(ModItems.vial))); } else if (key.equals("flask")) { - return PatchouliAPI.instance.serializeItemStack(recipe.getOutput(new ItemStack(ModItems.flask))); + return IVariable.from(recipe.getOutput(new ItemStack(ModItems.flask))); } else if (key.startsWith("input")) { int requestedIndex = Integer.parseInt(key.substring(5)) - 1; int indexOffset = (6 - recipe.getIngredients().size()) / 2; //Center the brew ingredients int index = requestedIndex - indexOffset; if (index < recipe.getIngredients().size() && index >= 0) { - return PatchouliAPI.instance.serializeIngredient(recipe.getIngredients().get(index)); + return IVariable.wrapList(Arrays.stream(recipe.getIngredients().get(index).getMatchingStacks()).map(IVariable::from).collect(Collectors.toList())); } else { return null; } } else if (key.equals("is_offset")) { - return Boolean.toString(recipe.getIngredients().size() % 2 == 0); + return IVariable.wrap(recipe.getIngredients().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 index c2e7fcc43..ca93cc7d3 100644 --- a/src/main/java/vazkii/botania/client/patchouli/processor/ElvenTradeProcessor.java +++ b/src/main/java/vazkii/botania/client/patchouli/processor/ElvenTradeProcessor.java @@ -21,8 +21,8 @@ import vazkii.botania.client.patchouli.PatchouliUtils; import vazkii.botania.common.Botania; import vazkii.botania.common.crafting.ModRecipeTypes; import vazkii.patchouli.api.IComponentProcessor; +import vazkii.patchouli.api.IVariable; import vazkii.patchouli.api.IVariableProvider; -import vazkii.patchouli.api.PatchouliAPI; import java.util.List; import java.util.stream.Collectors; @@ -32,10 +32,10 @@ public class ElvenTradeProcessor implements IComponentProcessor { private int longestIngredientSize, mostInputs, mostOutputs; @Override - public void setup(IVariableProvider variables) { + public void setup(IVariableProvider variables) { ImmutableList.Builder builder = ImmutableList.builder(); - for (String s : variables.get("recipes").split(";")) { - IRecipe recipe = Minecraft.getInstance().world.getRecipeManager().getRecipes(ModRecipeTypes.ELVEN_TRADE_TYPE).get(new ResourceLocation(s)); + for (IVariable s : variables.get("recipes").asListOrSingleton()) { + IRecipe recipe = Minecraft.getInstance().world.getRecipeManager().getRecipes(ModRecipeTypes.ELVEN_TRADE_TYPE).get(new ResourceLocation(s.asString())); if (recipe instanceof IElvenTradeRecipe) { builder.add((IElvenTradeRecipe) recipe); } else { @@ -61,12 +61,12 @@ public class ElvenTradeProcessor implements IComponentProcessor { } @Override - public String process(String key) { + public IVariable process(String key) { if (recipes.isEmpty()) { return null; } if (key.equals("heading")) { - return recipes.get(0).getOutputs().get(0).getDisplayName().getString(); + return IVariable.wrap(recipes.get(0).getOutputs().get(0).getDisplayName().getString()); } else if (key.startsWith("input")) { int index = Integer.parseInt(key.substring(5)) - 1; if (index < mostInputs) { @@ -78,17 +78,16 @@ public class ElvenTradeProcessor implements IComponentProcessor { if (key.startsWith("output")) { int index = Integer.parseInt(key.substring(6)) - 1; if (index < mostOutputs) { - return recipes.stream().map(IElvenTradeRecipe::getOutputs) + return IVariable.wrapList(recipes.stream().map(IElvenTradeRecipe::getOutputs) .map(l -> index < l.size() ? l.get(index) : ItemStack.EMPTY) - .map(PatchouliAPI.instance::serializeItemStack).collect(Collectors.joining(",")); - } else { - return null; + .map(IVariable::from) + .collect(Collectors.toList())); } } return null; } - private String interweaveIngredients(int inputIndex) { + private IVariable interweaveIngredients(int inputIndex) { List recipes = this.recipes.stream().map(IElvenTradeRecipe::getIngredients).map(ingredients -> { if (inputIndex < ingredients.size()) { return ingredients.get(inputIndex); diff --git a/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java b/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java index 9942c2e67..47fd5fa21 100644 --- a/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java +++ b/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java @@ -25,8 +25,8 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.crafting.ModRecipeTypes; import vazkii.patchouli.api.IComponentProcessor; +import vazkii.patchouli.api.IVariable; import vazkii.patchouli.api.IVariableProvider; -import vazkii.patchouli.api.PatchouliAPI; import java.util.List; import java.util.stream.Collectors; @@ -36,20 +36,20 @@ public class ManaInfusionProcessor implements IComponentProcessor { private boolean hasCustomHeading; @Override - public void setup(IVariableProvider variables) { + public void setup(IVariableProvider variables) { if (variables.has("recipes") && variables.has("group")) { Botania.LOGGER.warn("Mana infusion template has both 'recipes' and 'group', ignoring 'recipes'"); } ImmutableList.Builder builder = ImmutableList.builder(); if (variables.has("group")) { - String group = variables.get("group"); + String group = variables.get("group").asString(); TilePool.manaInfusionRecipes(Minecraft.getInstance().world.getRecipeManager()).stream() .filter(r -> r.getGroup().equals(group)) .forEach(builder::add); } else { - for (String s : variables.get("recipes").split(";")) { - IRecipe recipe = Minecraft.getInstance().world.getRecipeManager().getRecipes(ModRecipeTypes.MANA_INFUSION_TYPE).get(new ResourceLocation(s)); + for (IVariable s : variables.get("recipes").asListOrSingleton()) { + IRecipe recipe = Minecraft.getInstance().world.getRecipeManager().getRecipes(ModRecipeTypes.MANA_INFUSION_TYPE).get(new ResourceLocation(s.asString())); if (recipe instanceof IManaInfusionRecipe) { builder.add((IManaInfusionRecipe) recipe); } else { @@ -63,39 +63,38 @@ public class ManaInfusionProcessor implements IComponentProcessor { } @Override - public String process(String key) { + public IVariable process(String key) { if (recipes.isEmpty()) { return null; } switch (key) { case "heading": if (!hasCustomHeading) { - return recipes.get(0).getRecipeOutput().getDisplayName().getString(); + return IVariable.wrap(recipes.get(0).getRecipeOutput().getDisplayName().getString()); } return null; case "input": return PatchouliUtils.interweaveIngredients(recipes.stream().map(r -> r.getIngredients().get(0)).collect(Collectors.toList())); case "output": - return recipes.stream().map(IManaInfusionRecipe::getRecipeOutput).map(PatchouliAPI.instance::serializeItemStack).collect(Collectors.joining(",")); + return IVariable.wrapList(recipes.stream().map(IManaInfusionRecipe::getRecipeOutput).map(IVariable::from).collect(Collectors.toList())); case "catalyst": - return recipes.stream().map(IManaInfusionRecipe::getCatalyst) + return IVariable.wrapList(recipes.stream().map(IManaInfusionRecipe::getCatalyst) .map(state -> { if (state == null) { return ItemStack.EMPTY; } return new ItemStack(state.getBlock().asItem()); }) - .map(PatchouliAPI.instance::serializeItemStack) - .collect(Collectors.joining(",")); + .map(IVariable::from) + .collect(Collectors.toList())); case "mana": - return recipes.stream().mapToInt(IManaInfusionRecipe::getManaToConsume).mapToObj(Integer::toString).collect(Collectors.joining(";")); + return IVariable.wrapList(recipes.stream().mapToInt(IManaInfusionRecipe::getManaToConsume).mapToObj(IVariable::wrap).collect(Collectors.toList())); case "drop": - return I18n.format("botaniamisc.drop") + TextFormatting.BOLD + " (?)"; + return IVariable.wrap(I18n.format("botaniamisc.drop") + TextFormatting.BOLD + " (?)"); case "dropTip0": - case "dropTip1": { + case "dropTip1": ITextComponent drop = new KeybindTextComponent("key.drop").func_240699_a_(TextFormatting.GREEN); - return I18n.format("botaniamisc.dropTip" + key.substring(7), drop); - } + return IVariable.wrap(I18n.format("botaniamisc.dropTip" + key.substring(7), drop)); } 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 index e514b7ed7..09da89393 100644 --- a/src/main/java/vazkii/botania/client/patchouli/processor/MultiCraftingProcessor.java +++ b/src/main/java/vazkii/botania/client/patchouli/processor/MultiCraftingProcessor.java @@ -21,6 +21,7 @@ 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.IVariable; import vazkii.patchouli.api.IVariableProvider; import vazkii.patchouli.api.PatchouliAPI; @@ -36,9 +37,9 @@ public class MultiCraftingProcessor implements IComponentProcessor { private boolean hasCustomHeading; @Override - public void setup(IVariableProvider variables) { + public void setup(IVariableProvider variables) { Map> recipeMap = Minecraft.getInstance().world.getRecipeManager().getRecipes(IRecipeType.CRAFTING); - String[] names = variables.get("recipes").split(";"); + List names = variables.get("recipes").asStream().map(IVariable::asString).collect(Collectors.toList()); this.recipes = new ArrayList<>(); for (String name : names) { IRecipe recipe = recipeMap.get(new ResourceLocation(name)); @@ -61,13 +62,13 @@ public class MultiCraftingProcessor implements IComponentProcessor { } @Override - public String process(String key) { + public IVariable process(String key) { if (recipes.isEmpty()) { return null; } if (key.equals("heading")) { if (!hasCustomHeading) { - return recipes.get(0).getRecipeOutput().getDisplayName().getString(); + return IVariable.wrap(recipes.get(0).getRecipeOutput().getDisplayName().getString()); } return null; } @@ -95,9 +96,11 @@ public class MultiCraftingProcessor implements IComponentProcessor { return PatchouliUtils.interweaveIngredients(ingredients, longestIngredientSize); } if (key.equals("output")) { - return recipes.stream().map(ICraftingRecipe::getRecipeOutput).map(PatchouliAPI.instance::serializeItemStack).collect(Collectors.joining(",")); + return IVariable.wrapList(recipes.stream().map(ICraftingRecipe::getRecipeOutput).map(IVariable::from).collect(Collectors.toList())); + } + if (key.equals("shapeless")) { + return IVariable.wrap(shapeless); } - if (key.equals("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 index 71a9b0959..80fbc0bb9 100644 --- a/src/main/java/vazkii/botania/client/patchouli/processor/PetalApothecaryProcessor.java +++ b/src/main/java/vazkii/botania/client/patchouli/processor/PetalApothecaryProcessor.java @@ -15,15 +15,15 @@ import net.minecraft.util.ResourceLocation; import vazkii.botania.common.Botania; import vazkii.botania.common.crafting.ModRecipeTypes; import vazkii.patchouli.api.IComponentProcessor; +import vazkii.patchouli.api.IVariable; import vazkii.patchouli.api.IVariableProvider; -import vazkii.patchouli.api.PatchouliAPI; public class PetalApothecaryProcessor implements IComponentProcessor { protected IRecipe recipe; @Override - public void setup(IVariableProvider variables) { - ResourceLocation id = new ResourceLocation(variables.get("recipe")); + public void setup(IVariableProvider variables) { + ResourceLocation id = new ResourceLocation(variables.get("recipe").asString()); this.recipe = Minecraft.getInstance().world.getRecipeManager().getRecipes(ModRecipeTypes.PETAL_TYPE).get(id); if (recipe == null) { Botania.LOGGER.warn("Missing apothecary recipe " + id); @@ -31,17 +31,17 @@ public class PetalApothecaryProcessor implements IComponentProcessor { } @Override - public String process(String key) { + public IVariable process(String key) { if (recipe == null) { return null; } switch (key) { case "recipe": - return recipe.getId().toString(); + return IVariable.wrap(recipe.getId().toString()); case "output": - return PatchouliAPI.instance.serializeItemStack(recipe.getRecipeOutput()); + return IVariable.from(recipe.getRecipeOutput()); case "heading": - return recipe.getRecipeOutput().getDisplayName().getString(); + return IVariable.wrap(recipe.getRecipeOutput().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 index 8107fef36..46fb603fd 100644 --- a/src/main/java/vazkii/botania/client/patchouli/processor/RunicAltarProcessor.java +++ b/src/main/java/vazkii/botania/client/patchouli/processor/RunicAltarProcessor.java @@ -14,12 +14,13 @@ import net.minecraft.util.ResourceLocation; import vazkii.botania.api.recipe.IRuneAltarRecipe; import vazkii.botania.common.Botania; import vazkii.botania.common.crafting.ModRecipeTypes; +import vazkii.patchouli.api.IVariable; import vazkii.patchouli.api.IVariableProvider; public class RunicAltarProcessor extends PetalApothecaryProcessor { @Override - public void setup(IVariableProvider variables) { - ResourceLocation id = new ResourceLocation(variables.get("recipe")); + public void setup(IVariableProvider variables) { + ResourceLocation id = new ResourceLocation(variables.get("recipe").asString()); this.recipe = Minecraft.getInstance().world.getRecipeManager().getRecipes(ModRecipeTypes.RUNE_TYPE).get(id); if (recipe == null) { Botania.LOGGER.warn("Missing rune altar recipe " + id); @@ -27,9 +28,9 @@ public class RunicAltarProcessor extends PetalApothecaryProcessor { } @Override - public String process(String key) { + public IVariable process(String key) { if (key.equals("mana")) { - return String.valueOf(((IRuneAltarRecipe) recipe).getManaUsage()); + return IVariable.wrap(((IRuneAltarRecipe) recipe).getManaUsage()); } return super.process(key); } 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 b5976897b..5705d3529 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 @@ -27,17 +27,17 @@ { "type": "botania:elven_trade", "text": "botania.page.elfResources3", - "recipes": "botania:elven_trade/elementium;botania:elven_trade/elementium_block" + "recipes": ["botania:elven_trade/elementium", "botania:elven_trade/elementium_block"] }, { "type": "botania:elven_trade", "text": "botania.page.elfResources4", - "recipes": "botania:elven_trade/pixie_dust" + "recipes": ["botania:elven_trade/pixie_dust"] }, { "type": "botania:elven_trade", "text": "botania.page.elfResources5", - "recipes": "botania:elven_trade/dragonstone;botania:elven_trade/dragonstone_block" + "recipes": ["botania:elven_trade/dragonstone", "botania:elven_trade/dragonstone_block"] }, { "type": "text", 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 51643057c..587b55aad 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 @@ -14,7 +14,7 @@ "text": "botania.page.flowers1", "images": [ "botania:textures/gui/entries/flowers_0.png", - "botania:textures/gui/entries/flowers_1.png" + "botania:textures/gui/entries/flowers_1.png" ] }, { @@ -24,7 +24,24 @@ { "type": "botania: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_light_gray;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_light_gray", + "botania:petal_cyan", + "botania:petal_purple", + "botania:petal_blue", + "botania:petal_brown", + "botania:petal_green", + "botania:petal_red", + "botania:petal_black" + ] }, { "type": "crafting", @@ -34,7 +51,24 @@ { "type": "botania: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_light_gray;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_light_gray", + "botania:dye_cyan", + "botania:dye_purple", + "botania:dye_blue", + "botania:dye_brown", + "botania:dye_green", + "botania:dye_red", + "botania:dye_black" + ] }, { "type": "text", @@ -61,17 +95,68 @@ { "type": "botania: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_light_gray_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_light_gray_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": "botania: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": "botania:crafting_multi", "text": "botania.page.flowers13", - "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/light_gray_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/light_gray_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" + ] } ], "extra_recipe_mappings": { diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/garden_of_glass.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/garden_of_glass.json index 44c1f03bc..f5a42a95f 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/garden_of_glass.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/garden_of_glass.json @@ -49,7 +49,10 @@ { "type": "botania:mana_infusion", "text": "botania.page.gardenOfGlass13", - "recipes": "gardenofglass:mana_infusion/prismarine_shard;gardenofglass:mana_infusion/prismarine_crystals" + "recipes": [ + "gardenofglass:mana_infusion/prismarine_shard", + "gardenofglass:mana_infusion/prismarine_crystals" + ] }, { "type": "text", 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 81c30e554..fca15772d 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 @@ -49,7 +49,17 @@ { "type": "botania: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" + ] } ] } 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 5b00b3366..4e83af214 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 @@ -31,12 +31,23 @@ { "type": "botania:mana_infusion", "text": "botania.page.manaAlchemy5", - "recipes": "botania:mana_infusion/redstone_to_glowstone_dust;botania:mana_infusion/glowstone_deconstruct" + "recipes": [ + "botania:mana_infusion/redstone_to_glowstone_dust", + "botania:mana_infusion/glowstone_deconstruct" + ] }, { "type": "botania:mana_infusion", "text": "botania.page.manaAlchemy6", - "recipes": "botania:mana_infusion/quartz_deconstruct;botania:mana_infusion/dark_quartz_deconstruct;botania:mana_infusion/mana_quartz_deconstruct;botania:mana_infusion/blaze_quartz_deconstruct;botania:mana_infusion/lavender_quartz_deconstruct;botania:mana_infusion/red_quartz_deconstruct;botania:mana_infusion/elf_quartz_deconstruct" + "recipes": [ + "botania:mana_infusion/quartz_deconstruct", + "botania:mana_infusion/dark_quartz_deconstruct", + "botania:mana_infusion/mana_quartz_deconstruct", + "botania:mana_infusion/blaze_quartz_deconstruct", + "botania:mana_infusion/lavender_quartz_deconstruct", + "botania:mana_infusion/red_quartz_deconstruct", + "botania:mana_infusion/elf_quartz_deconstruct" + ] }, { "type": "botania:mana_infusion", @@ -51,7 +62,10 @@ { "type": "botania:mana_infusion", "text": "botania.page.manaAlchemy9", - "recipes": "botania:mana_infusion/vine_to_lily_pad;botania:mana_infusion/lily_pad_to_vine" + "recipes": [ + "botania:mana_infusion/vine_to_lily_pad", + "botania:mana_infusion/lily_pad_to_vine" + ] }, { "type": "botania:mana_infusion", @@ -66,7 +80,10 @@ { "type": "botania:mana_infusion", "text": "botania.page.manaAlchemy12", - "recipes": "botania:mana_infusion/wheat_seeds_to_potato;botania:mana_infusion/potato_unpoison" + "recipes": [ + "botania:mana_infusion/wheat_seeds_to_potato", + "botania:mana_infusion/potato_unpoison" + ] }, { "type": "botania:mana_infusion", @@ -91,7 +108,10 @@ { "type": "botania:mana_infusion", "text": "botania.page.manaAlchemy17", - "recipes": "botania:mana_infusion/cactus_to_slime;botania:mana_infusion/slime_to_cactus" + "recipes": [ + "botania:mana_infusion/cactus_to_slime", + "botania:mana_infusion/slime_to_cactus" + ] }, { "type": "botania:mana_infusion", @@ -101,7 +121,11 @@ { "type": "botania:mana_infusion", "text": "botania.page.manaAlchemy19", - "recipes": "botania:mana_infusion/glowstone_dust_to_redstone;botania:mana_infusion/redstone_to_glowstone_dust;botania:mana_infusion/glowstone_deconstruct" + "recipes": [ + "botania:mana_infusion/glowstone_dust_to_redstone", + "botania:mana_infusion/redstone_to_glowstone_dust", + "botania:mana_infusion/glowstone_deconstruct" + ] }, { "type": "botania:mana_infusion", @@ -116,12 +140,20 @@ { "type": "botania:mana_infusion", "text": "botania.page.manaAlchemy26", - "recipes": "botania:mana_infusion/granite_to_andesite;botania:mana_infusion/stone_to_andesite;botania:mana_infusion/andesite_to_diorite;botania:mana_infusion/diorite_to_granite" + "recipes": [ + "botania:mana_infusion/granite_to_andesite", + "botania:mana_infusion/stone_to_andesite", + "botania:mana_infusion/andesite_to_diorite", + "botania:mana_infusion/diorite_to_granite" + ] }, { "type": "botania:mana_infusion", "text": "botania.page.manaAlchemy22", - "recipes": "botania:mana_infusion/clay_deconstruct;botania:mana_infusion/brick_deconstruct" + "recipes": [ + "botania:mana_infusion/clay_deconstruct", + "botania:mana_infusion/brick_deconstruct" + ] }, { "type": "botania:mana_infusion", 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 47c7106ec..8c85162ce 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 @@ -57,7 +57,14 @@ { "type": "botania:mana_infusion", "text": "botania.page.manaConjuration10", - "recipes": "botania:mana_infusion/oak_leaves_dupe;botania:mana_infusion/spruce_leaves_dupe;botania:mana_infusion/birch_leaves_dupe;botania:mana_infusion/jungle_leaves_dupe;botania:mana_infusion/acacia_leaves_dupe;botania:mana_infusion/dark_oak_leaves_dupe" + "recipes": [ + "botania:mana_infusion/oak_leaves_dupe", + "botania:mana_infusion/spruce_leaves_dupe", + "botania:mana_infusion/birch_leaves_dupe", + "botania:mana_infusion/jungle_leaves_dupe", + "botania:mana_infusion/acacia_leaves_dupe", + "botania:mana_infusion/dark_oak_leaves_dupe" + ] }, { "type": "botania:mana_infusion", 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 498b76ef6..fb3ccded8 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 @@ -33,7 +33,16 @@ { "type": "botania:crafting_multi", "text": "botania.page.flightTiara3", - "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" + "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" + ] } ] } 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 576706777..992b9d9d1 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 @@ -13,7 +13,7 @@ "text": "botania.page.marimorphosis1", "images": [ "botania:textures/gui/entries/metamorphic_stones_0.png", - "botania:textures/gui/entries/metamorphic_stones_1.png" + "botania:textures/gui/entries/metamorphic_stones_1.png" ] }, { @@ -24,7 +24,16 @@ { "type": "botania:crafting_multi", "text": "botania.page.marimorphosis3", - "recipes": "botania:apothecary_forest;botania:apothecary_plains;botania:apothecary_mountain;botania:apothecary_fungal;botania:apothecary_swamp;botania:apothecary_desert;botania:apothecary_taiga;botania:apothecary_mesa" + "recipes": [ + "botania:apothecary_forest", + "botania:apothecary_plains", + "botania:apothecary_mountain", + "botania:apothecary_fungal", + "botania:apothecary_swamp", + "botania:apothecary_desert", + "botania:apothecary_taiga", + "botania:apothecary_mesa" + ] } ] } 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 9c72e6322..232a1a211 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 @@ -39,7 +39,10 @@ { "type": "botania:mana_infusion", "text": "botania.page.pool3", - "recipes": "botania:mana_infusion/manasteel;botania:mana_infusion/manasteel_block" + "recipes": [ + "botania:mana_infusion/manasteel", + "botania:mana_infusion/manasteel_block" + ] }, { "type": "botania:mana_infusion", @@ -49,12 +52,18 @@ { "type": "botania:mana_infusion", "text": "botania.page.pool5", - "recipes": "botania:mana_infusion/mana_diamond;botania:mana_infusion/mana_diamond_block" + "recipes": [ + "botania:mana_infusion/mana_diamond", + "botania:mana_infusion/mana_diamond_block" + ] }, { "type": "botania:mana_infusion", "text": "botania.page.pool6", - "recipes": "botania:mana_infusion/mana_powder_dust;botania:mana_infusion/mana_powder_dye" + "recipes": [ + "botania:mana_infusion/mana_powder_dust", + "botania:mana_infusion/mana_powder_dye" + ] }, { "type": "botania:mana_infusion", 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 711424af0..39da0695e 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 @@ -28,7 +28,12 @@ { "type": "botania: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" + ] } ] } 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 ba76438c2..7f6785f5d 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 @@ -25,7 +25,24 @@ { "type": "botania: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" + ] } ] } 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 5f593f32b..dbc150573 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 @@ -11,7 +11,24 @@ { "type": "botania: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" + ] } ] } 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 f145167c7..27fe141ff 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,7 +10,14 @@ { "type": "botania: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" + ] } ] } 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 8462a269b..db231298e 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 @@ -15,12 +15,46 @@ { "type": "botania: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": "botania: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" + ] } ] } 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 f2b103437..0cd94ee8a 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 @@ -30,7 +30,14 @@ { "type": "botania: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" + ] } ], "extra_recipe_mappings": { 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 3dc533fe8..c8c9e691d 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 @@ -21,7 +21,27 @@ { "type": "botania:crafting_multi", "text": "botania.page.laputaShard3", - "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" + "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" + ] } ] } 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 46fb27604..47cbd2843 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 @@ -22,7 +22,7 @@ { "type": "image", "image": "patchouli:textures/gui/crafting.png", - "guard": "#shapeless->exists", + "guard": "#shapeless", "x": 71, "y": 6, "u": 0, @@ -34,9 +34,9 @@ }, { "type": "tooltip", - "guard": "#shapeless->exists", + "guard": "#shapeless", "tooltip": [ - "#shapeless" + "patchouli.gui.lexicon.shapeless->i18n" ], "x": 71, "y": 6, @@ -110,4 +110,4 @@ "y": 69 } ] -} \ 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 1c3066e44..c230dad38 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,80 +1,85 @@ -{ - "processor": "vazkii.botania.client.patchouli.processor.ManaInfusionProcessor", - "components": [ - { - "type": "image", - "image": "botania:textures/gui/mana_infusion_overlay.png", - "x": 1, - "y": 16, - "width": 116, - "height": 106, - "u": 17, - "v": 28 - }, - { - "type": "text", - "text": "#drop", - "color": "77000000", - "x": 27, - "y": 17 - }, - { - "type": "tooltip", - "tooltip": [ - "#dropTip0", - "#dropTip1" - ], - "x": 27, - "y": 17, - "width": 30, - "height": 10 - }, - { - "type": "header", - "text": "#heading", - "x": -1, - "y": -1 - }, - { - "type": "item", - "item": "#input", - "framed": "false", - "x": 20, - "y": 41 - }, - { - "type": "item", - "item": "#catalyst", - "framed": "false", - "x": 20, - "y": 65 - }, - { - "type": "item", - "item": "botania:mana_pool:0{RenderFull:1b}", - "framed": "false", - "x": 49, - "y": 41 - }, - { - "type": "item", - "item": "#output", - "framed": "false", - "link_recipe": true, - "x": 78, - "y": 41 - }, - { - "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 +{ + "processor": "vazkii.botania.client.patchouli.processor.ManaInfusionProcessor", + "components": [ + { + "type": "image", + "image": "botania:textures/gui/mana_infusion_overlay.png", + "x": 1, + "y": 16, + "width": 116, + "height": 106, + "u": 17, + "v": 28 + }, + { + "type": "text", + "text": "#drop", + "color": "77000000", + "x": 27, + "y": 17 + }, + { + "type": "tooltip", + "tooltip": [ + "#dropTip0", + "#dropTip1" + ], + "x": 27, + "y": 17, + "width": 30, + "height": 10 + }, + { + "type": "header", + "text": "#heading", + "x": -1, + "y": -1 + }, + { + "type": "item", + "item": "#input", + "framed": "false", + "x": 20, + "y": 41 + }, + { + "type": "item", + "item": "#catalyst", + "framed": "false", + "x": 20, + "y": 65 + }, + { + "type": "item", + "item": { + "item": "botania:mana_pool", + "nbt": { + "RenderFull": 1 + } + }, + "framed": "false", + "x": 49, + "y": 41 + }, + { + "type": "item", + "item": "#output", + "framed": "false", + "link_recipe": true, + "x": 78, + "y": 41 + }, + { + "type": "custom", + "class": "vazkii.botania.client.patchouli.component.ManaComponent", + "x": -1, + "y": 90, + "mana": "#mana" + }, + { + "type": "text", + "text": "#text", + "y": 130 + } + ] +} 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 index 9f5e26e21..d0619909c 100644 --- 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 @@ -47,4 +47,4 @@ "y": 120 } ] -} \ No newline at end of file +}