From fc65cbd1f54e78b90611649db3d6e347f64afb3f Mon Sep 17 00:00:00 2001 From: Hubry Date: Thu, 3 Oct 2019 20:10:11 +0200 Subject: [PATCH] Tweak templates, remove workarounds, mark some entries as default read --- .../botania/api/lexicon/LexiconEntry.java | 34 +++++++-- .../client/patchouli/PatchouliUtils.java | 13 ---- .../component/ItemStackListComponent.java | 69 ------------------- .../patchouli/component/ManaComponent.java | 6 +- .../RotatingItemListComponentBase.java | 3 +- .../processor/ManaInfusionProcessor.java | 9 +++ .../processor/MultiCraftingProcessor.java | 16 +++-- .../common/lexicon/CompatLexiconEntry.java | 2 +- .../botania/common/lexicon/LexiconData.java | 33 +++++++-- .../common/lexicon/RelicLexiconEntry.java | 2 +- .../botania/patchouli_books/lexicon/book.json | 3 +- .../en_us/entries/alfhomancy/elven_lore.json | 22 ++++-- .../en_us/entries/alfhomancy/flugel_eye.json | 1 + .../entries/alfhomancy/infinite_fruit.json | 1 + .../en_us/entries/alfhomancy/king_key.json | 1 + .../en_us/entries/alfhomancy/loki_ring.json | 1 + .../en_us/entries/alfhomancy/odin_ring.json | 1 + .../en_us/entries/alfhomancy/thor_ring.json | 1 + .../en_us/entries/basics/black_lotus.json | 1 + .../en_us/entries/basics/flower_bag.json | 1 + .../en_us/entries/basics/terrasteel.json | 1 + .../lexicon/en_us/entries/basics/welcome.json | 1 + .../en_us/entries/baubles/aura_ring.json | 1 + .../en_us/entries/baubles/blood_pendant.json | 1 + .../en_us/entries/baubles/cloud_pendant.json | 1 + .../en_us/entries/baubles/diva_charm.json | 1 + .../en_us/entries/baubles/dodge_ring.json | 1 + .../en_us/entries/baubles/goddess_charm.json | 1 + .../en_us/entries/baubles/ice_pendant.json | 1 + .../entries/baubles/invisibility_cloak.json | 1 + .../en_us/entries/baubles/item_finder.json | 1 + .../entries/baubles/judgement_cloaks.json | 1 + .../en_us/entries/baubles/knockback_belt.json | 1 + .../en_us/entries/baubles/lava_pendant.json | 1 + .../en_us/entries/baubles/magnet_ring.json | 1 + .../en_us/entries/baubles/mana_ring.json | 1 + .../en_us/entries/baubles/mining_ring.json | 1 + .../en_us/entries/baubles/pixie_ring.json | 1 + .../en_us/entries/baubles/reach_ring.json | 1 + .../en_us/entries/baubles/speed_up_belt.json | 1 + .../entries/baubles/super_cloud_pendant.json | 1 + .../entries/baubles/super_lava_pendant.json | 1 + .../entries/baubles/super_travel_belt.json | 1 + .../en_us/entries/baubles/swap_ring.json | 1 + .../en_us/entries/baubles/third_eye.json | 1 + .../en_us/entries/baubles/tiny_planet.json | 1 + .../en_us/entries/baubles/travel_belt.json | 1 + .../en_us/entries/baubles/water_ring.json | 1 + .../en_us/entries/devices/animated_torch.json | 1 + .../lexicon/en_us/entries/devices/avatar.json | 1 + .../en_us/entries/devices/brewery.json | 1 + .../en_us/entries/devices/canopy_drum.json | 1 + .../lexicon/en_us/entries/devices/cocoon.json | 1 + .../en_us/entries/devices/complex_brews.json | 1 + .../en_us/entries/devices/craft_crate.json | 1 + .../en_us/entries/devices/fel_pumpkin.json | 1 + .../lexicon/en_us/entries/devices/flasks.json | 1 + .../en_us/entries/devices/forest_drum.json | 1 + .../en_us/entries/devices/forest_eye.json | 1 + .../en_us/entries/devices/gather_drum.json | 1 + .../en_us/entries/devices/ghost_rail.json | 1 + .../en_us/entries/devices/incense.json | 1 + .../en_us/entries/devices/mana_alchemy.json | 5 +- .../en_us/entries/devices/mana_bomb.json | 1 + .../entries/devices/mana_conjuration.json | 3 +- .../entries/devices/mana_enchanting.json | 1 + .../en_us/entries/devices/platform.json | 1 + .../lexicon/en_us/entries/devices/pylon.json | 1 + .../entries/devices/spectral_platform.json | 1 + .../en_us/entries/devices/teru_teru_bozu.json | 1 + .../en_us/entries/devices/turntable.json | 1 + .../entries/ender/black_hole_talisman.json | 1 + .../lexicon/en_us/entries/ender/corporea.json | 1 + .../entries/ender/corporea_crystal_cube.json | 1 + .../en_us/entries/ender/corporea_funnel.json | 1 + .../en_us/entries/ender/corporea_index.json | 1 + .../entries/ender/corporea_interceptor.json | 1 + .../entries/ender/corporea_retainer.json | 1 + .../en_us/entries/ender/ender_dagger.json | 1 + .../en_us/entries/ender/ender_eye_block.json | 1 + .../en_us/entries/ender/ender_hand.json | 1 + .../en_us/entries/ender/flight_tiara.json | 1 + .../lexicon/en_us/entries/ender/keep_ivy.json | 1 + .../entries/ender/luminizer_transport.json | 1 + .../en_us/entries/ender/piston_relay.json | 1 + .../en_us/entries/ender/red_string.json | 1 + .../en_us/entries/ender/spawner_claw.json | 1 + .../en_us/entries/ender/spawner_mover.json | 1 + .../en_us/entries/ender/star_sword.json | 1 + .../en_us/entries/ender/thunder_sword.json | 1 + .../functional_flowers/agricarnation.json | 1 + .../functional_flowers/bellethorne.json | 1 + .../entries/functional_flowers/bergamute.json | 1 + .../entries/functional_flowers/bubbell.json | 1 + .../entries/functional_flowers/clayconia.json | 1 + .../entries/functional_flowers/daffomill.json | 1 + .../functional_flowers/dreadthorne.json | 1 + .../entries/functional_flowers/exoflame.json | 1 + .../functional_flowers/fallen_kanade.json | 1 + .../functional_flowers/flower_shrinking.json | 2 +- .../functional_flowers/heisei_dream.json | 1 + .../functional_flowers/hopperhock.json | 1 + .../entries/functional_flowers/hyacidus.json | 1 + .../functional_flowers/jaded_amaranthus.json | 1 + .../entries/functional_flowers/jiyuulia.json | 1 + .../entries/functional_flowers/loonium.json | 1 + .../functional_flowers/marimorphosis.json | 1 + .../entries/functional_flowers/medumone.json | 1 + .../entries/functional_flowers/orechid.json | 1 + .../functional_flowers/orechid_ignem.json | 1 + .../functional_flowers/pollidisiac.json | 1 + .../functional_flowers/rannuncarpus.json | 1 + .../functional_flowers/solegnolia.json | 1 + .../functional_flowers/spectranthemum.json | 1 + .../functional_flowers/tangleberrie.json | 1 + .../entries/functional_flowers/tigerseye.json | 1 + .../functional_flowers/vinculotus.json | 1 + .../generating_flowers/arcanerose.json | 1 + .../generating_flowers/dandelifeon.json | 1 + .../entries/generating_flowers/endoflame.json | 1 + .../generating_flowers/entropinnyum.json | 1 + .../generating_flowers/gourmaryllis.json | 1 + .../generating_flowers/hydroangeas.json | 1 + .../entries/generating_flowers/kekimurus.json | 1 + .../entries/generating_flowers/munchdew.json | 1 + .../generating_flowers/narslimmus.json | 1 + .../generating_flowers/rafflowsia.json | 1 + .../generating_flowers/shulk_me_not.json | 1 + .../generating_flowers/spectrolus.json | 1 + .../generating_flowers/thermalily.json | 1 + .../lexicon/en_us/entries/mana/bellows.json | 1 + .../en_us/entries/mana/distributor.json | 1 + .../entries/mana/dreamwood_spreader.json | 1 + .../en_us/entries/mana/elven_lenses.json | 1 + .../lexicon/en_us/entries/mana/lens.json | 1 + .../en_us/entries/mana/mana_detector.json | 1 + .../en_us/entries/mana/mana_mirror.json | 1 + .../lexicon/en_us/entries/mana/mana_void.json | 1 + .../lexicon/en_us/entries/mana/pool_cart.json | 1 + .../lexicon/en_us/entries/mana/prism.json | 1 + .../en_us/entries/mana/rf_generator.json | 1 + .../en_us/entries/mana/spark_changer.json | 1 + .../en_us/entries/mana/spark_upgrades.json | 1 + .../lexicon/en_us/entries/misc/azulejo.json | 1 + .../lexicon/en_us/entries/misc/banners.json | 1 + .../en_us/entries/misc/blaze_block.json | 1 + .../en_us/entries/misc/cacophonium.json | 1 + .../en_us/entries/misc/decorative_blocks.json | 1 + .../en_us/entries/misc/head_creating.json | 1 + .../lexicon/en_us/entries/misc/mushrooms.json | 1 + .../lexicon/en_us/entries/misc/pavement.json | 1 + .../en_us/entries/misc/phantom_ink.json | 1 + .../en_us/entries/misc/preventing_decay.json | 1 + .../en_us/entries/misc/shiny_flowers.json | 1 + .../lexicon/en_us/entries/misc/starfield.json | 1 + .../en_us/entries/misc/tc_integration.json | 2 + .../en_us/entries/misc/tiny_potato.json | 1 + .../en_us/entries/tools/astrolabe.json | 1 + .../entries/tools/autocrafting_halo.json | 1 + .../lexicon/en_us/entries/tools/clip.json | 1 + .../en_us/entries/tools/cobble_rod.json | 1 + .../en_us/entries/tools/crafting_halo.json | 1 + .../en_us/entries/tools/crystal_bow.json | 1 + .../lexicon/en_us/entries/tools/dirt_rod.json | 1 + .../en_us/entries/tools/divining_rod.json | 1 + .../lexicon/en_us/entries/tools/elf_gear.json | 1 + .../en_us/entries/tools/exchange_rod.json | 1 + .../en_us/entries/tools/fire_chakram.json | 1 + .../lexicon/en_us/entries/tools/fire_rod.json | 1 + .../en_us/entries/tools/glass_pick.json | 1 + .../en_us/entries/tools/grass_horn.json | 1 + .../en_us/entries/tools/grass_seeds.json | 1 + .../en_us/entries/tools/gravity_rod.json | 1 + .../en_us/entries/tools/laputa_shard.json | 1 + .../en_us/entries/tools/livingwood_bow.json | 1 + .../en_us/entries/tools/mana_blaster.json | 1 + .../en_us/entries/tools/manaweave.json | 1 + .../en_us/entries/tools/missile_rod.json | 1 + .../en_us/entries/tools/open_bucket.json | 1 + .../en_us/entries/tools/rainbow_rod.json | 1 + .../lexicon/en_us/entries/tools/sextant.json | 1 + .../en_us/entries/tools/sky_dirt_rod.json | 1 + .../en_us/entries/tools/slime_bottle.json | 1 + .../en_us/entries/tools/smelt_rod.json | 1 + .../en_us/entries/tools/spell_cloth.json | 1 + .../en_us/entries/tools/temperance_stone.json | 1 + .../en_us/entries/tools/terra_axe.json | 1 + .../en_us/entries/tools/terra_pick.json | 1 + .../en_us/entries/tools/terra_sword.json | 1 + .../en_us/entries/tools/terraform_rod.json | 1 + .../en_us/entries/tools/terrasteel_armor.json | 1 + .../en_us/entries/tools/thorn_chakram.json | 1 + .../en_us/entries/tools/tornado_rod.json | 1 + .../en_us/entries/tools/vine_ball.json | 1 + .../lexicon/en_us/entries/tools/virus.json | 1 + .../en_us/entries/tools/water_rod.json | 1 + .../en_us/entries/tools/world_seed.json | 1 + .../en_us/templates/crafting_multi.json | 42 +++++------ .../lexicon/en_us/templates/elven_trade.json | 50 +++++++------- .../en_us/templates/mana_infusion.json | 31 +++++++-- .../en_us/templates/petal_apothecary.json | 9 ++- .../lexicon/en_us/templates/runic_altar.json | 11 ++- 202 files changed, 373 insertions(+), 175 deletions(-) delete mode 100644 src/main/java/vazkii/botania/client/patchouli/component/ItemStackListComponent.java diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java index 81393cb89..88b6df9a2 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java @@ -16,10 +16,15 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.ResourceLocation; 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.AlfheimLexiconEntry; +import vazkii.botania.common.lexicon.CompatLexiconEntry; +import vazkii.botania.common.lexicon.RelicLexiconEntry; +import vazkii.botania.common.lexicon.WelcomeLexiconEntry; import vazkii.botania.common.lexicon.page.PageBrew; import vazkii.botania.common.lexicon.page.PageCraftingRecipe; import vazkii.botania.common.lexicon.page.PageElvenRecipe; @@ -135,17 +140,38 @@ public class LexiconEntry implements Comparable { Gson gson = new GsonBuilder().setPrettyPrinting().create(); try (OutputStreamWriter os = new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(f)))) { Map entry = new LinkedHashMap<>(); + entry.put("name", this.getUnlocalizedName()); entry.put("category", fixCamelCase(category.getUnlocalizedName().substring("botania.category.".length()))); entry.put("icon", getIcon().getItem().getRegistryName().toString()); - if (isPriority()) + if (isPriority()) { entry.put("priority", true); + } else if (!(this instanceof RelicLexiconEntry || this.getUnlocalizedName().contains("terrasteel") || this.getUnlocalizedName().contains("relics"))) { + entry.put("read_by_default", true); + } + if (this instanceof WelcomeLexiconEntry) + entry.put("sortnum", -10); + if (this instanceof RelicLexiconEntry) { + ResourceLocation advancement = ((RelicLexiconEntry) this).advancement; + if(advancement != null) + entry.put("advancement", advancement.toString()); + } else if(this instanceof AlfheimLexiconEntry) { +// entry.put("advancement", ); TODO pick/make advancement for elven entries + } else if(this instanceof CompatLexiconEntry) { + entry.put("flag", "|debug,mod:" + ((CompatLexiconEntry) this).mod.toLowerCase(Locale.ROOT)); + } + List pages = new ArrayList<>(); - for(LexiconPage page : this.pages) { + for (int i = 0; i < this.pages.size(); i++) { + LexiconPage page = this.pages.get(i); Map json = new LinkedHashMap<>(); String unlocalizedName = page.getUnlocalizedName(); - if (page instanceof PageText) { - json.put("type", page instanceof PageLoreText ? "lore_page" : "text"); + if (page instanceof PageLoreText) { + json.put("type", "lore_page"); + json.put("text", unlocalizedName); + json.put(i % 2 == 0 ? "left_side" : "right_side", "true"); + } else if (page instanceof PageText) { + json.put("type", "text"); json.put("text", unlocalizedName); } else if (page instanceof PageImage) { json.put("type", "image"); diff --git a/src/main/java/vazkii/botania/client/patchouli/PatchouliUtils.java b/src/main/java/vazkii/botania/client/patchouli/PatchouliUtils.java index c0db85bc5..dafb1c90f 100644 --- a/src/main/java/vazkii/botania/client/patchouli/PatchouliUtils.java +++ b/src/main/java/vazkii/botania/client/patchouli/PatchouliUtils.java @@ -12,9 +12,7 @@ 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; @@ -22,21 +20,10 @@ 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 diff --git a/src/main/java/vazkii/botania/client/patchouli/component/ItemStackListComponent.java b/src/main/java/vazkii/botania/client/patchouli/component/ItemStackListComponent.java deleted file mode 100644 index 0b5b170e7..000000000 --- a/src/main/java/vazkii/botania/client/patchouli/component/ItemStackListComponent.java +++ /dev/null @@ -1,69 +0,0 @@ -/** - * 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 index 854f079d1..d77972f18 100644 --- a/src/main/java/vazkii/botania/client/patchouli/component/ManaComponent.java +++ b/src/main/java/vazkii/botania/client/patchouli/component/ManaComponent.java @@ -13,7 +13,6 @@ 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; @@ -56,12 +55,9 @@ public class ManaComponent implements ICustomComponent { ratio = 1; } HUDHandler.renderManaBar(x, y + 10, 0x0000FF, 0.75F, - manaValues[PatchouliUtils.getBookTicksElapsed(context) % manaValues.length], TilePool.MAX_MANA / ratio); + manaValues[(context.getTicksInBook() / 20) % 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/RotatingItemListComponentBase.java b/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponentBase.java index 1c388598d..51ada228b 100644 --- a/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponentBase.java +++ b/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponentBase.java @@ -13,7 +13,6 @@ 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; @@ -42,7 +41,7 @@ abstract class RotatingItemListComponentBase implements ICustomComponent { @Override public void render(IComponentRenderContext context, float pticks, int mouseX, int mouseY) { int degreePerInput = (int) (360F / ingredients.size()); - int ticksElapsed = PatchouliUtils.getBookTicksElapsed(context); + int ticksElapsed = context.getTicksInBook(); float currentDegree = ConfigHandler.CLIENT.lexiconRotatingItems.get() ? Screen.hasShiftDown() 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 58c6450a7..4604e6535 100644 --- a/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java +++ b/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java @@ -11,10 +11,13 @@ package vazkii.botania.client.patchouli.processor; import com.google.common.collect.ImmutableList; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.TextFormatting; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeManaInfusion; +import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.patchouli.PatchouliUtils; import vazkii.patchouli.api.IComponentProcessor; import vazkii.patchouli.api.IVariableProvider; @@ -65,6 +68,12 @@ public class ManaInfusionProcessor implements IComponentProcessor { .collect(Collectors.joining(",")); case "mana": return recipes.stream().mapToInt(RecipeManaInfusion::getManaToConsume).mapToObj(Integer::toString).collect(Collectors.joining(";")); + case "drop": + return I18n.format("botaniamisc.drop") + TextFormatting.BOLD + " (?)"; + case "dropTip0": + case "dropTip1": + return I18n.format("botaniamisc.dropTip" + key.substring(7), + TextFormatting.GREEN + RenderHelper.getKeyDisplayString("key.drop") + TextFormatting.WHITE); } 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 ae219e6ae..ee4428bdd 100644 --- a/src/main/java/vazkii/botania/client/patchouli/processor/MultiCraftingProcessor.java +++ b/src/main/java/vazkii/botania/client/patchouli/processor/MultiCraftingProcessor.java @@ -11,6 +11,7 @@ package vazkii.botania.client.patchouli.processor; import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.I18n; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.crafting.ICraftingRecipe; import net.minecraft.item.crafting.IRecipe; @@ -20,7 +21,6 @@ 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; @@ -34,6 +34,7 @@ public class MultiCraftingProcessor implements IComponentProcessor { private List recipes; private boolean shapeless = true; private int longestIngredientSize = 0; + private boolean hasCustomHeading; @Override public void setup(IVariableProvider variables) { @@ -55,6 +56,7 @@ public class MultiCraftingProcessor implements IComponentProcessor { } } } + this.hasCustomHeading = variables.has("heading"); } @Override @@ -62,6 +64,11 @@ public class MultiCraftingProcessor implements IComponentProcessor { if(recipes.isEmpty()) { return null; } + if(key.equals("heading")) { + if(!hasCustomHeading) + return recipes.get(0).getRecipeOutput().getDisplayName().getString(); + return null; + } if(key.startsWith("input")) { int index = Integer.parseInt(key.substring(5)) - 1; int shapedX = index % 3; @@ -73,14 +80,11 @@ public class MultiCraftingProcessor implements IComponentProcessor { 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); @@ -92,7 +96,7 @@ public class MultiCraftingProcessor implements IComponentProcessor { return recipes.stream().map(IRecipe::getRecipeOutput).map(PatchouliAPI.instance::serializeItemStack).collect(Collectors.joining(",")); } if(key.equals("shapeless")) { - return Boolean.toString(shapeless); + return shapeless ? I18n.format("patchouli.gui.lexicon.shapeless") : ""; } return null; } diff --git a/src/main/java/vazkii/botania/common/lexicon/CompatLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/CompatLexiconEntry.java index b4648d910..cda0331da 100644 --- a/src/main/java/vazkii/botania/common/lexicon/CompatLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/CompatLexiconEntry.java @@ -16,7 +16,7 @@ import vazkii.botania.common.lib.LibMisc; public class CompatLexiconEntry extends BasicLexiconEntry implements IAddonEntry { - final String mod; + public final String mod; public CompatLexiconEntry(String unlocalizedName, LexiconCategory category, String mod) { super(unlocalizedName, category); diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 724e10b31..21ffd11d9 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -19,8 +19,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tags.ItemTags; +import net.minecraft.tags.Tag; import net.minecraft.util.ResourceLocation; import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.ForgeRegistry; +import net.minecraftforge.registries.IForgeRegistryEntry; +import net.minecraftforge.registries.RegistryManager; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.api.lexicon.LexiconCategory; @@ -58,6 +62,7 @@ import java.io.File; import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; +import java.util.Comparator; import java.util.List; import java.util.Locale; import java.util.function.Predicate; @@ -429,7 +434,7 @@ public final class LexiconData { gardenOfGlass.setPriority().setIcon(new ItemStack(ModItems.livingroot)); } - if(Botania.thaumcraftLoaded) + if(Botania.thaumcraftLoaded || true) new CompatLexiconEntry("wrap", categoryBasics, "Thaumcraft").setLexiconPages(new PageText("0")); // lel // MANA ENTRIES @@ -556,10 +561,9 @@ public final class LexiconData { new PageText("3"), new PageCraftingRecipe("4", ModItems.redstoneRoot)) .setIcon(ItemStack.EMPTY); - Item[] miniFlowers = new ItemTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "mini_flowers")).getAllElements().toArray(new Item[0]); flowerShrinking = new BasicLexiconEntry(LibLexicon.FFLOWER_SHRINKING, categoryFunctionalFlowers); flowerShrinking.setPriority() - .setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", miniFlowers)) + .setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", getSortedTag(new ResourceLocation(LibMisc.MOD_ID, "mini_flowers")))) .setIcon(new ItemStack(ModSubtiles.bellethornChibi)); flowerSpeed = new BasicLexiconEntry(LibLexicon.FFLOWER_SPEED, categoryFunctionalFlowers); @@ -731,8 +735,8 @@ public final class LexiconData { alchemy.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModBlocks.alchemyCatalyst.asItem()), new PageManaInfusionRecipe("2", filter, Items.LEATHER), - new PageManaInfusionRecipe("3", filter, ItemTags.LOGS.getAllElements().toArray(new Item[0])), - new PageManaInfusionRecipe("4", filter, ItemTags.SAPLINGS.getAllElements().toArray(new Item[0])), + new PageManaInfusionRecipe("3", filter, getSortedTag(ItemTags.LOGS)), + new PageManaInfusionRecipe("4", filter, getSortedTag(ItemTags.SAPLINGS)), new PageManaInfusionRecipe("5", filter, Items.GLOWSTONE_DUST), new PageManaInfusionRecipe("6", filter, Items.QUARTZ, ModItems.darkQuartz, ModItems.manaQuartz, ModItems.blazeQuartz, ModItems.lavenderQuartz, ModItems.redQuartz, ModItems.elfQuartz).setSkipRegistry(), @@ -788,7 +792,7 @@ public final class LexiconData { new PageManaInfusionRecipe("7", conjurationFilter, Items.NETHERRACK), new PageManaInfusionRecipe("8", conjurationFilter, Items.SOUL_SAND), new PageManaInfusionRecipe("9", conjurationFilter, Items.GRAVEL), - new PageManaInfusionRecipe("10", conjurationFilter, ItemTags.LEAVES.getAllElements().toArray(new Item[0])), + new PageManaInfusionRecipe("10", conjurationFilter, getSortedTag(ItemTags.LEAVES)), new PageManaInfusionRecipe("11", conjurationFilter, Items.GRASS)); //todos spectralPlatform = new AlfheimLexiconEntry(LibLexicon.DEVICE_SPECTRAL_PLATFORM, categoryDevices); @@ -1468,6 +1472,23 @@ public final class LexiconData { Botania.LOGGER.info("Preexisting file {}, aborting lexicon dump", dir.getAbsolutePath()); } } + + private static > Comparator registryOrderComparator() { + return (V a, V b) -> { + ForgeRegistry registry = (ForgeRegistry) RegistryManager.ACTIVE.getRegistry(a.getRegistryType()); + return Integer.compare(registry.getID(a), registry.getID(b)); + }; + } + + private static Item[] getSortedTag(Tag tag) { + Item[] items = tag.getAllElements().toArray(new Item[0]); + Arrays.sort(items, registryOrderComparator()); + return items; + } + + private static Item[] getSortedTag(ResourceLocation tag) { + return getSortedTag(new ItemTags.Wrapper(tag)); + } private static Predicate> GOG_RECIPE = recipe -> recipe.getId().getPath().contains("garden_of_glass"); diff --git a/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java index eb5a88987..78a91017d 100644 --- a/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java @@ -22,7 +22,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconCategory; public class RelicLexiconEntry extends BasicLexiconEntry { - private final ResourceLocation advancement; + public final ResourceLocation advancement; public RelicLexiconEntry(String unlocalizedName, LexiconCategory category, ResourceLocation advancement) { super(unlocalizedName, category); diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/book.json b/src/main/resources/data/botania/patchouli_books/lexicon/book.json index 146131c0d..cff73962b 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/book.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/book.json @@ -7,5 +7,6 @@ "open_sound": "botania:lexiconopen", "flip_sound": "botania:lexiconpage", "creative_tab": "botania", - "advancements_tab": "botania:main/root" + "advancements_tab": "botania:main/root", + "advancement_namespaces": [ "botania" ] } \ 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 dca33f761..a57efbfc8 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 @@ -2,6 +2,7 @@ "name": "botania.entry.elvenLore", "category": "alfhomancy", "icon": "minecraft:writable_book", + "read_by_default": true, "pages": [ { "type": "text", @@ -9,31 +10,38 @@ }, { "type": "lore_page", - "text": "botania.page.elvenLore1" + "text": "botania.page.elvenLore1", + "right_side": "true" }, { "type": "lore_page", - "text": "botania.page.elvenLore2" + "text": "botania.page.elvenLore2", + "left_side": "true" }, { "type": "lore_page", - "text": "botania.page.elvenLore3" + "text": "botania.page.elvenLore3", + "right_side": "true" }, { "type": "lore_page", - "text": "botania.page.elvenLore4" + "text": "botania.page.elvenLore4", + "left_side": "true" }, { "type": "lore_page", - "text": "botania.page.elvenLore5" + "text": "botania.page.elvenLore5", + "right_side": "true" }, { "type": "lore_page", - "text": "botania.page.elvenLore6" + "text": "botania.page.elvenLore6", + "left_side": "true" }, { "type": "lore_page", - "text": "botania.page.elvenLore7" + "text": "botania.page.elvenLore7", + "right_side": "true" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/flugel_eye.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/flugel_eye.json index ff6c6d9e1..370089214 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/flugel_eye.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/flugel_eye.json @@ -2,6 +2,7 @@ "name": "botania.entry.flugelEye", "category": "alfhomancy", "icon": "botania:flugel_eye", + "advancement": "botania:challenge/flugel_eye", "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/infinite_fruit.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/infinite_fruit.json index 1307a84b1..6e2a5e66a 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/infinite_fruit.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/infinite_fruit.json @@ -2,6 +2,7 @@ "name": "botania.entry.infiniteFruit", "category": "alfhomancy", "icon": "botania:infinite_fruit", + "advancement": "botania:challenge/infinite_fruit", "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/king_key.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/king_key.json index 7d0ecb092..9cb1e4f3d 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/king_key.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/king_key.json @@ -2,6 +2,7 @@ "name": "botania.entry.kingKey", "category": "alfhomancy", "icon": "botania:king_key", + "advancement": "botania:challenge/king_key", "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/loki_ring.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/loki_ring.json index de0644e20..2a4daf0cf 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/loki_ring.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/loki_ring.json @@ -2,6 +2,7 @@ "name": "botania.entry.lokiRing", "category": "alfhomancy", "icon": "botania:loki_ring", + "advancement": "botania:challenge/loki_ring", "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/odin_ring.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/odin_ring.json index 93e2df00c..3a7c23dfe 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/odin_ring.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/odin_ring.json @@ -2,6 +2,7 @@ "name": "botania.entry.odinRing", "category": "alfhomancy", "icon": "botania:odin_ring", + "advancement": "botania:challenge/odin_ring", "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/thor_ring.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/thor_ring.json index bb76ef303..1ef28b848 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/thor_ring.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/thor_ring.json @@ -2,6 +2,7 @@ "name": "botania.entry.thorRing", "category": "alfhomancy", "icon": "botania:thor_ring", + "advancement": "botania:challenge/thor_ring", "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/black_lotus.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/black_lotus.json index cc897564a..6b92dc410 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/black_lotus.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/black_lotus.json @@ -2,6 +2,7 @@ "name": "botania.entry.blackLotus", "category": "basics", "icon": "botania:black_lotus", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/flower_bag.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/flower_bag.json index 540a1c9d8..ecd63db48 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/flower_bag.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/flower_bag.json @@ -2,6 +2,7 @@ "name": "botania.entry.flowerBag", "category": "basics", "icon": "botania:flower_bag", + "read_by_default": true, "pages": [ { "type": "text", 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 7886b8f89..ecd5641af 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 @@ -2,6 +2,7 @@ "name": "botania.entry.terrasteel", "category": "basics", "icon": "botania:terrasteel_ingot", + "priority": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/welcome.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/welcome.json index 0fdf7f137..be3db7ed4 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/welcome.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/welcome.json @@ -3,6 +3,7 @@ "category": "basics", "icon": "botania:cosmetic_questgiver_mark", "priority": true, + "sortnum": -10, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/aura_ring.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/aura_ring.json index e5b00d91a..63f11208e 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/aura_ring.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/aura_ring.json @@ -2,6 +2,7 @@ "name": "botania.entry.auraRing", "category": "baubles", "icon": "botania:aura_ring", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/blood_pendant.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/blood_pendant.json index 425529e0e..295cb0f3c 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/blood_pendant.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/blood_pendant.json @@ -2,6 +2,7 @@ "name": "botania.entry.bloodPendant", "category": "baubles", "icon": "botania:blood_pendant", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/cloud_pendant.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/cloud_pendant.json index 8e88234ee..0c23a4723 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/cloud_pendant.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/cloud_pendant.json @@ -2,6 +2,7 @@ "name": "botania.entry.cloudPendant", "category": "baubles", "icon": "botania:cloud_pendant", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/diva_charm.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/diva_charm.json index c759b972b..581329d06 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/diva_charm.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/diva_charm.json @@ -2,6 +2,7 @@ "name": "botania.entry.divaCharm", "category": "baubles", "icon": "botania:diva_charm", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/dodge_ring.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/dodge_ring.json index aa66a3766..5e99573b9 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/dodge_ring.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/dodge_ring.json @@ -2,6 +2,7 @@ "name": "botania.entry.dodgeRing", "category": "baubles", "icon": "botania:dodge_ring", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/goddess_charm.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/goddess_charm.json index e5ae5a0a9..b5bd4d710 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/goddess_charm.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/goddess_charm.json @@ -2,6 +2,7 @@ "name": "botania.entry.goddessCharm", "category": "baubles", "icon": "botania:goddess_charm", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/ice_pendant.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/ice_pendant.json index caafc8493..fab26cc8a 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/ice_pendant.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/ice_pendant.json @@ -2,6 +2,7 @@ "name": "botania.entry.icePendant", "category": "baubles", "icon": "botania:ice_pendant", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/invisibility_cloak.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/invisibility_cloak.json index a47a896c8..6779fbd15 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/invisibility_cloak.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/invisibility_cloak.json @@ -2,6 +2,7 @@ "name": "botania.entry.invisibilityCloak", "category": "baubles", "icon": "botania:invisibility_cloak", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/item_finder.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/item_finder.json index 98cd61207..ff6f216ad 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/item_finder.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/item_finder.json @@ -2,6 +2,7 @@ "name": "botania.entry.itemFinder", "category": "baubles", "icon": "botania:itemfinder", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/judgement_cloaks.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/judgement_cloaks.json index 18bd5c189..c59b9d4b2 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/judgement_cloaks.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/judgement_cloaks.json @@ -2,6 +2,7 @@ "name": "botania.entry.judgementCloaks", "category": "baubles", "icon": "botania:holy_cloak", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/knockback_belt.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/knockback_belt.json index cf0439e59..8e8e99f3f 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/knockback_belt.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/knockback_belt.json @@ -2,6 +2,7 @@ "name": "botania.entry.knockbackBelt", "category": "baubles", "icon": "botania:knockback_belt", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/lava_pendant.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/lava_pendant.json index 7a6756bef..47b0ac938 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/lava_pendant.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/lava_pendant.json @@ -2,6 +2,7 @@ "name": "botania.entry.lavaPendant", "category": "baubles", "icon": "botania:lava_pendant", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/magnet_ring.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/magnet_ring.json index f45b9ba44..4170f2d6c 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/magnet_ring.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/magnet_ring.json @@ -2,6 +2,7 @@ "name": "botania.entry.magnetRing", "category": "baubles", "icon": "botania:magnet_ring", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/mana_ring.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/mana_ring.json index 8d29e2395..8c0bb9f8c 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/mana_ring.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/mana_ring.json @@ -2,6 +2,7 @@ "name": "botania.entry.manaRing", "category": "baubles", "icon": "botania:mana_ring", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/mining_ring.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/mining_ring.json index a5eede50e..1c1d53390 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/mining_ring.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/mining_ring.json @@ -2,6 +2,7 @@ "name": "botania.entry.miningRing", "category": "baubles", "icon": "botania:mining_ring", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/pixie_ring.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/pixie_ring.json index 96b0d4d09..100d61184 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/pixie_ring.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/pixie_ring.json @@ -2,6 +2,7 @@ "name": "botania.entry.pixieRing", "category": "baubles", "icon": "botania:pixie_ring", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/reach_ring.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/reach_ring.json index b63ebeed3..b61d7724a 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/reach_ring.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/reach_ring.json @@ -2,6 +2,7 @@ "name": "botania.entry.reachRing", "category": "baubles", "icon": "botania:reach_ring", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/speed_up_belt.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/speed_up_belt.json index 69aa7a7a2..939150bb9 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/speed_up_belt.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/speed_up_belt.json @@ -2,6 +2,7 @@ "name": "botania.entry.speedUpBelt", "category": "baubles", "icon": "botania:speed_up_belt", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/super_cloud_pendant.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/super_cloud_pendant.json index e02d2526d..6ff9b6ae7 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/super_cloud_pendant.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/super_cloud_pendant.json @@ -2,6 +2,7 @@ "name": "botania.entry.superCloudPendant", "category": "baubles", "icon": "botania:super_cloud_pendant", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/super_lava_pendant.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/super_lava_pendant.json index bbe54ed10..736347fbd 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/super_lava_pendant.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/super_lava_pendant.json @@ -2,6 +2,7 @@ "name": "botania.entry.superLavaPendant", "category": "baubles", "icon": "botania:super_lava_pendant", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/super_travel_belt.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/super_travel_belt.json index 8fc877dc8..b5cc1d4c0 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/super_travel_belt.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/super_travel_belt.json @@ -2,6 +2,7 @@ "name": "botania.entry.superTravelBelt", "category": "baubles", "icon": "botania:super_travel_belt", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/swap_ring.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/swap_ring.json index 14f797e68..4cd4dd811 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/swap_ring.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/swap_ring.json @@ -2,6 +2,7 @@ "name": "botania.entry.swapRing", "category": "baubles", "icon": "botania:swap_ring", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/third_eye.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/third_eye.json index 2fa8edac8..3df9f2f76 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/third_eye.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/third_eye.json @@ -2,6 +2,7 @@ "name": "botania.entry.thirdEye", "category": "baubles", "icon": "botania:third_eye", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/tiny_planet.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/tiny_planet.json index 3bf19123d..3b78f2f3f 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/tiny_planet.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/tiny_planet.json @@ -2,6 +2,7 @@ "name": "botania.entry.tinyPlanet", "category": "baubles", "icon": "botania:tiny_planet", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/travel_belt.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/travel_belt.json index 2c96042d3..e8d14d6a0 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/travel_belt.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/travel_belt.json @@ -2,6 +2,7 @@ "name": "botania.entry.travelBelt", "category": "baubles", "icon": "botania:travel_belt", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/water_ring.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/water_ring.json index 61dc624cc..eb5508a85 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/water_ring.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/baubles/water_ring.json @@ -2,6 +2,7 @@ "name": "botania.entry.waterRing", "category": "baubles", "icon": "botania:water_ring", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/animated_torch.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/animated_torch.json index 9536d7288..b8a49a327 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/animated_torch.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/animated_torch.json @@ -2,6 +2,7 @@ "name": "botania.entry.animatedTorch", "category": "devices", "icon": "botania:animated_torch", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/avatar.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/avatar.json index 7bd08ac5f..26a8164ee 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/avatar.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/avatar.json @@ -2,6 +2,7 @@ "name": "botania.entry.avatar", "category": "devices", "icon": "botania:avatar", + "read_by_default": true, "pages": [ { "type": "text", 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 d3eee3dd1..4f4feba9c 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 @@ -2,6 +2,7 @@ "name": "botania.entry.brewery", "category": "devices", "icon": "botania:brewery", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/canopy_drum.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/canopy_drum.json index f7ec38ff7..9c21512d5 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/canopy_drum.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/canopy_drum.json @@ -2,6 +2,7 @@ "name": "botania.entry.canopyDrum", "category": "devices", "icon": "botania:drum_canopy", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/cocoon.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/cocoon.json index 3fc20f808..2b7f19df7 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/cocoon.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/cocoon.json @@ -2,6 +2,7 @@ "name": "botania.entry.cocoon", "category": "devices", "icon": "botania:cocoon", + "read_by_default": true, "pages": [ { "type": "text", 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 5fdaf1672..f1b133a4c 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 @@ -2,6 +2,7 @@ "name": "botania.entry.complexBrews", "category": "devices", "icon": "botania:brew_vial", + "read_by_default": true, "pages": [ { "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 b8d002b5d..939fd347a 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 @@ -2,6 +2,7 @@ "name": "botania.entry.craftCrate", "category": "devices", "icon": "botania:crafty_crate", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/fel_pumpkin.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/fel_pumpkin.json index d0f57cd89..cee78092e 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/fel_pumpkin.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/fel_pumpkin.json @@ -2,6 +2,7 @@ "name": "botania.entry.felPumpkin", "category": "devices", "icon": "botania:fel_pumpkin", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/flasks.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/flasks.json index 23e94d6fe..53ed285e1 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/flasks.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/flasks.json @@ -2,6 +2,7 @@ "name": "botania.entry.flasks", "category": "devices", "icon": "botania:flask", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/forest_drum.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/forest_drum.json index ecf415108..ca6273c02 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/forest_drum.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/forest_drum.json @@ -2,6 +2,7 @@ "name": "botania.entry.forestDrum", "category": "devices", "icon": "botania:drum_wild", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/forest_eye.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/forest_eye.json index 0ef3f53cf..a2836aedf 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/forest_eye.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/forest_eye.json @@ -2,6 +2,7 @@ "name": "botania.entry.forestEye", "category": "devices", "icon": "botania:forest_eye", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/gather_drum.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/gather_drum.json index 3135e1501..6bd750142 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/gather_drum.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/gather_drum.json @@ -2,6 +2,7 @@ "name": "botania.entry.gatherDrum", "category": "devices", "icon": "botania:drum_gathering", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/ghost_rail.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/ghost_rail.json index 807309f01..2578e7cc7 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/ghost_rail.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/ghost_rail.json @@ -2,6 +2,7 @@ "name": "botania.entry.ghostRail", "category": "devices", "icon": "botania:ghost_rail", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/incense.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/incense.json index 0bb34c23d..c131cd526 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/incense.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/incense.json @@ -2,6 +2,7 @@ "name": "botania.entry.incense", "category": "devices", "icon": "botania:incense_stick", + "read_by_default": true, "pages": [ { "type": "text", 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 9196d6fbb..f4079cce1 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 @@ -2,6 +2,7 @@ "name": "botania.entry.manaAlchemy", "category": "devices", "icon": "botania:alchemy_catalyst", + "read_by_default": true, "pages": [ { "type": "text", @@ -20,12 +21,12 @@ { "type": "mana_infusion", "text": "botania.page.manaAlchemy3", - "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" + "recipes": "botania:dark_oak_to_oak_log;botania:oak_to_spruce_log;botania:spruce_to_birch_log;botania:birch_to_jungle_log;botania:jungle_to_acacia_log;botania:acacia_to_dark_oak_log" }, { "type": "mana_infusion", "text": "botania.page.manaAlchemy4", - "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" + "recipes": "botania:dark_oak_to_oak_sapling;botania:oak_to_spruce_sapling;botania:spruce_to_birch_sapling;botania:birch_to_jungle_sapling;botania:jungle_to_acacia_sapling;botania:acacia_to_dark_oak_sapling" }, { "type": "mana_infusion", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_bomb.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_bomb.json index 3f20f5403..26b500272 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_bomb.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_bomb.json @@ -2,6 +2,7 @@ "name": "botania.entry.manaBomb", "category": "devices", "icon": "botania:mana_bomb", + "read_by_default": true, "pages": [ { "type": "text", 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 f156acf3f..41fdc361d 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 @@ -2,6 +2,7 @@ "name": "botania.entry.manaConjuration", "category": "devices", "icon": "botania:conjuration_catalyst", + "read_by_default": true, "pages": [ { "type": "text", @@ -55,7 +56,7 @@ { "type": "mana_infusion", "text": "botania.page.manaConjuration10", - "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" + "recipes": "botania:oak_leaves_dupe;botania:spruce_leaves_dupe;botania:birch_leaves_dupe;botania:jungle_leaves_dupe;botania:acacia_leaves_dupe;botania:dark_oak_leaves_dupe" }, { "type": "mana_infusion", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_enchanting.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_enchanting.json index e23359b9a..4468679bb 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_enchanting.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_enchanting.json @@ -2,6 +2,7 @@ "name": "botania.entry.manaEnchanting", "category": "devices", "icon": "botania:enchanter", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/platform.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/platform.json index 3a656cf31..b6911f7fb 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/platform.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/platform.json @@ -2,6 +2,7 @@ "name": "botania.entry.platform", "category": "devices", "icon": "botania:abstruse_platform", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/pylon.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/pylon.json index 19ffccdd5..995a81595 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/pylon.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/pylon.json @@ -2,6 +2,7 @@ "name": "botania.entry.pylon", "category": "devices", "icon": "botania:mana_pylon", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/spectral_platform.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/spectral_platform.json index 07529fdbf..ed3e56178 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/spectral_platform.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/spectral_platform.json @@ -2,6 +2,7 @@ "name": "botania.entry.spectralPlatform", "category": "devices", "icon": "botania:spectral_platform", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/teru_teru_bozu.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/teru_teru_bozu.json index b12b17b5f..20d96311a 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/teru_teru_bozu.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/teru_teru_bozu.json @@ -2,6 +2,7 @@ "name": "botania.entry.teruTeruBozu", "category": "devices", "icon": "botania:teru_teru_bozu", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/turntable.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/turntable.json index 07fd72f04..d85c069fe 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/turntable.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/turntable.json @@ -2,6 +2,7 @@ "name": "botania.entry.turntable", "category": "devices", "icon": "botania:turntable", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/black_hole_talisman.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/black_hole_talisman.json index cbccb0d7d..307464688 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/black_hole_talisman.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/black_hole_talisman.json @@ -2,6 +2,7 @@ "name": "botania.entry.blackHoleTalisman", "category": "ender", "icon": "botania:black_hole_talisman", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/corporea.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/corporea.json index d88cf8877..019d70cf1 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/corporea.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/corporea.json @@ -2,6 +2,7 @@ "name": "botania.entry.corporea", "category": "ender", "icon": "botania:corporea_spark", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/corporea_crystal_cube.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/corporea_crystal_cube.json index adc215c4e..1d81398d6 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/corporea_crystal_cube.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/corporea_crystal_cube.json @@ -2,6 +2,7 @@ "name": "botania.entry.corporeaCrystalCube", "category": "ender", "icon": "botania:corporea_crystal_cube", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/corporea_funnel.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/corporea_funnel.json index 1debbcf6b..fd15eba32 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/corporea_funnel.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/corporea_funnel.json @@ -2,6 +2,7 @@ "name": "botania.entry.corporeaFunnel", "category": "ender", "icon": "botania:corporea_funnel", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/corporea_index.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/corporea_index.json index 7a98e5b06..20d7bcd39 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/corporea_index.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/corporea_index.json @@ -2,6 +2,7 @@ "name": "botania.entry.corporeaIndex", "category": "ender", "icon": "botania:corporea_index", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/corporea_interceptor.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/corporea_interceptor.json index d54ca0651..5755dec8a 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/corporea_interceptor.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/corporea_interceptor.json @@ -2,6 +2,7 @@ "name": "botania.entry.corporeaInterceptor", "category": "ender", "icon": "botania:corporea_interceptor", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/corporea_retainer.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/corporea_retainer.json index 96bb9796b..e107b5271 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/corporea_retainer.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/corporea_retainer.json @@ -2,6 +2,7 @@ "name": "botania.entry.corporeaRetainer", "category": "ender", "icon": "botania:corporea_retainer", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/ender_dagger.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/ender_dagger.json index edadca70a..ecb07bb2a 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/ender_dagger.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/ender_dagger.json @@ -2,6 +2,7 @@ "name": "botania.entry.enderDagger", "category": "ender", "icon": "botania:ender_dagger", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/ender_eye_block.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/ender_eye_block.json index 370aa8872..00e0e2683 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/ender_eye_block.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/ender_eye_block.json @@ -2,6 +2,7 @@ "name": "botania.entry.enderEyeBlock", "category": "ender", "icon": "botania:ender_eye_block", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/ender_hand.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/ender_hand.json index 2ea389603..bbf49fb1b 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/ender_hand.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/ender_hand.json @@ -2,6 +2,7 @@ "name": "botania.entry.enderHand", "category": "ender", "icon": "botania:ender_hand", + "read_by_default": true, "pages": [ { "type": "text", 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 c497ff52d..f734e5880 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 @@ -2,6 +2,7 @@ "name": "botania.entry.flightTiara", "category": "ender", "icon": "botania:flight_tiara", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/keep_ivy.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/keep_ivy.json index afec7925e..93db6882b 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/keep_ivy.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/keep_ivy.json @@ -2,6 +2,7 @@ "name": "botania.entry.keepIvy", "category": "ender", "icon": "botania:keep_ivy", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/luminizer_transport.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/luminizer_transport.json index 62f92bc19..b0458f7e4 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/luminizer_transport.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/luminizer_transport.json @@ -2,6 +2,7 @@ "name": "botania.entry.luminizerTransport", "category": "ender", "icon": "botania:light_relay", + "read_by_default": true, "pages": [ { "type": "text", 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 0214efa7c..cf511a88c 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 @@ -2,6 +2,7 @@ "name": "botania.entry.pistonRelay", "category": "ender", "icon": "botania:piston_relay", + "read_by_default": true, "pages": [ { "type": "text", 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 14dd085a6..e72cb216c 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 @@ -2,6 +2,7 @@ "name": "botania.entry.redString", "category": "ender", "icon": "botania:red_string", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/spawner_claw.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/spawner_claw.json index 114a83db4..b0e142fee 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/spawner_claw.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/spawner_claw.json @@ -2,6 +2,7 @@ "name": "botania.entry.spawnerClaw", "category": "ender", "icon": "botania:spawner_claw", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/spawner_mover.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/spawner_mover.json index 078ca2424..879f2f910 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/spawner_mover.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/spawner_mover.json @@ -2,6 +2,7 @@ "name": "botania.entry.spawnerMover", "category": "ender", "icon": "botania:spawner_mover", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/star_sword.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/star_sword.json index d2211fe6f..e0b8f52a9 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/star_sword.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/star_sword.json @@ -2,6 +2,7 @@ "name": "botania.entry.starSword", "category": "ender", "icon": "botania:star_sword", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/thunder_sword.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/thunder_sword.json index 47bfded41..67230bd12 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/thunder_sword.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/ender/thunder_sword.json @@ -2,6 +2,7 @@ "name": "botania.entry.thunderSword", "category": "ender", "icon": "botania:thunder_sword", + "read_by_default": true, "pages": [ { "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 002c7c8de..7c66176eb 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 @@ -2,6 +2,7 @@ "name": "botania.entry.agricarnation", "category": "functional_flowers", "icon": "botania:agricarnation", + "read_by_default": true, "pages": [ { "type": "text", 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 9718a794e..80e6e30a7 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 @@ -2,6 +2,7 @@ "name": "botania.entry.bellethorne", "category": "functional_flowers", "icon": "botania:bellethorn", + "read_by_default": true, "pages": [ { "type": "text", 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 1eafb4e9f..f4db9b9e2 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 @@ -2,6 +2,7 @@ "name": "botania.entry.bergamute", "category": "functional_flowers", "icon": "botania:bergamute", + "read_by_default": true, "pages": [ { "type": "text", 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 026bdb80f..39174bdc3 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 @@ -2,6 +2,7 @@ "name": "botania.entry.bubbell", "category": "functional_flowers", "icon": "botania:bubbell", + "read_by_default": true, "pages": [ { "type": "text", 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 c4c7335e5..29006f5d1 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 @@ -2,6 +2,7 @@ "name": "botania.entry.clayconia", "category": "functional_flowers", "icon": "botania:clayconia", + "read_by_default": true, "pages": [ { "type": "text", 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 0eac935ca..cc97b16e4 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 @@ -2,6 +2,7 @@ "name": "botania.entry.daffomill", "category": "functional_flowers", "icon": "botania:daffomill", + "read_by_default": true, "pages": [ { "type": "text", 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 5c609d7c0..69ee360fd 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 @@ -2,6 +2,7 @@ "name": "botania.entry.dreadthorne", "category": "functional_flowers", "icon": "botania:dreadthorn", + "read_by_default": true, "pages": [ { "type": "text", 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 a14b66922..22435c361 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 @@ -2,6 +2,7 @@ "name": "botania.entry.exoflame", "category": "functional_flowers", "icon": "botania:exoflame", + "read_by_default": true, "pages": [ { "type": "text", 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 fa2108b07..c56da6818 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 @@ -2,6 +2,7 @@ "name": "botania.entry.fallenKanade", "category": "functional_flowers", "icon": "botania:fallen_kanade", + "read_by_default": true, "pages": [ { "type": "text", 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 b99fb54a1..b085b55d0 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,7 +11,7 @@ { "type": "mana_infusion", "text": "botania.page.flowerShrinking1", - "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" + "recipes": "botania:bellethorn_chibi;botania:agricarnation_chibi;botania:hopperhock_chibi;botania:rannuncarpus_chibi;botania:clayconia_chibi;botania:marimorphosis_chibi;botania:bubbell_chibi;botania:solegnolia_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 b874a783f..9fdc03f75 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 @@ -2,6 +2,7 @@ "name": "botania.entry.heiseiDream", "category": "functional_flowers", "icon": "botania:heisei_dream", + "read_by_default": true, "pages": [ { "type": "text", 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 35ea6624d..ed6704583 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 @@ -2,6 +2,7 @@ "name": "botania.entry.hopperhock", "category": "functional_flowers", "icon": "botania:hopperhock", + "read_by_default": true, "pages": [ { "type": "text", 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 b571d4424..3c75c2399 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 @@ -2,6 +2,7 @@ "name": "botania.entry.hyacidus", "category": "functional_flowers", "icon": "botania:hyacidus", + "read_by_default": true, "pages": [ { "type": "text", 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 15415c2e4..a0c8e2e2e 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 @@ -2,6 +2,7 @@ "name": "botania.entry.jadedAmaranthus", "category": "functional_flowers", "icon": "botania:jaded_amaranthus", + "read_by_default": true, "pages": [ { "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 0d710bb69..c658df379 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 @@ -2,6 +2,7 @@ "name": "botania.entry.jiyuulia", "category": "functional_flowers", "icon": "botania:jiyuulia", + "read_by_default": true, "pages": [ { "type": "text", 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 543482424..aabdc39a5 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 @@ -2,6 +2,7 @@ "name": "botania.entry.loonium", "category": "functional_flowers", "icon": "botania:loonium", + "read_by_default": true, "pages": [ { "type": "text", 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 1eaa07323..93038e26f 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 @@ -2,6 +2,7 @@ "name": "botania.entry.marimorphosis", "category": "functional_flowers", "icon": "botania:marimorphosis", + "read_by_default": true, "pages": [ { "type": "text", 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 62e75ee7e..0eb5bd369 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 @@ -2,6 +2,7 @@ "name": "botania.entry.medumone", "category": "functional_flowers", "icon": "botania:medumone", + "read_by_default": true, "pages": [ { "type": "text", 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 89d3be03a..fb1832cc2 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 @@ -2,6 +2,7 @@ "name": "botania.entry.orechid", "category": "functional_flowers", "icon": "botania:orechid", + "read_by_default": true, "pages": [ { "type": "text", 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 4d6abd4ff..540de3e1f 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 @@ -2,6 +2,7 @@ "name": "botania.entry.orechidIgnem", "category": "functional_flowers", "icon": "botania:orechid_ignem", + "read_by_default": true, "pages": [ { "type": "text", 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 bb437ef8c..eb9547f4e 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 @@ -2,6 +2,7 @@ "name": "botania.entry.pollidisiac", "category": "functional_flowers", "icon": "botania:pollidisiac", + "read_by_default": true, "pages": [ { "type": "text", 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 62ad51d30..ccaa1a138 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 @@ -2,6 +2,7 @@ "name": "botania.entry.rannuncarpus", "category": "functional_flowers", "icon": "botania:rannuncarpus", + "read_by_default": true, "pages": [ { "type": "text", 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 027b000e0..bf32c76ce 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 @@ -2,6 +2,7 @@ "name": "botania.entry.solegnolia", "category": "functional_flowers", "icon": "botania:solegnolia", + "read_by_default": true, "pages": [ { "type": "text", 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 08bb01704..911be6b94 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 @@ -2,6 +2,7 @@ "name": "botania.entry.spectranthemum", "category": "functional_flowers", "icon": "botania:spectranthemum", + "read_by_default": true, "pages": [ { "type": "text", 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 956ba8264..cb46a9930 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 @@ -2,6 +2,7 @@ "name": "botania.entry.tangleberrie", "category": "functional_flowers", "icon": "botania:tangleberrie", + "read_by_default": true, "pages": [ { "type": "text", 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 5cdc9e1a6..8ebac2954 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 @@ -2,6 +2,7 @@ "name": "botania.entry.tigerseye", "category": "functional_flowers", "icon": "botania:tigerseye", + "read_by_default": true, "pages": [ { "type": "text", 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 09179baf9..aeee0dde2 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 @@ -2,6 +2,7 @@ "name": "botania.entry.vinculotus", "category": "functional_flowers", "icon": "botania:vinculotus", + "read_by_default": true, "pages": [ { "type": "text", 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 08ae46018..74ec46c2b 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 @@ -2,6 +2,7 @@ "name": "botania.entry.arcanerose", "category": "generating_flowers", "icon": "botania:rosa_arcana", + "read_by_default": true, "pages": [ { "type": "text", 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 e4a9fe423..1ffd12596 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 @@ -2,6 +2,7 @@ "name": "botania.entry.dandelifeon", "category": "generating_flowers", "icon": "botania:dandelifeon", + "read_by_default": true, "pages": [ { "type": "text", 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 55a1549bc..1ac0cadf2 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 @@ -2,6 +2,7 @@ "name": "botania.entry.endoflame", "category": "generating_flowers", "icon": "botania:endoflame", + "read_by_default": true, "pages": [ { "type": "text", 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 39ef10049..d66e249ca 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 @@ -2,6 +2,7 @@ "name": "botania.entry.entropinnyum", "category": "generating_flowers", "icon": "botania:entropinnyum", + "read_by_default": true, "pages": [ { "type": "text", 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 71590152d..11829362e 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 @@ -2,6 +2,7 @@ "name": "botania.entry.gourmaryllis", "category": "generating_flowers", "icon": "botania:gourmaryllis", + "read_by_default": true, "pages": [ { "type": "text", 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 2c777f226..acb5564ae 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 @@ -2,6 +2,7 @@ "name": "botania.entry.hydroangeas", "category": "generating_flowers", "icon": "botania:hydroangeas", + "read_by_default": true, "pages": [ { "type": "text", 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 54239fc19..c1f37fd3c 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 @@ -2,6 +2,7 @@ "name": "botania.entry.kekimurus", "category": "generating_flowers", "icon": "botania:kekimurus", + "read_by_default": true, "pages": [ { "type": "text", 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 908962cc5..eafb267c4 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 @@ -2,6 +2,7 @@ "name": "botania.entry.munchdew", "category": "generating_flowers", "icon": "botania:munchdew", + "read_by_default": true, "pages": [ { "type": "text", 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 1ab42b3fd..dd92ad2cf 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 @@ -2,6 +2,7 @@ "name": "botania.entry.narslimmus", "category": "generating_flowers", "icon": "botania:narslimmus", + "read_by_default": true, "pages": [ { "type": "text", 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 2bffa722a..0be1e7463 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 @@ -2,6 +2,7 @@ "name": "botania.entry.rafflowsia", "category": "generating_flowers", "icon": "botania:rafflowsia", + "read_by_default": true, "pages": [ { "type": "text", 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 f17f69175..94512e283 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 @@ -2,6 +2,7 @@ "name": "botania.entry.shulk_me_not", "category": "generating_flowers", "icon": "botania:shulk_me_not", + "read_by_default": true, "pages": [ { "type": "text", 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 01bea0400..6b689ff6f 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 @@ -2,6 +2,7 @@ "name": "botania.entry.spectrolus", "category": "generating_flowers", "icon": "botania:spectrolus", + "read_by_default": true, "pages": [ { "type": "text", 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 9945134fd..db9b641d9 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 @@ -2,6 +2,7 @@ "name": "botania.entry.thermalily", "category": "generating_flowers", "icon": "botania:thermalily", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/bellows.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/bellows.json index 7bb1c5600..9f38bdbb5 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/bellows.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/bellows.json @@ -2,6 +2,7 @@ "name": "botania.entry.bellows", "category": "mana", "icon": "botania:bellows", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/distributor.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/distributor.json index 7f77f687b..f9a023ff4 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/distributor.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/distributor.json @@ -2,6 +2,7 @@ "name": "botania.entry.distributor", "category": "mana", "icon": "botania:mana_distributor", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/dreamwood_spreader.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/dreamwood_spreader.json index 4936e0922..1819a8074 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/dreamwood_spreader.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/dreamwood_spreader.json @@ -2,6 +2,7 @@ "name": "botania.entry.dreamwoodSpreader", "category": "mana", "icon": "botania:elven_spreader", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/elven_lenses.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/elven_lenses.json index db1e793cf..65324ff0c 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/elven_lenses.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/elven_lenses.json @@ -2,6 +2,7 @@ "name": "botania.entry.elvenLenses", "category": "mana", "icon": "botania:lens_paint", + "read_by_default": true, "pages": [ { "type": "text", 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 6289661cc..5a278b9c2 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 @@ -2,6 +2,7 @@ "name": "botania.entry.lens", "category": "mana", "icon": "botania:lens_normal", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/mana_detector.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/mana_detector.json index b6b75a16e..505a54622 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/mana_detector.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/mana_detector.json @@ -2,6 +2,7 @@ "name": "botania.entry.manaDetector", "category": "mana", "icon": "botania:mana_detector", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/mana_mirror.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/mana_mirror.json index b04c83553..d2cf159c1 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/mana_mirror.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/mana_mirror.json @@ -2,6 +2,7 @@ "name": "botania.entry.manaMirror", "category": "mana", "icon": "botania:mana_mirror", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/mana_void.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/mana_void.json index 94a55a053..efaa97849 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/mana_void.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/mana_void.json @@ -2,6 +2,7 @@ "name": "botania.entry.manaVoid", "category": "mana", "icon": "botania:mana_void", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/pool_cart.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/pool_cart.json index 54184797c..59ce63adf 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/pool_cart.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/pool_cart.json @@ -2,6 +2,7 @@ "name": "botania.entry.poolCart", "category": "mana", "icon": "botania:pool_minecart", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/prism.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/prism.json index aee8f0494..41fd12c68 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/prism.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/prism.json @@ -2,6 +2,7 @@ "name": "botania.entry.prism", "category": "mana", "icon": "botania:prism", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/rf_generator.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/rf_generator.json index bb80dc613..42e96798d 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/rf_generator.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/rf_generator.json @@ -2,6 +2,7 @@ "name": "botania.entry.rfGenerator", "category": "mana", "icon": "botania:mana_fluxfield", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/spark_changer.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/spark_changer.json index 16482fb12..d0b322eab 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/spark_changer.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/mana/spark_changer.json @@ -2,6 +2,7 @@ "name": "botania.entry.sparkChanger", "category": "mana", "icon": "botania:spark_changer", + "read_by_default": true, "pages": [ { "type": "text", 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 5da7cc6e7..56a04894c 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 @@ -2,6 +2,7 @@ "name": "botania.entry.sparkUpgrades", "category": "mana", "icon": "botania:spark_upgrade_dispersive", + "read_by_default": true, "pages": [ { "type": "text", 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 d1c5b1634..5dd8238f9 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 @@ -2,6 +2,7 @@ "name": "botania.entry.azulejo", "category": "misc", "icon": "botania:azulejo_0", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/banners.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/banners.json index e990ac0a9..12e91eab0 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/banners.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/banners.json @@ -2,6 +2,7 @@ "name": "botania.entry.banners", "category": "misc", "icon": "botania:lexicon", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/blaze_block.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/blaze_block.json index be129d71a..ff465c590 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/blaze_block.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/blaze_block.json @@ -2,6 +2,7 @@ "name": "botania.entry.blazeBlock", "category": "misc", "icon": "botania:blaze_block", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/cacophonium.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/cacophonium.json index 37d494647..a1b6903c0 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/cacophonium.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/cacophonium.json @@ -2,6 +2,7 @@ "name": "botania.entry.cacophonium", "category": "misc", "icon": "botania:cacophonium", + "read_by_default": true, "pages": [ { "type": "text", 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 65b36eb7d..d87c4bba7 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 @@ -2,6 +2,7 @@ "name": "botania.entry.decorativeBlocks", "category": "misc", "icon": "botania:livingrock_bricks", + "read_by_default": true, "pages": [ { "type": "text", 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 e2858e3d7..37aa33176 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 @@ -2,6 +2,7 @@ "name": "botania.entry.headCreating", "category": "misc", "icon": "minecraft:player_head", + "read_by_default": true, "pages": [ { "type": "text", 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 d977d67e3..ec590dbd4 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 @@ -2,6 +2,7 @@ "name": "botania.entry.mushrooms", "category": "misc", "icon": "botania:white_mushroom", + "read_by_default": true, "pages": [ { "type": "text", 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 1656ac186..581388703 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 @@ -2,6 +2,7 @@ "name": "botania.entry.pavement", "category": "misc", "icon": "botania:white_pavement", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/phantom_ink.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/phantom_ink.json index eef64eac9..18b167b88 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/phantom_ink.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/phantom_ink.json @@ -2,6 +2,7 @@ "name": "botania.entry.phantomInk", "category": "misc", "icon": "botania:phantom_ink", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/preventing_decay.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/preventing_decay.json index f2b9e045d..6a767a04c 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/preventing_decay.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/preventing_decay.json @@ -2,6 +2,7 @@ "name": "botania.entry.preventingDecay", "category": "misc", "icon": "botania:monocle", + "read_by_default": true, "pages": [ { "type": "text", 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 6a26c10cb..25a3b519d 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 @@ -2,6 +2,7 @@ "name": "botania.entry.shinyFlowers", "category": "misc", "icon": "botania:white_shiny_flower", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/starfield.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/starfield.json index e786ee140..c3bc41274 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/starfield.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/starfield.json @@ -2,6 +2,7 @@ "name": "botania.entry.starfield", "category": "misc", "icon": "botania:starfield", + "read_by_default": true, "pages": [ { "type": "text", 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 77171ffca..084ff8c90 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 @@ -2,6 +2,8 @@ "name": "botania.entry.tcIntegration", "category": "misc", "icon": "botania:mana_inkwell", + "read_by_default": true, + "flag": "|debug,mod:thaumcraft", "pages": [ { "type": "text", 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 1fa035048..72f8ef244 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 @@ -2,6 +2,7 @@ "name": "botania.entry.tinyPotato", "category": "misc", "icon": "botania:tiny_potato", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/astrolabe.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/astrolabe.json index 525229d4c..fa15b53bd 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/astrolabe.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/astrolabe.json @@ -2,6 +2,7 @@ "name": "botania.entry.astrolabe", "category": "tools", "icon": "botania:astrolabe", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/autocrafting_halo.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/autocrafting_halo.json index 68ad28862..fa67bb9f3 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/autocrafting_halo.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/autocrafting_halo.json @@ -2,6 +2,7 @@ "name": "botania.entry.autocraftingHalo", "category": "tools", "icon": "botania:auto_crafting_halo", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/clip.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/clip.json index 63c21a6f5..97e2240d6 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/clip.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/clip.json @@ -2,6 +2,7 @@ "name": "botania.entry.clip", "category": "tools", "icon": "botania:clip", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/cobble_rod.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/cobble_rod.json index e1f193e11..b61c40bc0 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/cobble_rod.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/cobble_rod.json @@ -2,6 +2,7 @@ "name": "botania.entry.cobbleRod", "category": "tools", "icon": "botania:cobble_rod", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/crafting_halo.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/crafting_halo.json index 915c7bec7..c0f102005 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/crafting_halo.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/crafting_halo.json @@ -2,6 +2,7 @@ "name": "botania.entry.craftingHalo", "category": "tools", "icon": "botania:crafting_halo", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/crystal_bow.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/crystal_bow.json index e76a6e007..ee3b23c63 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/crystal_bow.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/crystal_bow.json @@ -2,6 +2,7 @@ "name": "botania.entry.crystalBow", "category": "tools", "icon": "botania:crystal_bow", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/dirt_rod.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/dirt_rod.json index e23ec74cd..787f2f733 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/dirt_rod.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/dirt_rod.json @@ -2,6 +2,7 @@ "name": "botania.entry.dirtRod", "category": "tools", "icon": "botania:dirt_rod", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/divining_rod.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/divining_rod.json index 2f02f7456..ef5f9da69 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/divining_rod.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/divining_rod.json @@ -2,6 +2,7 @@ "name": "botania.entry.diviningRod", "category": "tools", "icon": "botania:divining_rod", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/elf_gear.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/elf_gear.json index 6d9430c53..02961b9ca 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/elf_gear.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/elf_gear.json @@ -2,6 +2,7 @@ "name": "botania.entry.elfGear", "category": "tools", "icon": "botania:elementium_pickaxe", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/exchange_rod.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/exchange_rod.json index b8107b83f..0ab868804 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/exchange_rod.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/exchange_rod.json @@ -2,6 +2,7 @@ "name": "botania.entry.exchangeRod", "category": "tools", "icon": "botania:exchange_rod", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/fire_chakram.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/fire_chakram.json index dc9e69674..8b73d1458 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/fire_chakram.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/fire_chakram.json @@ -2,6 +2,7 @@ "name": "botania.entry.fireChakram", "category": "tools", "icon": "botania:flare_chakram", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/fire_rod.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/fire_rod.json index 9bb93ae37..304a116b3 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/fire_rod.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/fire_rod.json @@ -2,6 +2,7 @@ "name": "botania.entry.fireRod", "category": "tools", "icon": "botania:fire_rod", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/glass_pick.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/glass_pick.json index 35474dcb9..a61133efd 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/glass_pick.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/glass_pick.json @@ -2,6 +2,7 @@ "name": "botania.entry.glassPick", "category": "tools", "icon": "botania:glass_pickaxe", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/grass_horn.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/grass_horn.json index 7ae0c2c37..2ba8e8f41 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/grass_horn.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/grass_horn.json @@ -2,6 +2,7 @@ "name": "botania.entry.grassHorn", "category": "tools", "icon": "botania:horn_grass", + "read_by_default": true, "pages": [ { "type": "text", 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 5251f5624..0964abc70 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 @@ -2,6 +2,7 @@ "name": "botania.entry.grassSeeds", "category": "tools", "icon": "botania:grass_seeds", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/gravity_rod.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/gravity_rod.json index c75469f2d..7e9870843 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/gravity_rod.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/gravity_rod.json @@ -2,6 +2,7 @@ "name": "botania.entry.gravityRod", "category": "tools", "icon": "botania:gravity_rod", + "read_by_default": true, "pages": [ { "type": "text", 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 30b9d7ceb..e4802be77 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 @@ -2,6 +2,7 @@ "name": "botania.entry.laputaShard", "category": "tools", "icon": "botania:laputa_shard", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/livingwood_bow.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/livingwood_bow.json index acc83836a..b5fa8de47 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/livingwood_bow.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/livingwood_bow.json @@ -2,6 +2,7 @@ "name": "botania.entry.livingwoodBow", "category": "tools", "icon": "botania:livingwood_bow", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/mana_blaster.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/mana_blaster.json index 4f2408fd5..2607a4b12 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/mana_blaster.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/mana_blaster.json @@ -2,6 +2,7 @@ "name": "botania.entry.manaBlaster", "category": "tools", "icon": "botania:mana_gun", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/manaweave.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/manaweave.json index 8271479b3..b8c92f6e1 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/manaweave.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/manaweave.json @@ -2,6 +2,7 @@ "name": "botania.entry.manaweave", "category": "tools", "icon": "botania:manaweave_cloth", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/missile_rod.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/missile_rod.json index 08ce0628c..89714f377 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/missile_rod.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/missile_rod.json @@ -2,6 +2,7 @@ "name": "botania.entry.missileRod", "category": "tools", "icon": "botania:missile_rod", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/open_bucket.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/open_bucket.json index 6103fb542..06984c388 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/open_bucket.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/open_bucket.json @@ -2,6 +2,7 @@ "name": "botania.entry.openBucket", "category": "tools", "icon": "botania:open_bucket", + "read_by_default": true, "pages": [ { "type": "text", 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 51fb429f7..d7b87a27f 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 @@ -2,6 +2,7 @@ "name": "botania.entry.rainbowRod", "category": "tools", "icon": "botania:rainbow_rod", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/sextant.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/sextant.json index c7e7935dc..8a962951b 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/sextant.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/sextant.json @@ -2,6 +2,7 @@ "name": "botania.entry.sextant", "category": "tools", "icon": "botania:sextant", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/sky_dirt_rod.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/sky_dirt_rod.json index 756357c4a..1373b0e32 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/sky_dirt_rod.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/sky_dirt_rod.json @@ -2,6 +2,7 @@ "name": "botania.entry.skyDirtRod", "category": "tools", "icon": "botania:skydirt_rod", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/slime_bottle.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/slime_bottle.json index 77ad73a06..3c89bdee0 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/slime_bottle.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/slime_bottle.json @@ -2,6 +2,7 @@ "name": "botania.entry.slimeBottle", "category": "tools", "icon": "botania:slime_bottle", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/smelt_rod.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/smelt_rod.json index 62b1803c0..b8cf34a34 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/smelt_rod.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/smelt_rod.json @@ -2,6 +2,7 @@ "name": "botania.entry.smeltRod", "category": "tools", "icon": "botania:smelt_rod", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/spell_cloth.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/spell_cloth.json index 22e12ac96..4614d7a39 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/spell_cloth.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/spell_cloth.json @@ -2,6 +2,7 @@ "name": "botania.entry.spellCloth", "category": "tools", "icon": "botania:spell_cloth", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/temperance_stone.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/temperance_stone.json index 763157669..3848cf84b 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/temperance_stone.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/temperance_stone.json @@ -2,6 +2,7 @@ "name": "botania.entry.temperanceStone", "category": "tools", "icon": "botania:temperance_stone", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/terra_axe.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/terra_axe.json index 0605f859a..add9cebfe 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/terra_axe.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/terra_axe.json @@ -2,6 +2,7 @@ "name": "botania.entry.terraAxe", "category": "tools", "icon": "botania:terra_axe", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/terra_pick.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/terra_pick.json index ad8473069..7bfddbfeb 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/terra_pick.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/terra_pick.json @@ -2,6 +2,7 @@ "name": "botania.entry.terraPick", "category": "tools", "icon": "botania:terra_pick", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/terra_sword.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/terra_sword.json index cfb3d1cac..44edd1538 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/terra_sword.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/terra_sword.json @@ -2,6 +2,7 @@ "name": "botania.entry.terraSword", "category": "tools", "icon": "botania:terra_sword", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/terraform_rod.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/terraform_rod.json index 7b615a045..c77d2dda3 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/terraform_rod.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/terraform_rod.json @@ -2,6 +2,7 @@ "name": "botania.entry.terraformRod", "category": "tools", "icon": "botania:terraform_rod", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/terrasteel_armor.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/terrasteel_armor.json index 166171d0e..f89694ff6 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/terrasteel_armor.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/terrasteel_armor.json @@ -2,6 +2,7 @@ "name": "botania.entry.terrasteelArmor", "category": "tools", "icon": "botania:terrasteel_helmet", + "priority": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/thorn_chakram.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/thorn_chakram.json index e96173c73..fa8096e1a 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/thorn_chakram.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/thorn_chakram.json @@ -2,6 +2,7 @@ "name": "botania.entry.thornChakram", "category": "tools", "icon": "botania:thorn_chakram", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/tornado_rod.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/tornado_rod.json index 5fd0650b5..20dd6a5ff 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/tornado_rod.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/tornado_rod.json @@ -2,6 +2,7 @@ "name": "botania.entry.tornadoRod", "category": "tools", "icon": "botania:tornado_rod", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/vine_ball.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/vine_ball.json index 3aeb26936..be6b8fa96 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/vine_ball.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/vine_ball.json @@ -2,6 +2,7 @@ "name": "botania.entry.vineBall", "category": "tools", "icon": "botania:vine_ball", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/virus.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/virus.json index 572c794ce..0669ff929 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/virus.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/virus.json @@ -2,6 +2,7 @@ "name": "botania.entry.virus", "category": "tools", "icon": "botania:virus_necrodermal", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/water_rod.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/water_rod.json index b826fea03..8bba7ae57 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/water_rod.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/water_rod.json @@ -2,6 +2,7 @@ "name": "botania.entry.waterRod", "category": "tools", "icon": "botania:water_rod", + "read_by_default": true, "pages": [ { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/world_seed.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/world_seed.json index 5e8481a70..b7f232c00 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/world_seed.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/world_seed.json @@ -2,6 +2,7 @@ "name": "botania.entry.worldSeed", "category": "tools", "icon": "botania:world_seed", + "read_by_default": true, "pages": [ { "type": "text", 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 fbf024c26..46fb27604 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 @@ -3,7 +3,7 @@ "components": [ { "type": "header", - "text": "heading", + "text": "#heading", "x": -1, "y": -6 }, @@ -22,7 +22,7 @@ { "type": "image", "image": "patchouli:textures/gui/crafting.png", - "guard": "#shapeless", + "guard": "#shapeless->exists", "x": 71, "y": 6, "u": 0, @@ -33,64 +33,66 @@ "height": 11 }, { - "type": "custom", - "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "type": "tooltip", + "guard": "#shapeless->exists", + "tooltip": [ + "#shapeless" + ], + "x": 71, + "y": 6, + "width": 11, + "height": 11 + }, + { + "type": "item", "item": "#input1", "x": 12, "y": 7 }, { - "type": "custom", - "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "type": "item", "item": "#input2", "x": 31, "y": 7 }, { - "type": "custom", - "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "type": "item", "item": "#input3", "x": 50, "y": 7 }, { - "type": "custom", - "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "type": "item", "item": "#input4", "x": 12, "y": 26 }, { - "type": "custom", - "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "type": "item", "item": "#input5", "x": 31, "y": 26 }, { - "type": "custom", - "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "type": "item", "item": "#input6", "x": 50, "y": 26 }, { - "type": "custom", - "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "type": "item", "item": "#input7", "x": 12, "y": 45 }, { - "type": "custom", - "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "type": "item", "item": "#input8", "x": 31, "y": 45 }, { - "type": "custom", - "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "type": "item", "item": "#input9", "x": 50, "y": 45 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 a5eaeeedf..526ce262f 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,11 +1,17 @@ { "processor": "vazkii.botania.client.patchouli.processor.ElvenTradeProcessor", "components": [ + { + "type": "header", + "text": "#heading", + "x": -1, + "y": -1 + }, { "type": "image", "image": "botania:textures/gui/elven_trade_overlay.png", "x": 4, - "y": 4, + "y": 18, "width": 73, "height": 77, "u": 19, @@ -15,7 +21,7 @@ "type": "image", "image": "botania:textures/blocks/alfheim_portal_swirl.png", "x": 7, - "y": 22, + "y": 36, "width": 48, "height": 48, "u": 0, @@ -24,72 +30,64 @@ "texture_height": 768 }, { - "type": "custom", - "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "type": "item", "item": "#input1", "framed": "false", "x": 30, - "y": 0 + "y": 14 }, { - "type": "custom", - "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "type": "item", "item": "#input2", "framed": "false", "x": 50, - "y": 0 + "y": 14 }, { - "type": "custom", - "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "type": "item", "item": "#input3", "framed": "false", "x": 70, - "y": 0 + "y": 14 }, { - "type": "custom", - "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "type": "item", "item": "#input4", "framed": "false", "x": 90, - "y": 0 + "y": 14 }, { - "type": "custom", - "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "type": "item", "item": "#output1", "framed": "false", "link_recipe": true, "x": 78, - "y": 40 + "y": 54 }, { - "type": "custom", - "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "type": "item", "item": "#output2", "framed": "false", "link_recipe": true, "x": 98, - "y": 40 + "y": 54 }, { - "type": "custom", - "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "type": "item", "item": "#output3", "framed": "false", "link_recipe": true, "x": 78, - "y": 60 + "y": 74 }, { - "type": "custom", - "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "type": "item", "item": "#output4", "framed": "false", "link_recipe": true, "x": 98, - "y": 60 + "y": 74 }, { "type": "text", 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 cdb9f9562..1c3066e44 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 @@ -5,12 +5,30 @@ "type": "image", "image": "botania:textures/gui/mana_infusion_overlay.png", "x": 1, - "y": 8, + "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", @@ -22,22 +40,21 @@ "item": "#input", "framed": "false", "x": 20, - "y": 33 + "y": 41 }, { - "type": "custom", - "class": "vazkii.botania.client.patchouli.component.ItemStackListComponent", + "type": "item", "item": "#catalyst", "framed": "false", "x": 20, - "y": 57 + "y": 65 }, { "type": "item", "item": "botania:mana_pool:0{RenderFull:1b}", "framed": "false", "x": 49, - "y": 33 + "y": 41 }, { "type": "item", @@ -45,7 +62,7 @@ "framed": "false", "link_recipe": true, "x": 78, - "y": 33 + "y": 41 }, { "type": "custom", 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 79946a953..cc77f8420 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 @@ -40,10 +40,17 @@ "x": 49, "y": 53 }, + { + "type": "text", + "text": "botaniamisc.shiftToStopSpin", + "color": "-67000000", + "x": 13, + "y": 110 + }, { "type": "text", "text": "#text", - "y": 130 + "y": 126 } ] } \ 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 edf007f6d..a6afff86b 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 @@ -45,12 +45,19 @@ "class": "vazkii.botania.client.patchouli.component.ManaComponent", "mana": "#mana", "x": -1, - "y": 103 + "y": 100 + }, + { + "type": "text", + "text": "botaniamisc.shiftToStopSpin", + "color": "-67000000", + "x": 13, + "y": 123 }, { "type": "text", "text": "#text", - "y": 130 + "y": 134 } ] } \ No newline at end of file