From 337f9fe3226547975eb0044a49076aa96bf48cdc Mon Sep 17 00:00:00 2001 From: Hubry Date: Tue, 18 Feb 2020 17:57:33 +0100 Subject: [PATCH] Add workaround crafting recipe for Botania banner patterns, rerun data Closes #3114 I was planning to do this for a while, and accidentally added the empty class for the recipe with the recipe generator... --- .../advancements/recipes/botania/lexicon.json | 11 + .../botania/terrasteel_helmet_revealing.json | 43 -- .../recipes/dynamic/banner_pattern_apply.json | 3 + .../recipes/terrasteel_helmet_revealing.json | 25 - .../botania/common/block/ModBanners.java | 42 +- .../common/crafting/recipe/BannerRecipe.java | 89 +++- .../vazkii/botania/common/item/ModItems.java | 1 + .../vazkii/botania/data/RecipeProvider.java | 1 + .../resources/assets/botania/lang/en_us.json | 482 +++++++++--------- 9 files changed, 364 insertions(+), 333 deletions(-) delete mode 100644 src/generated/resources/data/botania/advancements/recipes/botania/terrasteel_helmet_revealing.json create mode 100644 src/generated/resources/data/botania/recipes/dynamic/banner_pattern_apply.json delete mode 100644 src/generated/resources/data/botania/recipes/terrasteel_helmet_revealing.json diff --git a/src/generated/resources/data/botania/advancements/recipes/botania/lexicon.json b/src/generated/resources/data/botania/advancements/recipes/botania/lexicon.json index 503946b1c..6cd07dfa6 100644 --- a/src/generated/resources/data/botania/advancements/recipes/botania/lexicon.json +++ b/src/generated/resources/data/botania/advancements/recipes/botania/lexicon.json @@ -16,6 +16,16 @@ ] } }, + "has_alt_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:book" + } + ] + } + }, "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -26,6 +36,7 @@ "requirements": [ [ "has_item", + "has_alt_item", "has_the_recipe" ] ] diff --git a/src/generated/resources/data/botania/advancements/recipes/botania/terrasteel_helmet_revealing.json b/src/generated/resources/data/botania/advancements/recipes/botania/terrasteel_helmet_revealing.json deleted file mode 100644 index 187f239ac..000000000 --- a/src/generated/resources/data/botania/advancements/recipes/botania/terrasteel_helmet_revealing.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "botania:terrasteel_helmet_revealing" - ] - }, - "criteria": { - "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "forge:ingots/terrasteel" - } - ] - } - }, - "has_prev_tier": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:manasteel_helmet_revealing" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "botania:terrasteel_helmet_revealing" - } - } - }, - "requirements": [ - [ - "has_item", - "has_prev_tier", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/dynamic/banner_pattern_apply.json b/src/generated/resources/data/botania/recipes/dynamic/banner_pattern_apply.json new file mode 100644 index 000000000..353c14935 --- /dev/null +++ b/src/generated/resources/data/botania/recipes/dynamic/banner_pattern_apply.json @@ -0,0 +1,3 @@ +{ + "type": "botania:banner_pattern_apply" +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/recipes/terrasteel_helmet_revealing.json b/src/generated/resources/data/botania/recipes/terrasteel_helmet_revealing.json deleted file mode 100644 index 57a30f39b..000000000 --- a/src/generated/resources/data/botania/recipes/terrasteel_helmet_revealing.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "botania:armor_upgrade", - "pattern": [ - "TRT", - "SAS", - " S " - ], - "key": { - "T": { - "item": "botania:livingwood_twig" - }, - "S": { - "tag": "forge:ingots/terrasteel" - }, - "R": { - "tag": "botania:runes/spring" - }, - "A": { - "item": "botania:manasteel_helmet_revealing" - } - }, - "result": { - "item": "botania:terrasteel_helmet_revealing" - } -} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/ModBanners.java b/src/main/java/vazkii/botania/common/block/ModBanners.java index e569b45f4..c4f6fc3e1 100644 --- a/src/main/java/vazkii/botania/common/block/ModBanners.java +++ b/src/main/java/vazkii/botania/common/block/ModBanners.java @@ -10,38 +10,46 @@ */ package vazkii.botania.common.block; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.tileentity.BannerPattern; +import net.minecraft.util.IItemProvider; +import net.minecraftforge.registries.IRegistryDelegate; import vazkii.botania.common.item.ModItems; +import java.util.LinkedHashMap; import java.util.Locale; +import java.util.Map; public final class ModBanners { + public static final Map, BannerPattern> PATTERNS = new LinkedHashMap<>(); + public static void init() { - addPattern("flower", "flr", new ItemStack(ModItems.livingwoodTwig)); - addPattern("lexicon", "lex", new ItemStack(ModItems.lexicon)); - addPattern("logo", "lgo", new ItemStack(ModItems.terrasteel)); - addPattern("sapling", "spl", new ItemStack(ModItems.dreamwoodTwig)); - addPattern("tiny_potato", "tpt", new ItemStack(ModBlocks.tinyPotato)); + addPattern("flower", "flr", ModItems.livingwoodTwig); + addPattern("lexicon", "lex", ModItems.lexicon); + addPattern("logo", "lgo", ModItems.terrasteel); + addPattern("sapling", "spl", ModItems.dreamwoodTwig); + addPattern("tiny_potato", "tpt", ModBlocks.tinyPotato); - addPattern("spark_dispersive", "sds", new ItemStack(ModItems.sparkUpgradeDispersive)); - addPattern("spark_dominant", "sdm", new ItemStack(ModItems.sparkUpgradeDominant)); - addPattern("spark_recessive", "src", new ItemStack(ModItems.sparkUpgradeRecessive)); - addPattern("spark_isolated", "sis", new ItemStack(ModItems.sparkUpgradeIsolated)); + addPattern("spark_dispersive", "sds", ModItems.sparkUpgradeDispersive); + addPattern("spark_dominant", "sdm", ModItems.sparkUpgradeDominant); + addPattern("spark_recessive", "src", ModItems.sparkUpgradeRecessive); + addPattern("spark_isolated", "sis", ModItems.sparkUpgradeIsolated); - addPattern("fish", "fis", new ItemStack(Items.COD)); - addPattern("axe", "axe", new ItemStack(Items.IRON_AXE)); - addPattern("hoe", "hoe", new ItemStack(Items.IRON_HOE)); - addPattern("pickaxe", "pik", new ItemStack(Items.IRON_PICKAXE)); - addPattern("shovel", "shv", new ItemStack(Items.IRON_SHOVEL)); - addPattern("sword", "srd", new ItemStack(Items.IRON_SWORD)); + addPattern("fish", "fis", Items.COD); + addPattern("axe", "axe", Items.IRON_AXE); + addPattern("hoe", "hoe", Items.IRON_HOE); + addPattern("pickaxe", "pik", Items.IRON_PICKAXE); + addPattern("shovel", "shv", Items.IRON_SHOVEL); + addPattern("sword", "srd", Items.IRON_SWORD); } - private static void addPattern(String name, String id, ItemStack craftingItem) { + private static void addPattern(String name, String id, IItemProvider craftingItem) { name = "botania_" + name; id = "bt_" + id; - BannerPattern.create(name.toUpperCase(Locale.ROOT), name, id, craftingItem); + BannerPattern pattern = BannerPattern.create(name.toUpperCase(Locale.ROOT), name, id, new ItemStack(craftingItem)); + PATTERNS.put(craftingItem.asItem().delegate, pattern); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/BannerRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/BannerRecipe.java index 55001b7a3..a9f132150 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/BannerRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/BannerRecipe.java @@ -11,37 +11,112 @@ package vazkii.botania.common.crafting.recipe; import net.minecraft.inventory.CraftingInventory; +import net.minecraft.item.DyeColor; +import net.minecraft.item.DyeItem; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.SpecialRecipe; import net.minecraft.item.crafting.SpecialRecipeSerializer; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.nbt.ListNBT; +import net.minecraft.tags.ItemTags; +import net.minecraft.tileentity.BannerPattern; +import net.minecraft.tileentity.BannerTileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import vazkii.botania.common.block.ModBanners; +import javax.annotation.Nonnull; + +// Workaround recipe for the loom hardcoding problem. public class BannerRecipe extends SpecialRecipe { - public static IRecipeSerializer SERIALIZER = new SpecialRecipeSerializer<>(BannerRecipe::new); + public static SpecialRecipeSerializer SERIALIZER = new SpecialRecipeSerializer<>(BannerRecipe::new); public BannerRecipe(ResourceLocation id) { super(id); } @Override - public boolean matches(CraftingInventory inv, World worldIn) { - return false; + public boolean matches(CraftingInventory inv, @Nonnull World world) { + boolean foundBanner = false; + boolean foundItem = false; + boolean foundDye = false; + for (int i = 0; i < inv.getSizeInventory(); i++) { + ItemStack stack = inv.getStackInSlot(i); + Item item = stack.getItem(); + if (stack.isEmpty()) + continue; + + if (ModBanners.PATTERNS.containsKey(item.delegate) && !foundItem) { + foundItem = true; + } else if (ItemTags.BANNERS.contains(item) && !foundBanner && BannerTileEntity.getPatterns(stack) < 6) { + foundBanner = true; + } else if (item instanceof DyeItem && !foundDye) { + foundDye = true; + } else return false; + } + return foundBanner && foundItem && foundDye; } + @Nonnull @Override - public ItemStack getCraftingResult(CraftingInventory inv) { - return null; + public ItemStack getCraftingResult(@Nonnull CraftingInventory inv) { + ItemStack banner = ItemStack.EMPTY; + ItemStack dye = ItemStack.EMPTY; + BannerPattern pattern = null; + + for (int i = 0; i < inv.getSizeInventory(); i++) { + ItemStack stack = inv.getStackInSlot(i); + Item item = stack.getItem(); + if (ModBanners.PATTERNS.containsKey(item.delegate)) { + pattern = ModBanners.PATTERNS.get(item.delegate); + } else if (ItemTags.BANNERS.contains(item)) { + banner = stack; + } else if (item instanceof DyeItem) { + dye = stack; + } + } + return applyPattern(banner, pattern, dye); + } + + // [VanillaCopy] From LoomContainer.func_217031_j, edits noted + @SuppressWarnings("UnnecessaryLocalVariable") + private static ItemStack applyPattern(ItemStack banner, BannerPattern pattern, ItemStack dye) { + ItemStack itemstack = banner; // Apply our context here + ItemStack itemstack1 = dye; + ItemStack itemstack2 = ItemStack.EMPTY; + + if (!itemstack.isEmpty() && !itemstack1.isEmpty()) { + itemstack2 = itemstack.copy(); + itemstack2.setCount(1); + BannerPattern bannerpattern = pattern; // Replace the pattern with provided one + DyeColor dyecolor = ((DyeItem) itemstack1.getItem()).getDyeColor(); + CompoundNBT compoundnbt = itemstack2.getOrCreateChildTag("BlockEntityTag"); + ListNBT listnbt; + if (compoundnbt.contains("Patterns", 9)) { + listnbt = compoundnbt.getList("Patterns", 10); + } else { + listnbt = new ListNBT(); + compoundnbt.put("Patterns", listnbt); + } + + CompoundNBT compoundnbt1 = new CompoundNBT(); + compoundnbt1.putString("Pattern", bannerpattern.getHashname()); + compoundnbt1.putInt("Color", dyecolor.getId()); + listnbt.add(compoundnbt1); + } + return itemstack2; } @Override public boolean canFit(int width, int height) { - return false; + return true; } + @Nonnull @Override public IRecipeSerializer getSerializer() { - return null; + return SERIALIZER; } } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 6bea01a1e..fa8686c51 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -713,6 +713,7 @@ public final class ModItems { IForgeRegistry> r = evt.getRegistry(); register(r, AncientWillRecipe.SERIALIZER, "ancient_will_attach"); register(r, ArmorUpgradeRecipe.SERIALIZER, "armor_upgrade"); + register(r, BannerRecipe.SERIALIZER, "banner_pattern_apply"); register(r, BlackHoleTalismanExtractRecipe.SERIALIZER, "black_hole_talisman_extract"); register(r, CompositeLensRecipe.SERIALIZER, "composite_lens"); register(r, CosmeticAttachRecipe.SERIALIZER, "cosmetic_attach"); diff --git a/src/main/java/vazkii/botania/data/RecipeProvider.java b/src/main/java/vazkii/botania/data/RecipeProvider.java index cd513b170..71ae702e4 100644 --- a/src/main/java/vazkii/botania/data/RecipeProvider.java +++ b/src/main/java/vazkii/botania/data/RecipeProvider.java @@ -74,6 +74,7 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider { @Override protected void registerRecipes(Consumer consumer) { specialRecipe(consumer, AncientWillRecipe.SERIALIZER); + specialRecipe(consumer, BannerRecipe.SERIALIZER); specialRecipe(consumer, BlackHoleTalismanExtractRecipe.SERIALIZER); specialRecipe(consumer, CompositeLensRecipe.SERIALIZER); specialRecipe(consumer, CosmeticAttachRecipe.SERIALIZER); diff --git a/src/main/resources/assets/botania/lang/en_us.json b/src/main/resources/assets/botania/lang/en_us.json index 1c03178ff..fd9130b8d 100644 --- a/src/main/resources/assets/botania/lang/en_us.json +++ b/src/main/resources/assets/botania/lang/en_us.json @@ -1418,260 +1418,260 @@ "item.botania.record_gaia_1.desc": "Kain Vinosec - Endure Emptiness", "item.botania.record_gaia_2.desc": "Kain Vinosec - Fight For Quiescence", - "item.banner.botania_flower.black": "Black Mystical Flower", - "item.banner.botania_flower.red": "Red Mystical Flower", - "item.banner.botania_flower.green": "Green Mystical Flower", - "item.banner.botania_flower.brown": "Brown Mystical Flower", - "item.banner.botania_flower.blue": "Blue Mystical Flower", - "item.banner.botania_flower.purple": "Purple Mystical Flower", - "item.banner.botania_flower.cyan": "Cyan Mystical Flower", - "item.banner.botania_flower.silver": "Light Gray Mystical Flower", - "item.banner.botania_flower.gray": "Gray Mystical Flower", - "item.banner.botania_flower.pink": "Pink Mystical Flower", - "item.banner.botania_flower.lime": "Lime Mystical Flower", - "item.banner.botania_flower.yellow": "Yellow Mystical Flower", - "item.banner.botania_flower.lightBlue": "Light Blue Mystical Flower", - "item.banner.botania_flower.magenta": "Magenta Mystical Flower", - "item.banner.botania_flower.orange": "Orange Mystical Flower", - "item.banner.botania_flower.white": "White Mystical Flower", + "block.minecraft.banner.botania_flower.black": "Black Mystical Flower", + "block.minecraft.banner.botania_flower.red": "Red Mystical Flower", + "block.minecraft.banner.botania_flower.green": "Green Mystical Flower", + "block.minecraft.banner.botania_flower.brown": "Brown Mystical Flower", + "block.minecraft.banner.botania_flower.blue": "Blue Mystical Flower", + "block.minecraft.banner.botania_flower.purple": "Purple Mystical Flower", + "block.minecraft.banner.botania_flower.cyan": "Cyan Mystical Flower", + "block.minecraft.banner.botania_flower.silver": "Light Gray Mystical Flower", + "block.minecraft.banner.botania_flower.gray": "Gray Mystical Flower", + "block.minecraft.banner.botania_flower.pink": "Pink Mystical Flower", + "block.minecraft.banner.botania_flower.lime": "Lime Mystical Flower", + "block.minecraft.banner.botania_flower.yellow": "Yellow Mystical Flower", + "block.minecraft.banner.botania_flower.lightBlue": "Light Blue Mystical Flower", + "block.minecraft.banner.botania_flower.magenta": "Magenta Mystical Flower", + "block.minecraft.banner.botania_flower.orange": "Orange Mystical Flower", + "block.minecraft.banner.botania_flower.white": "White Mystical Flower", - "item.banner.botania_lexicon.black": "Black Lexicon", - "item.banner.botania_lexicon.red": "Red Lexicon", - "item.banner.botania_lexicon.green": "Green Lexicon", - "item.banner.botania_lexicon.brown": "Brown Lexicon", - "item.banner.botania_lexicon.blue": "Blue Lexicon", - "item.banner.botania_lexicon.purple": "Purple Lexicon", - "item.banner.botania_lexicon.cyan": "Cyan Lexicon", - "item.banner.botania_lexicon.silver": "Light Gray Lexicon", - "item.banner.botania_lexicon.gray": "Gray Lexicon", - "item.banner.botania_lexicon.pink": "Pink Lexicon", - "item.banner.botania_lexicon.lime": "Lime Lexicon", - "item.banner.botania_lexicon.yellow": "Yellow Lexicon", - "item.banner.botania_lexicon.lightBlue": "Light Blue Lexicon", - "item.banner.botania_lexicon.magenta": "Magenta Lexicon", - "item.banner.botania_lexicon.orange": "Orange Lexicon", - "item.banner.botania_lexicon.white": "White Lexicon", + "block.minecraft.banner.botania_lexicon.black": "Black Lexicon", + "block.minecraft.banner.botania_lexicon.red": "Red Lexicon", + "block.minecraft.banner.botania_lexicon.green": "Green Lexicon", + "block.minecraft.banner.botania_lexicon.brown": "Brown Lexicon", + "block.minecraft.banner.botania_lexicon.blue": "Blue Lexicon", + "block.minecraft.banner.botania_lexicon.purple": "Purple Lexicon", + "block.minecraft.banner.botania_lexicon.cyan": "Cyan Lexicon", + "block.minecraft.banner.botania_lexicon.silver": "Light Gray Lexicon", + "block.minecraft.banner.botania_lexicon.gray": "Gray Lexicon", + "block.minecraft.banner.botania_lexicon.pink": "Pink Lexicon", + "block.minecraft.banner.botania_lexicon.lime": "Lime Lexicon", + "block.minecraft.banner.botania_lexicon.yellow": "Yellow Lexicon", + "block.minecraft.banner.botania_lexicon.lightBlue": "Light Blue Lexicon", + "block.minecraft.banner.botania_lexicon.magenta": "Magenta Lexicon", + "block.minecraft.banner.botania_lexicon.orange": "Orange Lexicon", + "block.minecraft.banner.botania_lexicon.white": "White Lexicon", - "item.banner.botania_logo.black": "Black Botania", - "item.banner.botania_logo.red": "Red Botania", - "item.banner.botania_logo.green": "Green Botania", - "item.banner.botania_logo.brown": "Brown Botania", - "item.banner.botania_logo.blue": "Blue Botania", - "item.banner.botania_logo.purple": "Purple Botania", - "item.banner.botania_logo.cyan": "Cyan Botania", - "item.banner.botania_logo.silver": "Light Gray Botania", - "item.banner.botania_logo.gray": "Gray Botania", - "item.banner.botania_logo.pink": "Pink Botania", - "item.banner.botania_logo.lime": "Lime Botania", - "item.banner.botania_logo.yellow": "Yellow Botania", - "item.banner.botania_logo.lightBlue": "Light Blue Botania", - "item.banner.botania_logo.magenta": "Magenta Botania", - "item.banner.botania_logo.orange": "Orange Botania", - "item.banner.botania_logo.white": "White Botania", + "block.minecraft.banner.botania_logo.black": "Black Botania", + "block.minecraft.banner.botania_logo.red": "Red Botania", + "block.minecraft.banner.botania_logo.green": "Green Botania", + "block.minecraft.banner.botania_logo.brown": "Brown Botania", + "block.minecraft.banner.botania_logo.blue": "Blue Botania", + "block.minecraft.banner.botania_logo.purple": "Purple Botania", + "block.minecraft.banner.botania_logo.cyan": "Cyan Botania", + "block.minecraft.banner.botania_logo.silver": "Light Gray Botania", + "block.minecraft.banner.botania_logo.gray": "Gray Botania", + "block.minecraft.banner.botania_logo.pink": "Pink Botania", + "block.minecraft.banner.botania_logo.lime": "Lime Botania", + "block.minecraft.banner.botania_logo.yellow": "Yellow Botania", + "block.minecraft.banner.botania_logo.lightBlue": "Light Blue Botania", + "block.minecraft.banner.botania_logo.magenta": "Magenta Botania", + "block.minecraft.banner.botania_logo.orange": "Orange Botania", + "block.minecraft.banner.botania_logo.white": "White Botania", - "item.banner.botania_sapling.black": "Black Tree", - "item.banner.botania_sapling.red": "Red Tree", - "item.banner.botania_sapling.green": "Green Tree", - "item.banner.botania_sapling.brown": "Brown Tree", - "item.banner.botania_sapling.blue": "Blue Tree", - "item.banner.botania_sapling.purple": "Purple Tree", - "item.banner.botania_sapling.cyan": "Cyan Tree", - "item.banner.botania_sapling.silver": "Light Gray Tree", - "item.banner.botania_sapling.gray": "Gray Tree", - "item.banner.botania_sapling.pink": "Pink Tree", - "item.banner.botania_sapling.lime": "Lime Tree", - "item.banner.botania_sapling.yellow": "Yellow Tree", - "item.banner.botania_sapling.lightBlue": "Light Blue Tree", - "item.banner.botania_sapling.magenta": "Magenta Tree", - "item.banner.botania_sapling.orange": "Orange Tree", - "item.banner.botania_sapling.white": "White Tree", + "block.minecraft.banner.botania_sapling.black": "Black Tree", + "block.minecraft.banner.botania_sapling.red": "Red Tree", + "block.minecraft.banner.botania_sapling.green": "Green Tree", + "block.minecraft.banner.botania_sapling.brown": "Brown Tree", + "block.minecraft.banner.botania_sapling.blue": "Blue Tree", + "block.minecraft.banner.botania_sapling.purple": "Purple Tree", + "block.minecraft.banner.botania_sapling.cyan": "Cyan Tree", + "block.minecraft.banner.botania_sapling.silver": "Light Gray Tree", + "block.minecraft.banner.botania_sapling.gray": "Gray Tree", + "block.minecraft.banner.botania_sapling.pink": "Pink Tree", + "block.minecraft.banner.botania_sapling.lime": "Lime Tree", + "block.minecraft.banner.botania_sapling.yellow": "Yellow Tree", + "block.minecraft.banner.botania_sapling.lightBlue": "Light Blue Tree", + "block.minecraft.banner.botania_sapling.magenta": "Magenta Tree", + "block.minecraft.banner.botania_sapling.orange": "Orange Tree", + "block.minecraft.banner.botania_sapling.white": "White Tree", - "item.banner.botania_tiny_potato.black": "Black Potato Face", - "item.banner.botania_tiny_potato.red": "Red Potato Face", - "item.banner.botania_tiny_potato.green": "Green Potato Face", - "item.banner.botania_tiny_potato.brown": "Brown Potato Face", - "item.banner.botania_tiny_potato.blue": "Blue Potato Face", - "item.banner.botania_tiny_potato.purple": "Purple Potato Face", - "item.banner.botania_tiny_potato.cyan": "Cyan Potato Face", - "item.banner.botania_tiny_potato.silver": "Light Gray Potato Face", - "item.banner.botania_tiny_potato.gray": "Gray Potato Face", - "item.banner.botania_tiny_potato.pink": "Pink Potato Face", - "item.banner.botania_tiny_potato.lime": "Lime Potato Face", - "item.banner.botania_tiny_potato.yellow": "Yellow Potato Face", - "item.banner.botania_tiny_potato.lightBlue": "Light Blue Potato Face", - "item.banner.botania_tiny_potato.magenta": "Magenta Potato Face", - "item.banner.botania_tiny_potato.orange": "Orange Potato Face", - "item.banner.botania_tiny_potato.white": "White Potato Face", + "block.minecraft.banner.botania_tiny_potato.black": "Black Potato Face", + "block.minecraft.banner.botania_tiny_potato.red": "Red Potato Face", + "block.minecraft.banner.botania_tiny_potato.green": "Green Potato Face", + "block.minecraft.banner.botania_tiny_potato.brown": "Brown Potato Face", + "block.minecraft.banner.botania_tiny_potato.blue": "Blue Potato Face", + "block.minecraft.banner.botania_tiny_potato.purple": "Purple Potato Face", + "block.minecraft.banner.botania_tiny_potato.cyan": "Cyan Potato Face", + "block.minecraft.banner.botania_tiny_potato.silver": "Light Gray Potato Face", + "block.minecraft.banner.botania_tiny_potato.gray": "Gray Potato Face", + "block.minecraft.banner.botania_tiny_potato.pink": "Pink Potato Face", + "block.minecraft.banner.botania_tiny_potato.lime": "Lime Potato Face", + "block.minecraft.banner.botania_tiny_potato.yellow": "Yellow Potato Face", + "block.minecraft.banner.botania_tiny_potato.lightBlue": "Light Blue Potato Face", + "block.minecraft.banner.botania_tiny_potato.magenta": "Magenta Potato Face", + "block.minecraft.banner.botania_tiny_potato.orange": "Orange Potato Face", + "block.minecraft.banner.botania_tiny_potato.white": "White Potato Face", - "item.banner.botania_spark_dispersive.black": "Black Dispersive Symbol", - "item.banner.botania_spark_dispersive.red": "Red Dispersive Symbol", - "item.banner.botania_spark_dispersive.green": "Green Dispersive Symbol", - "item.banner.botania_spark_dispersive.brown": "Brown Dispersive Symbol", - "item.banner.botania_spark_dispersive.blue": "Blue Dispersive Symbol", - "item.banner.botania_spark_dispersive.purple": "Purple Dispersive Symbol", - "item.banner.botania_spark_dispersive.cyan": "Cyan Dispersive Symbol", - "item.banner.botania_spark_dispersive.silver": "Light Gray Dispersive Symbol", - "item.banner.botania_spark_dispersive.gray": "Gray Dispersive Symbol", - "item.banner.botania_spark_dispersive.pink": "Pink Dispersive Symbol", - "item.banner.botania_spark_dispersive.lime": "Lime Dispersive Symbol", - "item.banner.botania_spark_dispersive.yellow": "Yellow Dispersive Symbol", - "item.banner.botania_spark_dispersive.lightBlue": "Light Blue Dispersive Symbol", - "item.banner.botania_spark_dispersive.magenta": "Magenta Dispersive Symbol", - "item.banner.botania_spark_dispersive.orange": "Orange Dispersive Symbol", - "item.banner.botania_spark_dispersive.white": "White Dispersive Symbol", + "block.minecraft.banner.botania_spark_dispersive.black": "Black Dispersive Symbol", + "block.minecraft.banner.botania_spark_dispersive.red": "Red Dispersive Symbol", + "block.minecraft.banner.botania_spark_dispersive.green": "Green Dispersive Symbol", + "block.minecraft.banner.botania_spark_dispersive.brown": "Brown Dispersive Symbol", + "block.minecraft.banner.botania_spark_dispersive.blue": "Blue Dispersive Symbol", + "block.minecraft.banner.botania_spark_dispersive.purple": "Purple Dispersive Symbol", + "block.minecraft.banner.botania_spark_dispersive.cyan": "Cyan Dispersive Symbol", + "block.minecraft.banner.botania_spark_dispersive.silver": "Light Gray Dispersive Symbol", + "block.minecraft.banner.botania_spark_dispersive.gray": "Gray Dispersive Symbol", + "block.minecraft.banner.botania_spark_dispersive.pink": "Pink Dispersive Symbol", + "block.minecraft.banner.botania_spark_dispersive.lime": "Lime Dispersive Symbol", + "block.minecraft.banner.botania_spark_dispersive.yellow": "Yellow Dispersive Symbol", + "block.minecraft.banner.botania_spark_dispersive.lightBlue": "Light Blue Dispersive Symbol", + "block.minecraft.banner.botania_spark_dispersive.magenta": "Magenta Dispersive Symbol", + "block.minecraft.banner.botania_spark_dispersive.orange": "Orange Dispersive Symbol", + "block.minecraft.banner.botania_spark_dispersive.white": "White Dispersive Symbol", - "item.banner.botania_spark_dominant.black": "Black Dominant Symbol", - "item.banner.botania_spark_dominant.red": "Red Dominant Symbol", - "item.banner.botania_spark_dominant.green": "Green Dominant Symbol", - "item.banner.botania_spark_dominant.brown": "Brown Dominant Symbol", - "item.banner.botania_spark_dominant.blue": "Blue Dominant Symbol", - "item.banner.botania_spark_dominant.purple": "Purple Dominant Symbol", - "item.banner.botania_spark_dominant.cyan": "Cyan Dominant Symbol", - "item.banner.botania_spark_dominant.silver": "Light Gray Dominant Symbol", - "item.banner.botania_spark_dominant.gray": "Gray Dominant Symbol", - "item.banner.botania_spark_dominant.pink": "Pink Dominant Symbol", - "item.banner.botania_spark_dominant.lime": "Lime Dominant Symbol", - "item.banner.botania_spark_dominant.yellow": "Yellow Dominant Symbol", - "item.banner.botania_spark_dominant.lightBlue": "Light Blue Dominant Symbol", - "item.banner.botania_spark_dominant.magenta": "Magenta Dominant Symbol", - "item.banner.botania_spark_dominant.orange": "Orange Dominant Symbol", - "item.banner.botania_spark_dominant.white": "White Dominant Symbol", + "block.minecraft.banner.botania_spark_dominant.black": "Black Dominant Symbol", + "block.minecraft.banner.botania_spark_dominant.red": "Red Dominant Symbol", + "block.minecraft.banner.botania_spark_dominant.green": "Green Dominant Symbol", + "block.minecraft.banner.botania_spark_dominant.brown": "Brown Dominant Symbol", + "block.minecraft.banner.botania_spark_dominant.blue": "Blue Dominant Symbol", + "block.minecraft.banner.botania_spark_dominant.purple": "Purple Dominant Symbol", + "block.minecraft.banner.botania_spark_dominant.cyan": "Cyan Dominant Symbol", + "block.minecraft.banner.botania_spark_dominant.silver": "Light Gray Dominant Symbol", + "block.minecraft.banner.botania_spark_dominant.gray": "Gray Dominant Symbol", + "block.minecraft.banner.botania_spark_dominant.pink": "Pink Dominant Symbol", + "block.minecraft.banner.botania_spark_dominant.lime": "Lime Dominant Symbol", + "block.minecraft.banner.botania_spark_dominant.yellow": "Yellow Dominant Symbol", + "block.minecraft.banner.botania_spark_dominant.lightBlue": "Light Blue Dominant Symbol", + "block.minecraft.banner.botania_spark_dominant.magenta": "Magenta Dominant Symbol", + "block.minecraft.banner.botania_spark_dominant.orange": "Orange Dominant Symbol", + "block.minecraft.banner.botania_spark_dominant.white": "White Dominant Symbol", - "item.banner.botania_spark_isolated.black": "Black Isolated Symbol", - "item.banner.botania_spark_isolated.red": "Red Isolated Symbol", - "item.banner.botania_spark_isolated.green": "Green Isolated Symbol", - "item.banner.botania_spark_isolated.brown": "Brown Isolated Symbol", - "item.banner.botania_spark_isolated.blue": "Blue Isolated Symbol", - "item.banner.botania_spark_isolated.purple": "Purple Isolated Symbol", - "item.banner.botania_spark_isolated.cyan": "Cyan Isolated Symbol", - "item.banner.botania_spark_isolated.silver": "Light Gray Isolated Symbol", - "item.banner.botania_spark_isolated.gray": "Gray Isolated Symbol", - "item.banner.botania_spark_isolated.pink": "Pink Isolated Symbol", - "item.banner.botania_spark_isolated.lime": "Lime Isolated Symbol", - "item.banner.botania_spark_isolated.yellow": "Yellow Isolated Symbol", - "item.banner.botania_spark_isolated.lightBlue": "Light Blue Isolated Symbol", - "item.banner.botania_spark_isolated.magenta": "Magenta Isolated Symbol", - "item.banner.botania_spark_isolated.orange": "Orange Isolated Symbol", - "item.banner.botania_spark_isolated.white": "White Isolated Symbol", + "block.minecraft.banner.botania_spark_isolated.black": "Black Isolated Symbol", + "block.minecraft.banner.botania_spark_isolated.red": "Red Isolated Symbol", + "block.minecraft.banner.botania_spark_isolated.green": "Green Isolated Symbol", + "block.minecraft.banner.botania_spark_isolated.brown": "Brown Isolated Symbol", + "block.minecraft.banner.botania_spark_isolated.blue": "Blue Isolated Symbol", + "block.minecraft.banner.botania_spark_isolated.purple": "Purple Isolated Symbol", + "block.minecraft.banner.botania_spark_isolated.cyan": "Cyan Isolated Symbol", + "block.minecraft.banner.botania_spark_isolated.silver": "Light Gray Isolated Symbol", + "block.minecraft.banner.botania_spark_isolated.gray": "Gray Isolated Symbol", + "block.minecraft.banner.botania_spark_isolated.pink": "Pink Isolated Symbol", + "block.minecraft.banner.botania_spark_isolated.lime": "Lime Isolated Symbol", + "block.minecraft.banner.botania_spark_isolated.yellow": "Yellow Isolated Symbol", + "block.minecraft.banner.botania_spark_isolated.lightBlue": "Light Blue Isolated Symbol", + "block.minecraft.banner.botania_spark_isolated.magenta": "Magenta Isolated Symbol", + "block.minecraft.banner.botania_spark_isolated.orange": "Orange Isolated Symbol", + "block.minecraft.banner.botania_spark_isolated.white": "White Isolated Symbol", - "item.banner.botania_spark_recessive.black": "Black Recessive Symbol", - "item.banner.botania_spark_recessive.red": "Red Recessive Symbol", - "item.banner.botania_spark_recessive.green": "Green Recessive Symbol", - "item.banner.botania_spark_recessive.brown": "Brown Recessive Symbol", - "item.banner.botania_spark_recessive.blue": "Blue Recessive Symbol", - "item.banner.botania_spark_recessive.purple": "Purple Recessive Symbol", - "item.banner.botania_spark_recessive.cyan": "Cyan Recessive Symbol", - "item.banner.botania_spark_recessive.silver": "Light Gray Recessive Symbol", - "item.banner.botania_spark_recessive.gray": "Gray Recessive Symbol", - "item.banner.botania_spark_recessive.pink": "Pink Recessive Symbol", - "item.banner.botania_spark_recessive.lime": "Lime Recessive Symbol", - "item.banner.botania_spark_recessive.yellow": "Yellow Recessive Symbol", - "item.banner.botania_spark_recessive.lightBlue": "Light Blue Recessive Symbol", - "item.banner.botania_spark_recessive.magenta": "Magenta Recessive Symbol", - "item.banner.botania_spark_recessive.orange": "Orange Recessive Symbol", - "item.banner.botania_spark_recessive.white": "White Recessive Symbol", + "block.minecraft.banner.botania_spark_recessive.black": "Black Recessive Symbol", + "block.minecraft.banner.botania_spark_recessive.red": "Red Recessive Symbol", + "block.minecraft.banner.botania_spark_recessive.green": "Green Recessive Symbol", + "block.minecraft.banner.botania_spark_recessive.brown": "Brown Recessive Symbol", + "block.minecraft.banner.botania_spark_recessive.blue": "Blue Recessive Symbol", + "block.minecraft.banner.botania_spark_recessive.purple": "Purple Recessive Symbol", + "block.minecraft.banner.botania_spark_recessive.cyan": "Cyan Recessive Symbol", + "block.minecraft.banner.botania_spark_recessive.silver": "Light Gray Recessive Symbol", + "block.minecraft.banner.botania_spark_recessive.gray": "Gray Recessive Symbol", + "block.minecraft.banner.botania_spark_recessive.pink": "Pink Recessive Symbol", + "block.minecraft.banner.botania_spark_recessive.lime": "Lime Recessive Symbol", + "block.minecraft.banner.botania_spark_recessive.yellow": "Yellow Recessive Symbol", + "block.minecraft.banner.botania_spark_recessive.lightBlue": "Light Blue Recessive Symbol", + "block.minecraft.banner.botania_spark_recessive.magenta": "Magenta Recessive Symbol", + "block.minecraft.banner.botania_spark_recessive.orange": "Orange Recessive Symbol", + "block.minecraft.banner.botania_spark_recessive.white": "White Recessive Symbol", - "item.banner.botania_fish.black": "Black Fish", - "item.banner.botania_fish.red": "Red Fish", - "item.banner.botania_fish.green": "Green Fish", - "item.banner.botania_fish.brown": "Brown Fish", - "item.banner.botania_fish.blue": "Blue Fish", - "item.banner.botania_fish.purple": "Purple Fish", - "item.banner.botania_fish.cyan": "Cyan Fish", - "item.banner.botania_fish.silver": "Light Gray Fish", - "item.banner.botania_fish.gray": "Gray Fish", - "item.banner.botania_fish.pink": "Pink Fish", - "item.banner.botania_fish.lime": "Lime Fish", - "item.banner.botania_fish.yellow": "Yellow Fish", - "item.banner.botania_fish.lightBlue": "Light Blue Fish", - "item.banner.botania_fish.magenta": "Magenta Fish", - "item.banner.botania_fish.orange": "Orange Fish", - "item.banner.botania_fish.white": "White Fish", + "block.minecraft.banner.botania_fish.black": "Black Fish", + "block.minecraft.banner.botania_fish.red": "Red Fish", + "block.minecraft.banner.botania_fish.green": "Green Fish", + "block.minecraft.banner.botania_fish.brown": "Brown Fish", + "block.minecraft.banner.botania_fish.blue": "Blue Fish", + "block.minecraft.banner.botania_fish.purple": "Purple Fish", + "block.minecraft.banner.botania_fish.cyan": "Cyan Fish", + "block.minecraft.banner.botania_fish.silver": "Light Gray Fish", + "block.minecraft.banner.botania_fish.gray": "Gray Fish", + "block.minecraft.banner.botania_fish.pink": "Pink Fish", + "block.minecraft.banner.botania_fish.lime": "Lime Fish", + "block.minecraft.banner.botania_fish.yellow": "Yellow Fish", + "block.minecraft.banner.botania_fish.lightBlue": "Light Blue Fish", + "block.minecraft.banner.botania_fish.magenta": "Magenta Fish", + "block.minecraft.banner.botania_fish.orange": "Orange Fish", + "block.minecraft.banner.botania_fish.white": "White Fish", - "item.banner.botania_axe.black": "Black Axe", - "item.banner.botania_axe.red": "Red Axe", - "item.banner.botania_axe.green": "Green Axe", - "item.banner.botania_axe.brown": "Brown Axe", - "item.banner.botania_axe.blue": "Blue Axe", - "item.banner.botania_axe.purple": "Purple Axe", - "item.banner.botania_axe.cyan": "Cyan Axe", - "item.banner.botania_axe.silver": "Light Gray Axe", - "item.banner.botania_axe.gray": "Gray Axe", - "item.banner.botania_axe.pink": "Pink Axe", - "item.banner.botania_axe.lime": "Lime Axe", - "item.banner.botania_axe.yellow": "Yellow Axe", - "item.banner.botania_axe.lightBlue": "Light Blue Axe", - "item.banner.botania_axe.magenta": "Magenta Axe", - "item.banner.botania_axe.orange": "Orange Axe", - "item.banner.botania_axe.white": "White Axe", + "block.minecraft.banner.botania_axe.black": "Black Axe", + "block.minecraft.banner.botania_axe.red": "Red Axe", + "block.minecraft.banner.botania_axe.green": "Green Axe", + "block.minecraft.banner.botania_axe.brown": "Brown Axe", + "block.minecraft.banner.botania_axe.blue": "Blue Axe", + "block.minecraft.banner.botania_axe.purple": "Purple Axe", + "block.minecraft.banner.botania_axe.cyan": "Cyan Axe", + "block.minecraft.banner.botania_axe.silver": "Light Gray Axe", + "block.minecraft.banner.botania_axe.gray": "Gray Axe", + "block.minecraft.banner.botania_axe.pink": "Pink Axe", + "block.minecraft.banner.botania_axe.lime": "Lime Axe", + "block.minecraft.banner.botania_axe.yellow": "Yellow Axe", + "block.minecraft.banner.botania_axe.lightBlue": "Light Blue Axe", + "block.minecraft.banner.botania_axe.magenta": "Magenta Axe", + "block.minecraft.banner.botania_axe.orange": "Orange Axe", + "block.minecraft.banner.botania_axe.white": "White Axe", - "item.banner.botania_hoe.black": "Black Hoe", - "item.banner.botania_hoe.red": "Red Hoe", - "item.banner.botania_hoe.green": "Green Hoe", - "item.banner.botania_hoe.brown": "Brown Hoe", - "item.banner.botania_hoe.blue": "Blue Hoe", - "item.banner.botania_hoe.purple": "Purple Hoe", - "item.banner.botania_hoe.cyan": "Cyan Hoe", - "item.banner.botania_hoe.silver": "Light Gray Hoe", - "item.banner.botania_hoe.gray": "Gray Hoe", - "item.banner.botania_hoe.pink": "Pink Hoe", - "item.banner.botania_hoe.lime": "Lime Hoe", - "item.banner.botania_hoe.yellow": "Yellow Hoe", - "item.banner.botania_hoe.lightBlue": "Light Blue Hoe", - "item.banner.botania_hoe.magenta": "Magenta Hoe", - "item.banner.botania_hoe.orange": "Orange Hoe", - "item.banner.botania_hoe.white": "White Hoe", + "block.minecraft.banner.botania_hoe.black": "Black Hoe", + "block.minecraft.banner.botania_hoe.red": "Red Hoe", + "block.minecraft.banner.botania_hoe.green": "Green Hoe", + "block.minecraft.banner.botania_hoe.brown": "Brown Hoe", + "block.minecraft.banner.botania_hoe.blue": "Blue Hoe", + "block.minecraft.banner.botania_hoe.purple": "Purple Hoe", + "block.minecraft.banner.botania_hoe.cyan": "Cyan Hoe", + "block.minecraft.banner.botania_hoe.silver": "Light Gray Hoe", + "block.minecraft.banner.botania_hoe.gray": "Gray Hoe", + "block.minecraft.banner.botania_hoe.pink": "Pink Hoe", + "block.minecraft.banner.botania_hoe.lime": "Lime Hoe", + "block.minecraft.banner.botania_hoe.yellow": "Yellow Hoe", + "block.minecraft.banner.botania_hoe.lightBlue": "Light Blue Hoe", + "block.minecraft.banner.botania_hoe.magenta": "Magenta Hoe", + "block.minecraft.banner.botania_hoe.orange": "Orange Hoe", + "block.minecraft.banner.botania_hoe.white": "White Hoe", - "item.banner.botania_pickaxe.black": "Black Pickaxe", - "item.banner.botania_pickaxe.red": "Red Pickaxe", - "item.banner.botania_pickaxe.green": "Green Pickaxe", - "item.banner.botania_pickaxe.brown": "Brown Pickaxe", - "item.banner.botania_pickaxe.blue": "Blue Pickaxe", - "item.banner.botania_pickaxe.purple": "Purple Pickaxe", - "item.banner.botania_pickaxe.cyan": "Cyan Pickaxe", - "item.banner.botania_pickaxe.silver": "Light Gray Pickaxe", - "item.banner.botania_pickaxe.gray": "Gray Pickaxe", - "item.banner.botania_pickaxe.pink": "Pink Pickaxe", - "item.banner.botania_pickaxe.lime": "Lime Pickaxe", - "item.banner.botania_pickaxe.yellow": "Yellow Pickaxe", - "item.banner.botania_pickaxe.lightBlue": "Light Blue Pickaxe", - "item.banner.botania_pickaxe.magenta": "Magenta Pickaxe", - "item.banner.botania_pickaxe.orange": "Orange Pickaxe", - "item.banner.botania_pickaxe.white": "White Pickaxe", + "block.minecraft.banner.botania_pickaxe.black": "Black Pickaxe", + "block.minecraft.banner.botania_pickaxe.red": "Red Pickaxe", + "block.minecraft.banner.botania_pickaxe.green": "Green Pickaxe", + "block.minecraft.banner.botania_pickaxe.brown": "Brown Pickaxe", + "block.minecraft.banner.botania_pickaxe.blue": "Blue Pickaxe", + "block.minecraft.banner.botania_pickaxe.purple": "Purple Pickaxe", + "block.minecraft.banner.botania_pickaxe.cyan": "Cyan Pickaxe", + "block.minecraft.banner.botania_pickaxe.silver": "Light Gray Pickaxe", + "block.minecraft.banner.botania_pickaxe.gray": "Gray Pickaxe", + "block.minecraft.banner.botania_pickaxe.pink": "Pink Pickaxe", + "block.minecraft.banner.botania_pickaxe.lime": "Lime Pickaxe", + "block.minecraft.banner.botania_pickaxe.yellow": "Yellow Pickaxe", + "block.minecraft.banner.botania_pickaxe.lightBlue": "Light Blue Pickaxe", + "block.minecraft.banner.botania_pickaxe.magenta": "Magenta Pickaxe", + "block.minecraft.banner.botania_pickaxe.orange": "Orange Pickaxe", + "block.minecraft.banner.botania_pickaxe.white": "White Pickaxe", - "item.banner.botania_shovel.black": "Black Shovel", - "item.banner.botania_shovel.red": "Red Shovel", - "item.banner.botania_shovel.green": "Green Shovel", - "item.banner.botania_shovel.brown": "Brown Shovel", - "item.banner.botania_shovel.blue": "Blue Shovel", - "item.banner.botania_shovel.purple": "Purple Shovel", - "item.banner.botania_shovel.cyan": "Cyan Shovel", - "item.banner.botania_shovel.silver": "Light Gray Shovel", - "item.banner.botania_shovel.gray": "Gray Shovel", - "item.banner.botania_shovel.pink": "Pink Shovel", - "item.banner.botania_shovel.lime": "Lime Shovel", - "item.banner.botania_shovel.yellow": "Yellow Shovel", - "item.banner.botania_shovel.lightBlue": "Light Blue Shovel", - "item.banner.botania_shovel.magenta": "Magenta Shovel", - "item.banner.botania_shovel.orange": "Orange Shovel", - "item.banner.botania_shovel.white": "White Shovel", + "block.minecraft.banner.botania_shovel.black": "Black Shovel", + "block.minecraft.banner.botania_shovel.red": "Red Shovel", + "block.minecraft.banner.botania_shovel.green": "Green Shovel", + "block.minecraft.banner.botania_shovel.brown": "Brown Shovel", + "block.minecraft.banner.botania_shovel.blue": "Blue Shovel", + "block.minecraft.banner.botania_shovel.purple": "Purple Shovel", + "block.minecraft.banner.botania_shovel.cyan": "Cyan Shovel", + "block.minecraft.banner.botania_shovel.silver": "Light Gray Shovel", + "block.minecraft.banner.botania_shovel.gray": "Gray Shovel", + "block.minecraft.banner.botania_shovel.pink": "Pink Shovel", + "block.minecraft.banner.botania_shovel.lime": "Lime Shovel", + "block.minecraft.banner.botania_shovel.yellow": "Yellow Shovel", + "block.minecraft.banner.botania_shovel.lightBlue": "Light Blue Shovel", + "block.minecraft.banner.botania_shovel.magenta": "Magenta Shovel", + "block.minecraft.banner.botania_shovel.orange": "Orange Shovel", + "block.minecraft.banner.botania_shovel.white": "White Shovel", - "item.banner.botania_sword.black": "Black Sword", - "item.banner.botania_sword.red": "Red Sword", - "item.banner.botania_sword.green": "Green Sword", - "item.banner.botania_sword.brown": "Brown Sword", - "item.banner.botania_sword.blue": "Blue Sword", - "item.banner.botania_sword.purple": "Purple Sword", - "item.banner.botania_sword.cyan": "Cyan Sword", - "item.banner.botania_sword.silver": "Light Gray Sword", - "item.banner.botania_sword.gray": "Gray Sword", - "item.banner.botania_sword.pink": "Pink Sword", - "item.banner.botania_sword.lime": "Lime Sword", - "item.banner.botania_sword.yellow": "Yellow Sword", - "item.banner.botania_sword.lightBlue": "Light Blue Sword", - "item.banner.botania_sword.magenta": "Magenta Sword", - "item.banner.botania_sword.orange": "Orange Sword", - "item.banner.botania_sword.white": "White Sword", + "block.minecraft.banner.botania_sword.black": "Black Sword", + "block.minecraft.banner.botania_sword.red": "Red Sword", + "block.minecraft.banner.botania_sword.green": "Green Sword", + "block.minecraft.banner.botania_sword.brown": "Brown Sword", + "block.minecraft.banner.botania_sword.blue": "Blue Sword", + "block.minecraft.banner.botania_sword.purple": "Purple Sword", + "block.minecraft.banner.botania_sword.cyan": "Cyan Sword", + "block.minecraft.banner.botania_sword.silver": "Light Gray Sword", + "block.minecraft.banner.botania_sword.gray": "Gray Sword", + "block.minecraft.banner.botania_sword.pink": "Pink Sword", + "block.minecraft.banner.botania_sword.lime": "Lime Sword", + "block.minecraft.banner.botania_sword.yellow": "Yellow Sword", + "block.minecraft.banner.botania_sword.lightBlue": "Light Blue Sword", + "block.minecraft.banner.botania_sword.magenta": "Magenta Sword", + "block.minecraft.banner.botania_sword.orange": "Orange Sword", + "block.minecraft.banner.botania_sword.white": "White Sword", "botania.category.basics": "Basics and Mechanics", "botania.category.mana": "Mana Manipulation", @@ -3302,7 +3302,7 @@ "botania.entry.banners": "Banner Additions", "botania.tagline.banners": "Lots of new banner patterns", - "botania.page.banners0": "$(item)Botania$(0) adds $(thing)15$(0) new icons to banners, which can be mixed and matched with vanilla patterns and icons.$(p)The following items can be used alongside a dye in a $(item)Loom$(0) to add an icon to a $(item)Banner$(0): $(item)All Iron Tools$(0), $(l:mana/spark_upgrades)$(item)Spark Augments$(0)$(/l), $(item)Raw Fish$(0), $(item)Livingwood and Dreamwood Twigs$(0), $(l:basics/lexicon)$(item)Lexica Botania$(0)$(/l), $(l:basics/terrasteel)$(item)Terrasteel$(0)$(/l) and the $(l:misc/tiny_potato)$(item)Tiny Potato$(0)$(/l).", + "botania.page.banners0": "$(item)Botania$(0) adds $(thing)15$(0) new icons to banners, which can be mixed and matched with vanilla patterns and icons.$(p)The following items can be used alongside a dye in a $(item)Crafting Table$(0) to add an icon to a $(item)Banner$(0): $(item)All Iron Tools$(0), $(l:mana/spark_upgrades)$(item)Spark Augments$(0)$(/l), $(item)Raw Fish$(0), $(item)Livingwood and Dreamwood Twigs$(0), $(l:basics/lexicon)$(item)Lexica Botania$(0)$(/l), $(l:basics/terrasteel)$(item)Terrasteel$(0)$(/l) and the $(l:misc/tiny_potato)$(item)Tiny Potato$(0)$(/l).", "botania.page.banners1": "The various banners", "botania.entry.preventingDecay": "Numerical Mana",