From 01c93330169ed77c8c09cf19fff5a27bd9e25508 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 18 Dec 2017 15:32:36 -0600 Subject: [PATCH] Flatten dyes and petals --- .../client/core/handler/ColorHandler.java | 10 ++- .../common/block/BlockSpecialFlower.java | 5 +- .../common/block/decor/BlockBuriedPetals.java | 7 +- .../common/core/BotaniaCreativeTab.java | 4 +- .../common/crafting/ModCraftingRecipes.java | 5 +- .../crafting/ModManaInfusionRecipes.java | 4 +- .../common/entity/EntityCorporeaSpark.java | 11 ++-- .../botania/common/fixers/FlattenItems.java | 9 +++ .../botania/common/item/Item16Colors.java | 39 ++--------- .../vazkii/botania/common/item/ModItems.java | 29 +++++++-- .../botania/common/item/material/ItemDye.java | 22 +++++-- .../common/item/material/ItemPetal.java | 19 ++++-- .../resources/assets/botania/lang/de_de.lang | 64 +++++++++---------- .../resources/assets/botania/lang/en_us.lang | 64 +++++++++---------- .../resources/assets/botania/lang/es_es.lang | 64 +++++++++---------- .../resources/assets/botania/lang/fr_fr.lang | 64 +++++++++---------- .../resources/assets/botania/lang/ja_jp.lang | 64 +++++++++---------- .../resources/assets/botania/lang/ko_kr.lang | 64 +++++++++---------- .../resources/assets/botania/lang/nl_nl.lang | 64 +++++++++---------- .../resources/assets/botania/lang/pt_br.lang | 64 +++++++++---------- .../resources/assets/botania/lang/ru_ru.lang | 64 +++++++++---------- .../resources/assets/botania/lang/zh_cn.lang | 64 +++++++++---------- .../resources/assets/botania/lang/zh_tw.lang | 64 +++++++++---------- .../assets/botania/recipes/_constants.json | 42 ++++++++++++ .../petal_block_deconstruct_0.json | 3 +- .../petal_block_deconstruct_1.json | 3 +- .../petal_block_deconstruct_10.json | 3 +- .../petal_block_deconstruct_11.json | 3 +- .../petal_block_deconstruct_12.json | 3 +- .../petal_block_deconstruct_13.json | 3 +- .../petal_block_deconstruct_14.json | 3 +- .../petal_block_deconstruct_15.json | 3 +- .../petal_block_deconstruct_2.json | 3 +- .../petal_block_deconstruct_3.json | 3 +- .../petal_block_deconstruct_4.json | 3 +- .../petal_block_deconstruct_5.json | 3 +- .../petal_block_deconstruct_6.json | 3 +- .../petal_block_deconstruct_7.json | 3 +- .../petal_block_deconstruct_8.json | 3 +- .../petal_block_deconstruct_9.json | 3 +- .../assets/botania/recipes/cosmetic_0.json | 3 +- .../assets/botania/recipes/cosmetic_1.json | 3 +- .../assets/botania/recipes/cosmetic_10.json | 3 +- .../assets/botania/recipes/cosmetic_11.json | 3 +- .../assets/botania/recipes/cosmetic_12.json | 3 +- .../assets/botania/recipes/cosmetic_13.json | 3 +- .../assets/botania/recipes/cosmetic_14.json | 3 +- .../assets/botania/recipes/cosmetic_15.json | 3 +- .../assets/botania/recipes/cosmetic_16.json | 3 +- .../assets/botania/recipes/cosmetic_17.json | 3 +- .../assets/botania/recipes/cosmetic_18.json | 3 +- .../assets/botania/recipes/cosmetic_19.json | 3 +- .../assets/botania/recipes/cosmetic_2.json | 3 +- .../assets/botania/recipes/cosmetic_20.json | 3 +- .../assets/botania/recipes/cosmetic_21.json | 3 +- .../assets/botania/recipes/cosmetic_22.json | 3 +- .../assets/botania/recipes/cosmetic_23.json | 3 +- .../assets/botania/recipes/cosmetic_24.json | 3 +- .../assets/botania/recipes/cosmetic_25.json | 3 +- .../assets/botania/recipes/cosmetic_26.json | 3 +- .../assets/botania/recipes/cosmetic_27.json | 3 +- .../assets/botania/recipes/cosmetic_28.json | 3 +- .../assets/botania/recipes/cosmetic_29.json | 3 +- .../assets/botania/recipes/cosmetic_3.json | 3 +- .../assets/botania/recipes/cosmetic_30.json | 3 +- .../assets/botania/recipes/cosmetic_31.json | 3 +- .../assets/botania/recipes/cosmetic_4.json | 3 +- .../assets/botania/recipes/cosmetic_5.json | 3 +- .../assets/botania/recipes/cosmetic_6.json | 3 +- .../assets/botania/recipes/cosmetic_7.json | 3 +- .../assets/botania/recipes/cosmetic_8.json | 3 +- .../assets/botania/recipes/cosmetic_9.json | 3 +- .../recipes/{dye_15.json => dye_black.json} | 3 +- .../recipes/{dye_11.json => dye_blue.json} | 3 +- .../recipes/{dye_12.json => dye_brown.json} | 3 +- .../recipes/{dye_9.json => dye_cyan.json} | 3 +- .../recipes/{dye_7.json => dye_gray.json} | 3 +- .../recipes/{dye_13.json => dye_green.json} | 3 +- .../{dye_3.json => dye_light_blue.json} | 3 +- .../recipes/{dye_5.json => dye_lime.json} | 3 +- .../recipes/{dye_2.json => dye_magenta.json} | 3 +- ..._2_double.json => dye_magenta_double.json} | 3 +- .../recipes/{dye_1.json => dye_orange.json} | 3 +- .../recipes/{dye_6.json => dye_pink.json} | 3 +- ...dye_6_double.json => dye_pink_double.json} | 3 +- .../recipes/{dye_10.json => dye_purple.json} | 3 +- .../recipes/{dye_14.json => dye_red.json} | 3 +- ...dye_14_double.json => dye_red_double.json} | 3 +- .../recipes/{dye_8.json => dye_silver.json} | 3 +- .../recipes/{dye_0.json => dye_white.json} | 3 +- .../recipes/{dye_4.json => dye_yellow.json} | 3 +- ...e_4_double.json => dye_yellow_double.json} | 3 +- .../botania/recipes/fertilizer_powder.json | 12 ++-- .../assets/botania/recipes/flowerbag.json | 3 +- .../garden_of_glass/fertilizer_powder.json | 12 ++-- .../assets/botania/recipes/mushroom_0.json | 3 +- .../assets/botania/recipes/mushroom_1.json | 3 +- .../assets/botania/recipes/mushroom_10.json | 3 +- .../assets/botania/recipes/mushroom_11.json | 3 +- .../assets/botania/recipes/mushroom_12.json | 3 +- .../assets/botania/recipes/mushroom_13.json | 3 +- .../assets/botania/recipes/mushroom_14.json | 3 +- .../assets/botania/recipes/mushroom_15.json | 3 +- .../assets/botania/recipes/mushroom_2.json | 3 +- .../assets/botania/recipes/mushroom_3.json | 3 +- .../assets/botania/recipes/mushroom_4.json | 3 +- .../assets/botania/recipes/mushroom_5.json | 3 +- .../assets/botania/recipes/mushroom_6.json | 3 +- .../assets/botania/recipes/mushroom_7.json | 3 +- .../assets/botania/recipes/mushroom_8.json | 3 +- .../assets/botania/recipes/mushroom_9.json | 3 +- .../{petal_15.json => petal_black.json} | 3 +- ...15_double.json => petal_black_double.json} | 3 +- .../{petal_11.json => petal_blue.json} | 3 +- ..._11_double.json => petal_blue_double.json} | 3 +- .../{petal_12.json => petal_brown.json} | 3 +- ...12_double.json => petal_brown_double.json} | 3 +- .../recipes/{petal_9.json => petal_cyan.json} | 3 +- ...l_9_double.json => petal_cyan_double.json} | 3 +- .../recipes/{petal_7.json => petal_gray.json} | 3 +- ...l_7_double.json => petal_gray_double.json} | 3 +- .../{petal_13.json => petal_green.json} | 3 +- ...13_double.json => petal_green_double.json} | 3 +- .../{petal_3.json => petal_light_blue.json} | 3 +- ...uble.json => petal_light_blue_double.json} | 3 +- .../recipes/{petal_5.json => petal_lime.json} | 3 +- ...l_5_double.json => petal_lime_double.json} | 3 +- .../{petal_2.json => petal_magenta.json} | 3 +- ..._double.json => petal_magenta_double.json} | 3 +- .../{petal_1.json => petal_orange.json} | 3 +- ...1_double.json => petal_orange_double.json} | 3 +- .../recipes/{petal_6.json => petal_pink.json} | 3 +- ...l_6_double.json => petal_pink_double.json} | 3 +- .../{petal_10.json => petal_purple.json} | 3 +- ...0_double.json => petal_purple_double.json} | 3 +- .../recipes/{petal_14.json => petal_red.json} | 3 +- ...l_14_double.json => petal_red_double.json} | 3 +- .../{petal_8.json => petal_silver.json} | 3 +- ...8_double.json => petal_silver_double.json} | 3 +- .../{petal_0.json => petal_white.json} | 3 +- ..._0_double.json => petal_white_double.json} | 3 +- .../{petal_4.json => petal_yellow.json} | 3 +- ...4_double.json => petal_yellow_double.json} | 3 +- 143 files changed, 615 insertions(+), 670 deletions(-) rename src/main/resources/assets/botania/recipes/{dye_15.json => dye_black.json} (81%) rename src/main/resources/assets/botania/recipes/{dye_11.json => dye_blue.json} (81%) rename src/main/resources/assets/botania/recipes/{dye_12.json => dye_brown.json} (81%) rename src/main/resources/assets/botania/recipes/{dye_9.json => dye_cyan.json} (82%) rename src/main/resources/assets/botania/recipes/{dye_7.json => dye_gray.json} (82%) rename src/main/resources/assets/botania/recipes/{dye_13.json => dye_green.json} (81%) rename src/main/resources/assets/botania/recipes/{dye_3.json => dye_light_blue.json} (87%) rename src/main/resources/assets/botania/recipes/{dye_5.json => dye_lime.json} (82%) rename src/main/resources/assets/botania/recipes/{dye_2.json => dye_magenta.json} (82%) rename src/main/resources/assets/botania/recipes/{dye_2_double.json => dye_magenta_double.json} (85%) rename src/main/resources/assets/botania/recipes/{dye_1.json => dye_orange.json} (87%) rename src/main/resources/assets/botania/recipes/{dye_6.json => dye_pink.json} (87%) rename src/main/resources/assets/botania/recipes/{dye_6_double.json => dye_pink_double.json} (85%) rename src/main/resources/assets/botania/recipes/{dye_10.json => dye_purple.json} (81%) rename src/main/resources/assets/botania/recipes/{dye_14.json => dye_red.json} (89%) rename src/main/resources/assets/botania/recipes/{dye_14_double.json => dye_red_double.json} (84%) rename src/main/resources/assets/botania/recipes/{dye_8.json => dye_silver.json} (91%) rename src/main/resources/assets/botania/recipes/{dye_0.json => dye_white.json} (82%) rename src/main/resources/assets/botania/recipes/{dye_4.json => dye_yellow.json} (87%) rename src/main/resources/assets/botania/recipes/{dye_4_double.json => dye_yellow_double.json} (85%) rename src/main/resources/assets/botania/recipes/{petal_15.json => petal_black.json} (78%) rename src/main/resources/assets/botania/recipes/{petal_15_double.json => petal_black_double.json} (80%) rename src/main/resources/assets/botania/recipes/{petal_11.json => petal_blue.json} (78%) rename src/main/resources/assets/botania/recipes/{petal_11_double.json => petal_blue_double.json} (80%) rename src/main/resources/assets/botania/recipes/{petal_12.json => petal_brown.json} (78%) rename src/main/resources/assets/botania/recipes/{petal_12_double.json => petal_brown_double.json} (80%) rename src/main/resources/assets/botania/recipes/{petal_9.json => petal_cyan.json} (79%) rename src/main/resources/assets/botania/recipes/{petal_9_double.json => petal_cyan_double.json} (80%) rename src/main/resources/assets/botania/recipes/{petal_7.json => petal_gray.json} (79%) rename src/main/resources/assets/botania/recipes/{petal_7_double.json => petal_gray_double.json} (80%) rename src/main/resources/assets/botania/recipes/{petal_13.json => petal_green.json} (78%) rename src/main/resources/assets/botania/recipes/{petal_13_double.json => petal_green_double.json} (80%) rename src/main/resources/assets/botania/recipes/{petal_3.json => petal_light_blue.json} (79%) rename src/main/resources/assets/botania/recipes/{petal_3_double.json => petal_light_blue_double.json} (80%) rename src/main/resources/assets/botania/recipes/{petal_5.json => petal_lime.json} (79%) rename src/main/resources/assets/botania/recipes/{petal_5_double.json => petal_lime_double.json} (80%) rename src/main/resources/assets/botania/recipes/{petal_2.json => petal_magenta.json} (79%) rename src/main/resources/assets/botania/recipes/{petal_2_double.json => petal_magenta_double.json} (80%) rename src/main/resources/assets/botania/recipes/{petal_1.json => petal_orange.json} (79%) rename src/main/resources/assets/botania/recipes/{petal_1_double.json => petal_orange_double.json} (80%) rename src/main/resources/assets/botania/recipes/{petal_6.json => petal_pink.json} (79%) rename src/main/resources/assets/botania/recipes/{petal_6_double.json => petal_pink_double.json} (80%) rename src/main/resources/assets/botania/recipes/{petal_10.json => petal_purple.json} (78%) rename src/main/resources/assets/botania/recipes/{petal_10_double.json => petal_purple_double.json} (80%) rename src/main/resources/assets/botania/recipes/{petal_14.json => petal_red.json} (78%) rename src/main/resources/assets/botania/recipes/{petal_14_double.json => petal_red_double.json} (79%) rename src/main/resources/assets/botania/recipes/{petal_8.json => petal_silver.json} (79%) rename src/main/resources/assets/botania/recipes/{petal_8_double.json => petal_silver_double.json} (80%) rename src/main/resources/assets/botania/recipes/{petal_0.json => petal_white.json} (79%) rename src/main/resources/assets/botania/recipes/{petal_0_double.json => petal_white_double.json} (80%) rename src/main/resources/assets/botania/recipes/{petal_4.json => petal_yellow.json} (79%) rename src/main/resources/assets/botania/recipes/{petal_4_double.json => petal_yellow_double.json} (80%) diff --git a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java index 6fbc8c150..ba23b841a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -27,6 +27,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileCamo; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.entity.EntityManaBurst; +import vazkii.botania.common.item.Item16Colors; import vazkii.botania.common.item.ItemManaGun; import vazkii.botania.common.item.ItemManaMirror; import vazkii.botania.common.item.ItemManaTablet; @@ -109,7 +110,12 @@ public final class ColorHandler { : -1, ModItems.twigWand); - items.registerItemColorHandler((s, t) -> EnumDyeColor.byMetadata(s.getItemDamage()).getColorValue(), ModItems.dye, ModItems.petal); + IItemColor handler = (s, t) -> ((Item16Colors) s.getItem()).color.colorValue; + Item[] dyes = ModItems.dyes.values().toArray(new Item[0]); + Item[] petals = ModItems.petals.values().toArray(new Item[0]); + items.registerItemColorHandler(handler, dyes); + items.registerItemColorHandler(handler, petals); + items.registerItemColorHandler((s, t) -> Minecraft.getMinecraft().getBlockColors().colorMultiplier(((ItemBlock)s.getItem()).getBlock().getStateFromMeta(s.getMetadata()), null, null, t), ModBlocks.petalBlock, ModBlocks.pool, ModBlocks.spreader); @@ -159,7 +165,7 @@ public final class ColorHandler { items.registerItemColorHandler((s, t) -> t == 1 && ItemTerraPick.isEnabled(s) ? Color.HSBtoRGB(0.375F, (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 200D) * 0.5 + 1F), 1F) : -1, ModItems.terraPick); // todo 1.13 use tags instead of looping registry - IItemColor handler = (s, t) -> t == 0 ? ((ItemLens) s.getItem()).getLensColor(s) : -1; + handler = (s, t) -> t == 0 ? ((ItemLens) s.getItem()).getLensColor(s) : -1; for (Item i : Item.REGISTRY) { if(i instanceof ItemLens && i.getRegistryName().getResourceDomain().equals(LibMisc.MOD_ID)) { items.registerItemColorHandler(handler, i); diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index b3c457735..d391439e1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -56,6 +56,7 @@ import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import vazkii.botania.common.item.material.ItemDye; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; @@ -312,8 +313,8 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { ItemStack stack = player.getHeldItem(hand); - if(!stack.isEmpty() && stack.getItem() == ModItems.dye) { - EnumDyeColor newColor = EnumDyeColor.byMetadata(stack.getItemDamage()); + if(!stack.isEmpty() && stack.getItem() instanceof ItemDye) { + EnumDyeColor newColor = ((ItemDye) stack.getItem()).color; EnumDyeColor oldColor = state.getValue(BotaniaStateProps.COLOR); if(newColor != oldColor) world.setBlockState(pos, state.withProperty(BotaniaStateProps.COLOR, newColor), 1 | 2); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 2dd6e42fe..5ea46877e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -79,7 +79,12 @@ public class BlockBuriedPetals extends BlockModFlower { @Nonnull @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return ModItems.petal; + return ModItems.petals.get(state.getValue(BotaniaStateProps.COLOR)); + } + + @Override + public int damageDropped(IBlockState state) { + return 0; } @Nonnull diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 4e3360596..7ca5fec27 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -55,9 +55,9 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.flower); addBlock(ModBlocks.specialFlower); - addItem(ModItems.petal); + ModItems.petals.values().forEach(this::addItem); addItem(ModItems.pestleAndMortar); - addItem(ModItems.dye); + ModItems.dyes.values().forEach(this::addItem); addItem(ModItems.fertilizer); addItem(ModItems.flowerBag); addItem(ModItems.blackLotus); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 99ad36f70..21b7b69ef 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -42,6 +42,7 @@ import vazkii.botania.common.crafting.recipe.SpecialFloatingFlowerRecipe; import vazkii.botania.common.crafting.recipe.SpellClothRecipe; import vazkii.botania.common.crafting.recipe.TerraPickTippingRecipe; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibOreDict; @@ -409,9 +410,9 @@ public final class ModCraftingRecipes { public static void init() { // Can't do this in RegistryEvent.Register event handler since it seems JSON recipes aren't loaded yet - recipesPetals = allOfGroup(ModItems.petal.getRegistryName()); + recipesPetals = allOfGroup(new ResourceLocation(LibMisc.MOD_ID, LibItemNames.PETAL)); recipePestleAndMortar = ModItems.pestleAndMortar.getRegistryName(); - recipesDyes = allOfGroup(ModItems.dye.getRegistryName()); + recipesDyes = allOfGroup(new ResourceLocation(LibMisc.MOD_ID, LibItemNames.DYE)); recipeFertilizerPowder = gogPath("fertilizer_powder"); recipeFerilizerDye = path("fertilizer_dye"); recipesPetalsDouble = allOfGroup("petal_double"); diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index aff450740..7a8ca52c5 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -59,8 +59,8 @@ public final class ModManaInfusionRecipes { manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), new ItemStack(Items.REDSTONE), 500)); manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), new ItemStack(Items.GLOWSTONE_DUST), 500)); manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), new ItemStack(Items.SUGAR), 500)); - for(int i = 0; i < 16; i++) - manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), new ItemStack(ModItems.dye, 1, i), 400)); + for(Item dye : ModItems.dyes.values()) + manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), new ItemStack(dye), 400)); pistonRelayRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.pistonRelay), new ItemStack(Blocks.PISTON), 15000); manaCookieRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaCookie), new ItemStack(Items.COOKIE), 20000); diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 0de47fadd..f50158d6a 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -30,6 +30,7 @@ import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.material.ItemDye; import javax.annotation.Nonnull; import java.util.ArrayList; @@ -261,7 +262,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { ItemStack stack = player.getHeldItem(hand); if(!isDead && !stack.isEmpty()) { if(player.world.isRemote) { - boolean valid = stack.getItem() == ModItems.twigWand || stack.getItem() == ModItems.dye || stack.getItem() == ModItems.phantomInk; + boolean valid = stack.getItem() == ModItems.twigWand || stack.getItem() instanceof ItemDye || stack.getItem() == ModItems.phantomInk; if(valid) player.swingArm(hand); return valid; @@ -276,10 +277,10 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { displayRelatives(player, new ArrayList<>(), master); } return true; - } else if(stack.getItem() == ModItems.dye) { - int color = stack.getItemDamage(); - if(color != getNetwork().getMetadata()) { - setNetwork(EnumDyeColor.byMetadata(color)); + } else if(stack.getItem() instanceof ItemDye) { + EnumDyeColor color = ((ItemDye) stack.getItem()).color; + if(color != getNetwork()) { + setNetwork(color); if(isMaster()) restartNetwork(); diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index 2a947a7dc..8d9af62f1 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -1,5 +1,6 @@ package vazkii.botania.common.fixers; +import net.minecraft.item.EnumDyeColor; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.datafix.IFixableData; import vazkii.botania.common.lib.LibItemNames; @@ -48,6 +49,14 @@ public class FlattenItems implements IFixableData { } }); LOOKUP.put("botania:lens", i -> LibMisc.MOD_ID + ":" + LibItemNames.LENS_NAMES[i % LibItemNames.LENS_NAMES.length]); + LOOKUP.put("botania:dye", i -> { + EnumDyeColor color = EnumDyeColor.byMetadata(i); + return LibMisc.MOD_ID + ":" + LibItemNames.DYE + "_" + color.getName(); + }); + LOOKUP.put("botania:petal", i -> { + EnumDyeColor color = EnumDyeColor.byMetadata(i); + return LibMisc.MOD_ID + ":" + LibItemNames.PETAL + "_" + color.getName(); + }); } @Override diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index 482ac3d6d..cd9ec5e16 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -10,45 +10,14 @@ */ package vazkii.botania.common.item; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.client.core.handler.ModelHandler; - -import javax.annotation.Nonnull; public class Item16Colors extends ItemMod { + public final EnumDyeColor color; - public Item16Colors(String name) { - super(name); - setHasSubtypes(true); - } - - @Override - public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList stacks) { - if(isInCreativeTab(tab)) { - for(int i = 0; i < 16; i++) - stacks.add(new ItemStack(this, 1, i)); - } - } - - @Nonnull - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerItemAllMeta(this, EnumDyeColor.values().length); - } - - String getUnlocalizedNameLazy(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack); + public Item16Colors(String name, EnumDyeColor color) { + super(name + "_" + color.getName()); + this.color = color; } } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index c23777fec..682379c30 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item; import net.minecraft.init.Items; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; @@ -96,11 +97,21 @@ import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibOreDict; +import java.util.EnumMap; +import java.util.Map; + @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class ModItems { public static final Item lexicon = new ItemLexicon(); - public static final Item petal = new ItemPetal(); - public static final Item dye = new ItemDye(); + public static final Map petals = new EnumMap<>(EnumDyeColor.class); + public static final Map dyes = new EnumMap<>(EnumDyeColor.class); + static { + for(EnumDyeColor color : EnumDyeColor.values()) { + petals.put(color, new ItemPetal(color)); + dyes.put(color, new ItemDye(color)); + } + } + public static final Item pestleAndMortar = new ItemPestleAndMortar(); public static final Item twigWand = new ItemTwigWand(); @@ -314,8 +325,8 @@ public final class ModItems { IForgeRegistry r = evt.getRegistry(); r.register(lexicon); - r.register(petal); - r.register(dye); + petals.values().forEach(r::register); + dyes.values().forEach(r::register); r.register(pestleAndMortar); r.register(twigWand); r.register(manaSteel); @@ -526,12 +537,16 @@ public final class ModItems { private static void registerOreDictionary() { OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); + for(EnumDyeColor color : EnumDyeColor.values()) { + OreDictionary.registerOre(LibOreDict.PETAL[color.getMetadata()], new ItemStack(petals.get(color))); + OreDictionary.registerOre(LibOreDict.DYE[color.getMetadata()], new ItemStack(dyes.get(color))); + OreDictionary.registerOre(LibOreDict.DYE_WILDCARD, new ItemStack(dyes.get(color))); + } + for(int i = 0; i < 16; i++) { - OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal, 1, i)); - OreDictionary.registerOre(LibOreDict.DYE[i], new ItemStack(dye, 1, i)); OreDictionary.registerOre(LibOreDict.RUNE[i], new ItemStack(rune, 1, i)); } - OreDictionary.registerOre(LibOreDict.DYE_WILDCARD, new ItemStack(dye, 1, OreDictionary.WILDCARD_VALUE)); + OreDictionary.registerOre(LibOreDict.QUARTZ[0], new ItemStack(darkQuartz)); OreDictionary.registerOre(LibOreDict.QUARTZ[1], new ItemStack(manaQuartz)); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemDye.java b/src/main/java/vazkii/botania/common/item/material/ItemDye.java index 328026fce..7f4c1faac 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item.material; import net.minecraft.block.Block; import net.minecraft.block.BlockCarpet; import net.minecraft.block.BlockColored; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; @@ -25,16 +26,20 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.common.item.Item16Colors; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; public class ItemDye extends Item16Colors { - public ItemDye() { - super(LibItemNames.DYE); + public ItemDye(EnumDyeColor color) { + super(LibItemNames.DYE, color); } @Nonnull @@ -42,7 +47,7 @@ public class ItemDye extends Item16Colors { public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { ItemStack stack = player.getHeldItem(hand); Block block = world.getBlockState(pos).getBlock(); - EnumDyeColor color = EnumDyeColor.byMetadata(stack.getItemDamage()); + if(block == Blocks.WOOL && color != world.getBlockState(pos).getValue(BlockColored.COLOR) || block == Blocks.CARPET && color != world.getBlockState(pos).getValue(BlockCarpet.COLOR)) { world.setBlockState(pos, world.getBlockState(pos).withProperty(block == Blocks.WOOL ? BlockColored.COLOR : BlockCarpet.COLOR, color), 1 | 2); @@ -67,10 +72,9 @@ public class ItemDye extends Item16Colors { public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase target, EnumHand hand) { if(target instanceof EntitySheep) { EntitySheep entitysheep = (EntitySheep)target; - EnumDyeColor i = EnumDyeColor.byMetadata(stack.getItemDamage()); - if(!entitysheep.getSheared() && entitysheep.getFleeceColor() != i) { - entitysheep.setFleeceColor(i); + if(!entitysheep.getSheared() && entitysheep.getFleeceColor() != color) { + entitysheep.setFleeceColor(color); stack.shrink(1); } @@ -79,4 +83,10 @@ public class ItemDye extends Item16Colors { return false; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(LibMisc.MOD_ID + ":" + LibItemNames.DYE, "inventory")); + } + } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java index 2dd484ed4..1ed78faa9 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item.material; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; @@ -23,18 +24,22 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IFlowerComponent; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.Item16Colors; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; public class ItemPetal extends Item16Colors implements IFlowerComponent { - public ItemPetal() { - super(LibItemNames.PETAL); + public ItemPetal(EnumDyeColor color) { + super(LibItemNames.PETAL, color); } @Nonnull @@ -86,7 +91,7 @@ public class ItemPetal extends Item16Colors implements IFlowerComponent { @Override public int getMetadata(int stackMeta) { - return MathHelper.clamp(stackMeta, 0, 15); + return color.getMetadata(); } @Override @@ -96,6 +101,12 @@ public class ItemPetal extends Item16Colors implements IFlowerComponent { @Override public int getParticleColor(ItemStack stack) { - return EnumDyeColor.byMetadata(stack.getItemDamage()).colorValue; + return color.colorValue; + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(LibMisc.MOD_ID + ":" + LibItemNames.PETAL, "inventory")); } } diff --git a/src/main/resources/assets/botania/lang/de_de.lang b/src/main/resources/assets/botania/lang/de_de.lang index 1c5001b94..36cdcce88 100644 --- a/src/main/resources/assets/botania/lang/de_de.lang +++ b/src/main/resources/assets/botania/lang/de_de.lang @@ -253,38 +253,38 @@ tile.botania:flower.loonium.reference=Ich bin reich! # ITEM NAMES item.botania:lexicon.name=Lexica Botania -item.botania:petal0.name=Mystisches Weißes Blütenblatt -item.botania:petal1.name=Mystisches Oranges Blütenblatt -item.botania:petal2.name=Mystisches Magentafarbenes Blütenblatt -item.botania:petal3.name=Mystisches Hellblaues Blütenblatt -item.botania:petal4.name=Mystisches Gelbes Blütenblatt -item.botania:petal5.name=Mystisches Hellgrünes Blütenblatt -item.botania:petal6.name=Mystisches Pinkes Blütenblatt -item.botania:petal7.name=Mystisches Graues Blütenblatt -item.botania:petal8.name=Mystisches Hellgraues Blütenblatt -item.botania:petal9.name=Mystisches Türkises Blütenblatt -item.botania:petal10.name=Mystisches Violettes Blütenblatt -item.botania:petal11.name=Mystisches Blaues Blütenblatt -item.botania:petal12.name=Mystisches Braunes Blütenblatt -item.botania:petal13.name=Mystisches Grünes Blütenblatt -item.botania:petal14.name=Mystisches Red Blütenblatt -item.botania:petal15.name=Mystisches Black Blütenblatt -item.botania:dye0.name=Weißes Blumenpulver -item.botania:dye1.name=Oranges Blumenpulver -item.botania:dye2.name=Magentafarbenes Blumenpulver -item.botania:dye3.name=Hellblaues Blumenpulver -item.botania:dye4.name=Gelbes Blumenpulver -item.botania:dye5.name=Hellgrünes Blumenpulver -item.botania:dye6.name=Pinkes Blumenpulver -item.botania:dye7.name=Graues Blumenpulver -item.botania:dye8.name=Hellgraues Blumenpulver -item.botania:dye9.name=Türkises Blumenpulver -item.botania:dye10.name=Violettes Blumenpulver -item.botania:dye11.name=Blaues Blumenpulver -item.botania:dye12.name=Braunes Blumenpulver -item.botania:dye13.name=Grünes Blumenpulver -item.botania:dye14.name=Rotes Blumenpulver -item.botania:dye15.name=Schwarzes Blumenpulver +item.botania:petal_white.name=Mystisches Weißes Blütenblatt +item.botania:petal_orange.name=Mystisches Oranges Blütenblatt +item.botania:petal_magenta.name=Mystisches Magentafarbenes Blütenblatt +item.botania:petal_light_blue.name=Mystisches Hellblaues Blütenblatt +item.botania:petal_yellow.name=Mystisches Gelbes Blütenblatt +item.botania:petal_lime.name=Mystisches Hellgrünes Blütenblatt +item.botania:petal_pink.name=Mystisches Pinkes Blütenblatt +item.botania:petal_gray.name=Mystisches Graues Blütenblatt +item.botania:petal_silver.name=Mystisches Hellgraues Blütenblatt +item.botania:petal_cyan.name=Mystisches Türkises Blütenblatt +item.botania:petal_purple.name=Mystisches Violettes Blütenblatt +item.botania:petal_blue.name=Mystisches Blaues Blütenblatt +item.botania:petal_brown.name=Mystisches Braunes Blütenblatt +item.botania:petal_green.name=Mystisches Grünes Blütenblatt +item.botania:petal_red.name=Mystisches Red Blütenblatt +item.botania:petal_black.name=Mystisches Black Blütenblatt +item.botania:dye_white.name=Weißes Blumenpulver +item.botania:dye_orange.name=Oranges Blumenpulver +item.botania:dye_magenta.name=Magentafarbenes Blumenpulver +item.botania:dye_light_blue.name=Hellblaues Blumenpulver +item.botania:dye_yellow.name=Gelbes Blumenpulver +item.botania:dye_lime.name=Hellgrünes Blumenpulver +item.botania:dye_pink.name=Pinkes Blumenpulver +item.botania:dye_gray.name=Graues Blumenpulver +item.botania:dye_silver.name=Hellgraues Blumenpulver +item.botania:dye_cyan.name=Türkises Blumenpulver +item.botania:dye_purple.name=Violettes Blumenpulver +item.botania:dye_blue.name=Blaues Blumenpulver +item.botania:dye_brown.name=Braunes Blumenpulver +item.botania:dye_green.name=Grünes Blumenpulver +item.botania:dye_red.name=Rotes Blumenpulver +item.botania:dye_black.name=Schwarzes Blumenpulver item.botania:pestleAndMortar.name=Stößel und Mörser item.botania:twigWand.name=Stab des Waldes item.botania:manasteel_ingot.name=Manastahlbarren diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index 6cbaf8c20..2a45ffae4 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -1263,38 +1263,38 @@ tile.botania:flower.bergamute.reference=My lips are sealed item.botania:lexicon.name=Lexica Botania item.botania:lexicon.bevo=Lexica Botana item.botania:lexicon.saice=Lexica Botonia -item.botania:petal0.name=Mystical White Petal -item.botania:petal1.name=Mystical Orange Petal -item.botania:petal2.name=Mystical Magenta Petal -item.botania:petal3.name=Mystical Light Blue Petal -item.botania:petal4.name=Mystical Yellow Petal -item.botania:petal5.name=Mystical Lime Petal -item.botania:petal6.name=Mystical Pink Petal -item.botania:petal7.name=Mystical Gray Petal -item.botania:petal8.name=Mystical Light Gray Petal -item.botania:petal9.name=Mystical Cyan Petal -item.botania:petal10.name=Mystical Purple Petal -item.botania:petal11.name=Mystical Blue Petal -item.botania:petal12.name=Mystical Brown Petal -item.botania:petal13.name=Mystical Green Petal -item.botania:petal14.name=Mystical Red Petal -item.botania:petal15.name=Mystical Black Petal -item.botania:dye0.name=Floral White Powder -item.botania:dye1.name=Floral Orange Powder -item.botania:dye2.name=Floral Magenta Powder -item.botania:dye3.name=Floral Light Blue Powder -item.botania:dye4.name=Floral Yellow Powder -item.botania:dye5.name=Floral Lime Powder -item.botania:dye6.name=Floral Pink Powder -item.botania:dye7.name=Floral Gray Powder -item.botania:dye8.name=Floral Light Gray Powder -item.botania:dye9.name=Floral Cyan Powder -item.botania:dye10.name=Floral Purple Powder -item.botania:dye11.name=Floral Blue Powder -item.botania:dye12.name=Floral Brown Powder -item.botania:dye13.name=Floral Green Powder -item.botania:dye14.name=Floral Red Powder -item.botania:dye15.name=Floral Black Powder +item.botania:petal_white.name=Mystical White Petal +item.botania:petal_orange.name=Mystical Orange Petal +item.botania:petal_magenta.name=Mystical Magenta Petal +item.botania:petal_light_blue.name=Mystical Light Blue Petal +item.botania:petal_yellow.name=Mystical Yellow Petal +item.botania:petal_lime.name=Mystical Lime Petal +item.botania:petal_pink.name=Mystical Pink Petal +item.botania:petal_gray.name=Mystical Gray Petal +item.botania:petal_silver.name=Mystical Light Gray Petal +item.botania:petal_cyan.name=Mystical Cyan Petal +item.botania:petal_purple.name=Mystical Purple Petal +item.botania:petal_blue.name=Mystical Blue Petal +item.botania:petal_brown.name=Mystical Brown Petal +item.botania:petal_green.name=Mystical Green Petal +item.botania:petal_red.name=Mystical Red Petal +item.botania:petal_black.name=Mystical Black Petal +item.botania:dye_white.name=Floral White Powder +item.botania:dye_orange.name=Floral Orange Powder +item.botania:dye_magenta.name=Floral Magenta Powder +item.botania:dye_light_blue.name=Floral Light Blue Powder +item.botania:dye_yellow.name=Floral Yellow Powder +item.botania:dye_lime.name=Floral Lime Powder +item.botania:dye_pink.name=Floral Pink Powder +item.botania:dye_gray.name=Floral Gray Powder +item.botania:dye_silver.name=Floral Light Gray Powder +item.botania:dye_cyan.name=Floral Cyan Powder +item.botania:dye_purple.name=Floral Purple Powder +item.botania:dye_blue.name=Floral Blue Powder +item.botania:dye_brown.name=Floral Brown Powder +item.botania:dye_green.name=Floral Green Powder +item.botania:dye_red.name=Floral Red Powder +item.botania:dye_black.name=Floral Black Powder item.botania:pestleAndMortar.name=Pestle and Mortar item.botania:twigWand.name=Wand of the Forest item.botania:manasteel_ingot.name=Manasteel Ingot diff --git a/src/main/resources/assets/botania/lang/es_es.lang b/src/main/resources/assets/botania/lang/es_es.lang index c776f3f4c..052a50f3a 100644 --- a/src/main/resources/assets/botania/lang/es_es.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -1023,38 +1023,38 @@ tile.botania:flower.solegnolia.reference=Todos tus imanes nos pertenecen item.botania:lexicon.name=Lexica Botania item.botania:lexicon.bevo=Lexica Botana item.botania:lexicon.saice=Lexica Botonia -item.botania:petal0.name=Pétalo místico blanco -item.botania:petal1.name=Pétalo místico naranja -item.botania:petal2.name=Pétalo místico magenta -item.botania:petal3.name=Pétalo místico azul claro -item.botania:petal4.name=Pétalo místico amarillo -item.botania:petal5.name=Pétalo místico lima -item.botania:petal6.name=Pétalo místico rosa -item.botania:petal7.name=Pétalo místico gris -item.botania:petal8.name=Pétalo místico gris claro -item.botania:petal9.name=Pétalo místico cian -item.botania:petal10.name=Pétalo místico púrpura -item.botania:petal11.name=Pétalo místico azul -item.botania:petal12.name=Pétalo místico marrón -item.botania:petal13.name=Pétalo místico verde -item.botania:petal14.name=Pétalo místico rojo -item.botania:petal15.name=Pétalo místico negro -item.botania:dye0.name=Polvo floral blanco -item.botania:dye1.name=Polvo floral naranja -item.botania:dye2.name=Polvo floral magenta -item.botania:dye3.name=Polvo floral azul claro -item.botania:dye4.name=Polvo floral amarillo -item.botania:dye5.name=Polvo floral lima -item.botania:dye6.name=Polvo floral rosa -item.botania:dye7.name=Polvo floral gris -item.botania:dye8.name=Polvo floral gris claro -item.botania:dye9.name=Polvo floral cian -item.botania:dye10.name=Polvo floral púrpura -item.botania:dye11.name=Polvo floral azul -item.botania:dye12.name=Polvo floral marrón -item.botania:dye13.name=Polvo floral verde -item.botania:dye14.name=Polvo floral rojo -item.botania:dye15.name=Polvo floral negro +item.botania:petal_white.name=Pétalo místico blanco +item.botania:petal_orange.name=Pétalo místico naranja +item.botania:petal_magenta.name=Pétalo místico magenta +item.botania:petal_light_blue.name=Pétalo místico azul claro +item.botania:petal_yellow.name=Pétalo místico amarillo +item.botania:petal_lime.name=Pétalo místico lima +item.botania:petal_pink.name=Pétalo místico rosa +item.botania:petal_gray.name=Pétalo místico gris +item.botania:petal_silver.name=Pétalo místico gris claro +item.botania:petal_cyan.name=Pétalo místico cian +item.botania:petal_purple.name=Pétalo místico púrpura +item.botania:petal_blue.name=Pétalo místico azul +item.botania:petal_brown.name=Pétalo místico marrón +item.botania:petal_green.name=Pétalo místico verde +item.botania:petal_red.name=Pétalo místico rojo +item.botania:petal_black.name=Pétalo místico negro +item.botania:dye_white.name=Polvo floral blanco +item.botania:dye_orange.name=Polvo floral naranja +item.botania:dye_magenta.name=Polvo floral magenta +item.botania:dye_light_blue.name=Polvo floral azul claro +item.botania:dye_yellow.name=Polvo floral amarillo +item.botania:dye_lime.name=Polvo floral lima +item.botania:dye_pink.name=Polvo floral rosa +item.botania:dye_gray.name=Polvo floral gris +item.botania:dye_silver.name=Polvo floral gris claro +item.botania:dye_cyan.name=Polvo floral cian +item.botania:dye_purple.name=Polvo floral púrpura +item.botania:dye_blue.name=Polvo floral azul +item.botania:dye_brown.name=Polvo floral marrón +item.botania:dye_green.name=Polvo floral verde +item.botania:dye_red.name=Polvo floral rojo +item.botania:dye_black.name=Polvo floral negro item.botania:pestleAndMortar.name=Mortero item.botania:twigWand.name=Varita del bosque item.botania:manasteel_ingot.name=Lingote de manacero diff --git a/src/main/resources/assets/botania/lang/fr_fr.lang b/src/main/resources/assets/botania/lang/fr_fr.lang index f2001ac48..9f7c09012 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -885,38 +885,38 @@ tile.botania:flower.spectrolus.reference=Profiter de la haine item.botania:lexicon.name=Lexica Botania item.botania:lexicon.bevo=Lexica Botana item.botania:lexicon.saice=Lexica Botonia -item.botania:petal0.name=Pétale de fleur mystique blanche -item.botania:petal1.name=Pétale de fleur mystique orange -item.botania:petal2.name=Pétale de fleur mystique magenta -item.botania:petal3.name=Pétale de fleur mystique bleue claire -item.botania:petal4.name=Pétale de fleur mystique jaune -item.botania:petal5.name=Pétale de fleur mystique citron -item.botania:petal6.name=Pétale de fleur mystique rose -item.botania:petal7.name=Pétale de fleur mystique grise -item.botania:petal8.name=Pétale de fleur mystique grise claire -item.botania:petal9.name=Pétale de fleur mystique cyan -item.botania:petal10.name=Pétale de fleur mystique violette -item.botania:petal11.name=Pétale de fleur mystique bleue -item.botania:petal12.name=Pétale de fleur mystique marron -item.botania:petal13.name=Pétale de fleur mystique verte -item.botania:petal14.name=Pétale de fleur mystique rouge -item.botania:petal15.name=Pétale de fleur mystique noire -item.botania:dye0.name=Poudre florale bhanche -item.botania:dye1.name=Poudre florale orange -item.botania:dye2.name=Poudre florale magenta -item.botania:dye3.name=Poudre florale bleue -item.botania:dye4.name=Poudre florale jaune -item.botania:dye5.name=Poudre florale citron -item.botania:dye6.name=Poudre florale rose -item.botania:dye7.name=Poudre florale grise -item.botania:dye8.name=Poudre florale grise claire -item.botania:dye9.name=Poudre florale cyan -item.botania:dye10.name=Poudre florale violette -item.botania:dye11.name=Poudre florale bleue -item.botania:dye12.name=Poudre florale marron -item.botania:dye13.name=Poudre florale verte -item.botania:dye14.name=Poudre florale rouge -item.botania:dye15.name=Poudre florale noire +item.botania:petal_white.name=Pétale de fleur mystique blanche +item.botania:petal_orange.name=Pétale de fleur mystique orange +item.botania:petal_magenta.name=Pétale de fleur mystique magenta +item.botania:petal_light_blue.name=Pétale de fleur mystique bleue claire +item.botania:petal_yellow.name=Pétale de fleur mystique jaune +item.botania:petal_lime.name=Pétale de fleur mystique citron +item.botania:petal_pink.name=Pétale de fleur mystique rose +item.botania:petal_gray.name=Pétale de fleur mystique grise +item.botania:petal_silver.name=Pétale de fleur mystique grise claire +item.botania:petal_cyan.name=Pétale de fleur mystique cyan +item.botania:petal_purple.name=Pétale de fleur mystique violette +item.botania:petal_blue.name=Pétale de fleur mystique bleue +item.botania:petal_brown.name=Pétale de fleur mystique marron +item.botania:petal_green.name=Pétale de fleur mystique verte +item.botania:petal_red.name=Pétale de fleur mystique rouge +item.botania:petal_black.name=Pétale de fleur mystique noire +item.botania:dye_white.name=Poudre florale bhanche +item.botania:dye_orange.name=Poudre florale orange +item.botania:dye_magenta.name=Poudre florale magenta +item.botania:dye_light_blue.name=Poudre florale bleue +item.botania:dye_yellow.name=Poudre florale jaune +item.botania:dye_lime.name=Poudre florale citron +item.botania:dye_pink.name=Poudre florale rose +item.botania:dye_gray.name=Poudre florale grise +item.botania:dye_silver.name=Poudre florale grise claire +item.botania:dye_cyan.name=Poudre florale cyan +item.botania:dye_purple.name=Poudre florale violette +item.botania:dye_blue.name=Poudre florale bleue +item.botania:dye_brown.name=Poudre florale marron +item.botania:dye_green.name=Poudre florale verte +item.botania:dye_red.name=Poudre florale rouge +item.botania:dye_black.name=Poudre florale noire item.botania:pestleAndMortar.name=Pilon et mortier item.botania:twigWand.name=Baguette de la forêt item.botania:manasteel_ingot.name=Lingot de manacier diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index 3a8839041..a8af0d70c 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -1048,38 +1048,38 @@ tile.botania:flower.bergamute.reference=閉ざしたままの口唇 item.botania:lexicon.name=ボタニア植物辞典 item.botania:lexicon.bevo=ボタニア植物辞典 item.botania:lexicon.saice=ボタニア植物辞典 -item.botania:petal0.name=白色の神秘的な花びら -item.botania:petal1.name=橙色の神秘的な花びら -item.botania:petal2.name=赤紫色の神秘的な花びら -item.botania:petal3.name=空色の神秘的な花びら -item.botania:petal4.name=黄色の神秘的な花びら -item.botania:petal5.name=黄緑色の神秘的な花びら -item.botania:petal6.name=桃色の神秘的な花びら -item.botania:petal7.name=灰色の神秘的な花びら -item.botania:petal8.name=薄灰色の神秘的な花びら -item.botania:petal9.name=水色の神秘的な花びら -item.botania:petal10.name=紫色の神秘的な花びら -item.botania:petal11.name=青色の神秘的な花びら -item.botania:petal12.name=茶色の神秘的な花びら -item.botania:petal13.name=緑色の神秘的な花びら -item.botania:petal14.name=赤色の神秘的な花びら -item.botania:petal15.name=黒色の神秘的な花びら -item.botania:dye0.name=白色の花の粉末 -item.botania:dye1.name=橙色の花の粉末 -item.botania:dye2.name=赤紫色の花の粉末 -item.botania:dye3.name=空色の花の粉末 -item.botania:dye4.name=黄色の花の粉末 -item.botania:dye5.name=黄緑色の花の粉末 -item.botania:dye6.name=桃色の花の粉末 -item.botania:dye7.name=灰色の花の粉末 -item.botania:dye8.name=薄灰色の花の粉末 -item.botania:dye9.name=水色の花の粉末 -item.botania:dye10.name=紫色の花の粉末 -item.botania:dye11.name=青色の花の粉末 -item.botania:dye12.name=茶色の花の粉末 -item.botania:dye13.name=緑色の花の粉末 -item.botania:dye14.name=赤色の花の粉末 -item.botania:dye15.name=黒色の花の粉末 +item.botania:petal_white.name=白色の神秘的な花びら +item.botania:petal_orange.name=橙色の神秘的な花びら +item.botania:petal_magenta.name=赤紫色の神秘的な花びら +item.botania:petal_light_blue.name=空色の神秘的な花びら +item.botania:petal_yellow.name=黄色の神秘的な花びら +item.botania:petal_lime.name=黄緑色の神秘的な花びら +item.botania:petal_pink.name=桃色の神秘的な花びら +item.botania:petal_gray.name=灰色の神秘的な花びら +item.botania:petal_silver.name=薄灰色の神秘的な花びら +item.botania:petal_cyan.name=水色の神秘的な花びら +item.botania:petal_purple.name=紫色の神秘的な花びら +item.botania:petal_blue.name=青色の神秘的な花びら +item.botania:petal_brown.name=茶色の神秘的な花びら +item.botania:petal_green.name=緑色の神秘的な花びら +item.botania:petal_red.name=赤色の神秘的な花びら +item.botania:petal_black.name=黒色の神秘的な花びら +item.botania:dye_white.name=白色の花の粉末 +item.botania:dye_orange.name=橙色の花の粉末 +item.botania:dye_magenta.name=赤紫色の花の粉末 +item.botania:dye_light_blue.name=空色の花の粉末 +item.botania:dye_yellow.name=黄色の花の粉末 +item.botania:dye_lime.name=黄緑色の花の粉末 +item.botania:dye_pink.name=桃色の花の粉末 +item.botania:dye_gray.name=灰色の花の粉末 +item.botania:dye_silver.name=薄灰色の花の粉末 +item.botania:dye_cyan.name=水色の花の粉末 +item.botania:dye_purple.name=紫色の花の粉末 +item.botania:dye_blue.name=青色の花の粉末 +item.botania:dye_brown.name=茶色の花の粉末 +item.botania:dye_green.name=緑色の花の粉末 +item.botania:dye_red.name=赤色の花の粉末 +item.botania:dye_black.name=黒色の花の粉末 item.botania:pestleAndMortar.name=乳棒とすり鉢 item.botania:twigWand.name=森の杖 item.botania:manasteel_ingot.name=マナスチールインゴット diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index dcc144329..421324fa6 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -984,38 +984,38 @@ tile.botania:flower.solegnolia.reference=자석은 이걸로 만들어진다카 item.botania:lexicon.name=보타니아 사전 item.botania:lexicon.bevo=보타니아 사전 item.botania:lexicon.saice=보타니아 사전 -item.botania:petal0.name=신비로운 하얀색 꽃잎 -item.botania:petal1.name=신비로운 주황색 꽃잎 -item.botania:petal2.name=신비로운 자홍색 꽃잎 -item.botania:petal3.name=신비로운 하늘색 꽃잎 -item.botania:petal4.name=신비로운 노랑색 꽃잎 -item.botania:petal5.name=신비로운 연두색 꽃잎 -item.botania:petal6.name=신비로운 분홍색 꽃잎 -item.botania:petal7.name=신비로운 회색 꽃잎 -item.botania:petal8.name=신비로운 밝은 회색 꽃잎 -item.botania:petal9.name=신비로운 청록색 꽃잎 -item.botania:petal10.name=신비로운 보라색 꽃잎 -item.botania:petal11.name=신비로운 파랑색 꽃잎 -item.botania:petal12.name=신비로운 갈색 꽃잎 -item.botania:petal13.name=신비로운 초록색 꽃잎 -item.botania:petal14.name=신비로운 빨강색 꽃잎 -item.botania:petal15.name=신비로운 검은색 꽃잎 -item.botania:dye0.name=하얀색 꽃가루 -item.botania:dye1.name=주황색 꽃가루 -item.botania:dye2.name=자홍색 꽃가루 -item.botania:dye3.name=하늘색 꽃가루 -item.botania:dye4.name=노랑색 꽃가루 -item.botania:dye5.name=연두색 꽃가루 -item.botania:dye6.name=분홍색 꽃가루 -item.botania:dye7.name=회색 꽃가루 -item.botania:dye8.name=밝은 회색 꽃가루 -item.botania:dye9.name=청록색 꽃가루 -item.botania:dye10.name=보라색 꽃가루 -item.botania:dye11.name=파랑색 꽃가루 -item.botania:dye12.name=갈색 꽃가루 -item.botania:dye13.name=초록색 꽃가루 -item.botania:dye14.name=빨강색 꽃가루 -item.botania:dye15.name=검은색 꽃가루 +item.botania:petal_white.name=신비로운 하얀색 꽃잎 +item.botania:petal_orange.name=신비로운 주황색 꽃잎 +item.botania:petal_magenta.name=신비로운 자홍색 꽃잎 +item.botania:petal_light_blue.name=신비로운 하늘색 꽃잎 +item.botania:petal_yellow.name=신비로운 노랑색 꽃잎 +item.botania:petal_lime.name=신비로운 연두색 꽃잎 +item.botania:petal_pink.name=신비로운 분홍색 꽃잎 +item.botania:petal_gray.name=신비로운 회색 꽃잎 +item.botania:petal_silver.name=신비로운 밝은 회색 꽃잎 +item.botania:petal_cyan.name=신비로운 청록색 꽃잎 +item.botania:petal_purple.name=신비로운 보라색 꽃잎 +item.botania:petal_blue.name=신비로운 파랑색 꽃잎 +item.botania:petal_brown.name=신비로운 갈색 꽃잎 +item.botania:petal_green.name=신비로운 초록색 꽃잎 +item.botania:petal_red.name=신비로운 빨강색 꽃잎 +item.botania:petal_black.name=신비로운 검은색 꽃잎 +item.botania:dye_white.name=하얀색 꽃가루 +item.botania:dye_orange.name=주황색 꽃가루 +item.botania:dye_magenta.name=자홍색 꽃가루 +item.botania:dye_light_blue.name=하늘색 꽃가루 +item.botania:dye_yellow.name=노랑색 꽃가루 +item.botania:dye_lime.name=연두색 꽃가루 +item.botania:dye_pink.name=분홍색 꽃가루 +item.botania:dye_gray.name=회색 꽃가루 +item.botania:dye_silver.name=밝은 회색 꽃가루 +item.botania:dye_cyan.name=청록색 꽃가루 +item.botania:dye_purple.name=보라색 꽃가루 +item.botania:dye_blue.name=파랑색 꽃가루 +item.botania:dye_brown.name=갈색 꽃가루 +item.botania:dye_green.name=초록색 꽃가루 +item.botania:dye_red.name=빨강색 꽃가루 +item.botania:dye_black.name=검은색 꽃가루 item.botania:pestleAndMortar.name=막자사발 item.botania:twigWand.name=숲의 지팡이 item.botania:manasteel_ingot.name=마나합금 주괴 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index cb0966671..02f873e0e 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -1116,38 +1116,38 @@ tile.botania:flower.solegnolia.reference=Anti-magneet item.botania:lexicon.name=Lexica Botania item.botania:lexicon.bevo=Lexica Botana item.botania:lexicon.saice=Lexica Botonia -item.botania:petal0.name=Mystiek Wit Bloemblad -item.botania:petal1.name=Mystiek Oranje Bloemblad -item.botania:petal2.name=Mystiek Magenta Bloemblad -item.botania:petal3.name=Mystiek Lichtblauw Bloemblad -item.botania:petal4.name=Mystiek Geel Bloemblad -item.botania:petal5.name=Mystiek Lichtgroen Bloemblad -item.botania:petal6.name=Mystiek Roze Bloemblad -item.botania:petal7.name=Mystiek Grijs Bloemblad -item.botania:petal8.name=Mystiek Lichtgrijs Bloemblad -item.botania:petal9.name=Mystiek Blauwgroen Bloemblad -item.botania:petal10.name=Mystiek Paars Bloemblad -item.botania:petal11.name=Mystiek Blauw Bloemblad -item.botania:petal12.name=Mystiek Bruin Bloemblad -item.botania:petal13.name=Mystiek Groen Bloemblad -item.botania:petal14.name=Mystiek Rood Bloemblad -item.botania:petal15.name=Mystiek Zwart Bloemblad -item.botania:dye0.name=Wit Bloempoeder -item.botania:dye1.name=Oranje Bloempoeder -item.botania:dye2.name=Magenta Bloempoeder -item.botania:dye3.name=Lichtblauw Bloempoeder -item.botania:dye4.name=Geel Bloempoeder -item.botania:dye5.name=Lichtgroen Bloempoeder -item.botania:dye6.name=Roze Bloempoeder -item.botania:dye7.name=Grijs Bloempoeder -item.botania:dye8.name=Lichtgrijs Bloempoeder -item.botania:dye9.name=Blauwgroen Bloempoeder -item.botania:dye10.name=Paars Bloempoeder -item.botania:dye11.name=Blauw Bloempoeder -item.botania:dye12.name=Bruin Bloempoeder -item.botania:dye13.name=Groen Bloempoeder -item.botania:dye14.name=Rood Bloempoeder -item.botania:dye15.name=Zwart Bloempoeder +item.botania:petal_white.name=Mystiek Wit Bloemblad +item.botania:petal_orange.name=Mystiek Oranje Bloemblad +item.botania:petal_magenta.name=Mystiek Magenta Bloemblad +item.botania:petal_light_blue.name=Mystiek Lichtblauw Bloemblad +item.botania:petal_yellow.name=Mystiek Geel Bloemblad +item.botania:petal_lime.name=Mystiek Lichtgroen Bloemblad +item.botania:petal_pink.name=Mystiek Roze Bloemblad +item.botania:petal_gray.name=Mystiek Grijs Bloemblad +item.botania:petal_silver.name=Mystiek Lichtgrijs Bloemblad +item.botania:petal_cyan.name=Mystiek Blauwgroen Bloemblad +item.botania:petal_purple.name=Mystiek Paars Bloemblad +item.botania:petal_blue.name=Mystiek Blauw Bloemblad +item.botania:petal_brown.name=Mystiek Bruin Bloemblad +item.botania:petal_green.name=Mystiek Groen Bloemblad +item.botania:petal_red.name=Mystiek Rood Bloemblad +item.botania:petal_black.name=Mystiek Zwart Bloemblad +item.botania:dye_white.name=Wit Bloempoeder +item.botania:dye_orange.name=Oranje Bloempoeder +item.botania:dye_magenta.name=Magenta Bloempoeder +item.botania:dye_light_blue.name=Lichtblauw Bloempoeder +item.botania:dye_yellow.name=Geel Bloempoeder +item.botania:dye_lime.name=Lichtgroen Bloempoeder +item.botania:dye_pink.name=Roze Bloempoeder +item.botania:dye_gray.name=Grijs Bloempoeder +item.botania:dye_silver.name=Lichtgrijs Bloempoeder +item.botania:dye_cyan.name=Blauwgroen Bloempoeder +item.botania:dye_purple.name=Paars Bloempoeder +item.botania:dye_blue.name=Blauw Bloempoeder +item.botania:dye_brown.name=Bruin Bloempoeder +item.botania:dye_green.name=Groen Bloempoeder +item.botania:dye_red.name=Rood Bloempoeder +item.botania:dye_black.name=Zwart Bloempoeder item.botania:pestleAndMortar.name=Vijzel en Stamper item.botania:twigWand.name=Staf van het Woud item.botania:manasteel_ingot.name=Staaf Manastaal diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index 2dfa49f2f..f2179c2ff 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -1266,38 +1266,38 @@ tile.botania:flower.bergamute.reference=Minha boca é um túmulo item.botania:lexicon.name=Lexica Botania item.botania:lexicon.bevo=Lexica Botana item.botania:lexicon.saice=Lexica Botonia -item.botania:petal0.name=Pétala Mística Branca -item.botania:petal1.name=Pétala Mística Laranja -item.botania:petal2.name=Pétala Mística Magenta -item.botania:petal3.name=Pétala Mística Azul Claro -item.botania:petal4.name=Pétala Mística Amarela -item.botania:petal5.name=Pétala Mística Lima -item.botania:petal6.name=Pétala Mística Rosa -item.botania:petal7.name=Pétala Mística Cinza -item.botania:petal8.name=Pétala Mística Cinza Claro -item.botania:petal9.name=Pétala Mística Ciano -item.botania:petal10.name=Pétala Mística Roxa -item.botania:petal11.name=Pétala Mística Azul -item.botania:petal12.name=Pétala Mística Marrom -item.botania:petal13.name=Pétala Mística Verde -item.botania:petal14.name=Pétala Mística Vermelha -item.botania:petal15.name=Pétala Mística Preta -item.botania:dye0.name=Pó Floral Branco -item.botania:dye1.name=Pó Floral Laranja -item.botania:dye2.name=Pó Floral Magenta -item.botania:dye3.name=Pó Floral Azul Claro -item.botania:dye4.name=Pó Floral Amarelo -item.botania:dye5.name=Pó Floral Lima -item.botania:dye6.name=Pó Floral Rosa -item.botania:dye7.name=Pó Floral Cinza -item.botania:dye8.name=Pó Floral Cinza Claro -item.botania:dye9.name=Pó Floral Ciano -item.botania:dye10.name=Pó Floral Roxo -item.botania:dye11.name=Pó Floral Azul -item.botania:dye12.name=Pó Floral Marrom -item.botania:dye13.name=Pó Floral Verde -item.botania:dye14.name=Pó Floral Vermelho -item.botania:dye15.name=Pó Floral Preto +item.botania:petal_white.name=Pétala Mística Branca +item.botania:petal_orange.name=Pétala Mística Laranja +item.botania:petal_magenta.name=Pétala Mística Magenta +item.botania:petal_light_blue.name=Pétala Mística Azul Claro +item.botania:petal_yellow.name=Pétala Mística Amarela +item.botania:petal_lime.name=Pétala Mística Lima +item.botania:petal_pink.name=Pétala Mística Rosa +item.botania:petal_gray.name=Pétala Mística Cinza +item.botania:petal_silver.name=Pétala Mística Cinza Claro +item.botania:petal_cyan.name=Pétala Mística Ciano +item.botania:petal_purple.name=Pétala Mística Roxa +item.botania:petal_blue.name=Pétala Mística Azul +item.botania:petal_brown.name=Pétala Mística Marrom +item.botania:petal_green.name=Pétala Mística Verde +item.botania:petal_red.name=Pétala Mística Vermelha +item.botania:petal_black.name=Pétala Mística Preta +item.botania:dye_white.name=Pó Floral Branco +item.botania:dye_orange.name=Pó Floral Laranja +item.botania:dye_magenta.name=Pó Floral Magenta +item.botania:dye_light_blue.name=Pó Floral Azul Claro +item.botania:dye_yellow.name=Pó Floral Amarelo +item.botania:dye_lime.name=Pó Floral Lima +item.botania:dye_pink.name=Pó Floral Rosa +item.botania:dye_gray.name=Pó Floral Cinza +item.botania:dye_silver.name=Pó Floral Cinza Claro +item.botania:dye_cyan.name=Pó Floral Ciano +item.botania:dye_purple.name=Pó Floral Roxo +item.botania:dye_blue.name=Pó Floral Azul +item.botania:dye_brown.name=Pó Floral Marrom +item.botania:dye_green.name=Pó Floral Verde +item.botania:dye_red.name=Pó Floral Vermelho +item.botania:dye_black.name=Pó Floral Preto item.botania:pestleAndMortar.name=Pilão item.botania:twigWand.name=Varinha da Floresta item.botania:manasteel_ingot.name=Barra de Manasteel diff --git a/src/main/resources/assets/botania/lang/ru_ru.lang b/src/main/resources/assets/botania/lang/ru_ru.lang index 57ebdeb68..72240b1fa 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.lang +++ b/src/main/resources/assets/botania/lang/ru_ru.lang @@ -516,38 +516,38 @@ tile.botania:flower.vinculotus.reference=Полный грабёж ExtraUtils item.botania:lexicon.name=Лексика Botania item.botania:lexicon.bevo=Лексика Botana item.botania:lexicon.saice=Лексика Botania -item.botania:petal0.name=Мистический белый лепесток -item.botania:petal1.name=Мистический оранжевый лепесток -item.botania:petal2.name=Мистический сиреневый лепесток -item.botania:petal3.name=Мистический светло-синий лепесток -item.botania:petal4.name=Мистический жёлтый лепесток -item.botania:petal5.name=Мистический лаймовый лепесток -item.botania:petal6.name=Мистический розовый лепесток -item.botania:petal7.name=Мистический серый лепесток -item.botania:petal8.name=Мистический светло-серый лепесток -item.botania:petal9.name=Мистический бирюзовый лепесток -item.botania:petal10.name=Мистический фиолетовый лепесток -item.botania:petal11.name=Мистический синий лепесток -item.botania:petal12.name=Мистический коричневый лепесток -item.botania:petal13.name=Мистический зелёный лепесток -item.botania:petal14.name=Мистический красный лепесток -item.botania:petal15.name=Мистический чёрный лепесток -item.botania:dye0.name=Белая цветковая пыльца -item.botania:dye1.name=Оранжевая цветковая пыльца -item.botania:dye2.name=Сиреневая цветковая пыльца -item.botania:dye3.name=Светло-синяя цветковая пыльца -item.botania:dye4.name=Жёлтая цветковая пыльца -item.botania:dye5.name=Лаймовая цветковая пыльца -item.botania:dye6.name=Розовая цветковая пыльца -item.botania:dye7.name=Серая цветковая пыльца -item.botania:dye8.name=Светло-серая цветковая пыльца -item.botania:dye9.name=Бирюзовая цветковая пыльца -item.botania:dye10.name=Фиолетовая цветковая пыльца -item.botania:dye11.name=Синяя цветковая пыльца -item.botania:dye12.name=Коричневая цветковая пыльца -item.botania:dye13.name=Зелёная цветковая пыльца -item.botania:dye14.name=Красная цветковая пыльца -item.botania:dye15.name=Чёрная цветковая пыльца +item.botania:petal_white.name=Мистический белый лепесток +item.botania:petal_orange.name=Мистический оранжевый лепесток +item.botania:petal_magenta.name=Мистический сиреневый лепесток +item.botania:petal_light_blue.name=Мистический светло-синий лепесток +item.botania:petal_yellow.name=Мистический жёлтый лепесток +item.botania:petal_lime.name=Мистический лаймовый лепесток +item.botania:petal_pink.name=Мистический розовый лепесток +item.botania:petal_gray.name=Мистический серый лепесток +item.botania:petal_silver.name=Мистический светло-серый лепесток +item.botania:petal_cyan.name=Мистический бирюзовый лепесток +item.botania:petal_purple.name=Мистический фиолетовый лепесток +item.botania:petal_blue.name=Мистический синий лепесток +item.botania:petal_brown.name=Мистический коричневый лепесток +item.botania:petal_green.name=Мистический зелёный лепесток +item.botania:petal_red.name=Мистический красный лепесток +item.botania:petal_black.name=Мистический чёрный лепесток +item.botania:dye_white.name=Белая цветковая пыльца +item.botania:dye_orange.name=Оранжевая цветковая пыльца +item.botania:dye_magenta.name=Сиреневая цветковая пыльца +item.botania:dye_light_blue.name=Светло-синяя цветковая пыльца +item.botania:dye_yellow.name=Жёлтая цветковая пыльца +item.botania:dye_lime.name=Лаймовая цветковая пыльца +item.botania:dye_pink.name=Розовая цветковая пыльца +item.botania:dye_gray.name=Серая цветковая пыльца +item.botania:dye_silver.name=Светло-серая цветковая пыльца +item.botania:dye_cyan.name=Бирюзовая цветковая пыльца +item.botania:dye_purple.name=Фиолетовая цветковая пыльца +item.botania:dye_blue.name=Синяя цветковая пыльца +item.botania:dye_brown.name=Коричневая цветковая пыльца +item.botania:dye_green.name=Зелёная цветковая пыльца +item.botania:dye_red.name=Красная цветковая пыльца +item.botania:dye_black.name=Чёрная цветковая пыльца item.botania:pestleAndMortar.name=Пестик и ступка item.botania:twigWand.name=Посох леса item.botania:manasteel_ingot.name=Слиток манастали diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index 15420f04d..23653a35f 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -1263,38 +1263,38 @@ tile.botania:flower.bergamute.reference=啊咧嘴被堵上了 item.botania:lexicon.name=植物魔法辞典 item.botania:lexicon.bevo=植物魔法辞典 item.botania:lexicon.saice=植物魔法辞典 -item.botania:petal0.name=白色神秘花瓣 -item.botania:petal1.name=橙色神秘花瓣 -item.botania:petal2.name=品红色神秘花瓣 -item.botania:petal3.name=淡蓝色神秘花瓣 -item.botania:petal4.name=黄色神秘花瓣 -item.botania:petal5.name=黄绿色神秘花瓣 -item.botania:petal6.name=粉色神秘花瓣 -item.botania:petal7.name=灰色神秘花瓣 -item.botania:petal8.name=淡灰色神秘花瓣 -item.botania:petal9.name=青色神秘花瓣 -item.botania:petal10.name=紫色神秘花瓣 -item.botania:petal11.name=蓝色神秘花瓣 -item.botania:petal12.name=棕色神秘花瓣 -item.botania:petal13.name=绿色神秘花瓣 -item.botania:petal14.name=红色神秘花瓣 -item.botania:petal15.name=黑色神秘花瓣 -item.botania:dye0.name=白色花粉 -item.botania:dye1.name=橙色花粉 -item.botania:dye2.name=品红色花粉 -item.botania:dye3.name=淡蓝色花粉 -item.botania:dye4.name=黄色花粉 -item.botania:dye5.name=黄绿色花粉 -item.botania:dye6.name=粉色花粉 -item.botania:dye7.name=灰色花粉 -item.botania:dye8.name=淡灰色花粉 -item.botania:dye9.name=青色花粉 -item.botania:dye10.name=紫色花粉 -item.botania:dye11.name=蓝色花粉 -item.botania:dye12.name=棕色花粉 -item.botania:dye13.name=绿色花粉 -item.botania:dye14.name=红色花粉 -item.botania:dye15.name=黑色花粉 +item.botania:petal_white.name=白色神秘花瓣 +item.botania:petal_orange.name=橙色神秘花瓣 +item.botania:petal_magenta.name=品红色神秘花瓣 +item.botania:petal_light_blue.name=淡蓝色神秘花瓣 +item.botania:petal_yellow.name=黄色神秘花瓣 +item.botania:petal_lime.name=黄绿色神秘花瓣 +item.botania:petal_pink.name=粉色神秘花瓣 +item.botania:petal_gray.name=灰色神秘花瓣 +item.botania:petal_silver.name=淡灰色神秘花瓣 +item.botania:petal_cyan.name=青色神秘花瓣 +item.botania:petal_purple.name=紫色神秘花瓣 +item.botania:petal_blue.name=蓝色神秘花瓣 +item.botania:petal_brown.name=棕色神秘花瓣 +item.botania:petal_green.name=绿色神秘花瓣 +item.botania:petal_red.name=红色神秘花瓣 +item.botania:petal_black.name=黑色神秘花瓣 +item.botania:dye_white.name=白色花粉 +item.botania:dye_orange.name=橙色花粉 +item.botania:dye_magenta.name=品红色花粉 +item.botania:dye_light_blue.name=淡蓝色花粉 +item.botania:dye_yellow.name=黄色花粉 +item.botania:dye_lime.name=黄绿色花粉 +item.botania:dye_pink.name=粉色花粉 +item.botania:dye_gray.name=灰色花粉 +item.botania:dye_silver.name=淡灰色花粉 +item.botania:dye_cyan.name=青色花粉 +item.botania:dye_purple.name=紫色花粉 +item.botania:dye_blue.name=蓝色花粉 +item.botania:dye_brown.name=棕色花粉 +item.botania:dye_green.name=绿色花粉 +item.botania:dye_red.name=红色花粉 +item.botania:dye_black.name=黑色花粉 item.botania:pestleAndMortar.name=杵和臼 item.botania:twigWand.name=森林法杖 item.botania:manasteel_ingot.name=魔力钢锭 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index a9b2dd30f..5197a4473 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -1233,38 +1233,38 @@ tile.botania:flower.solegnoliaChibi.reference=你的磁力都歸我們了 item.botania:lexicon.name=植物魔法辭典 item.botania:lexicon.bevo=植物魔法辭典 item.botania:lexicon.saice=植物魔法辭典 -item.botania:petal0.name=白色神秘花瓣 -item.botania:petal1.name=橘色神秘花瓣 -item.botania:petal2.name=洋紅色神秘花瓣 -item.botania:petal3.name=淺藍色神秘花瓣 -item.botania:petal4.name=黃色神秘花瓣 -item.botania:petal5.name=淺綠色神秘花瓣 -item.botania:petal6.name=粉色神秘花瓣 -item.botania:petal7.name=灰色神秘花瓣 -item.botania:petal8.name=淺灰色神秘花瓣 -item.botania:petal9.name=青色神秘花瓣 -item.botania:petal10.name=紫色神秘花瓣 -item.botania:petal11.name=藍色神秘花瓣 -item.botania:petal12.name=棕色神秘花瓣 -item.botania:petal13.name=綠色神秘花瓣 -item.botania:petal14.name=紅色神秘花瓣 -item.botania:petal15.name=黑色神秘花瓣 -item.botania:dye0.name=白色花粉 -item.botania:dye1.name=橘色花粉 -item.botania:dye2.name=洋紅色花粉 -item.botania:dye3.name=淺藍色花粉 -item.botania:dye4.name=黃色花粉 -item.botania:dye5.name=淺綠色花粉 -item.botania:dye6.name=粉色花粉 -item.botania:dye7.name=灰色花粉 -item.botania:dye8.name=淺灰色花粉 -item.botania:dye9.name=青色花粉 -item.botania:dye10.name=紫色花粉 -item.botania:dye11.name=藍色花粉 -item.botania:dye12.name=棕色花粉 -item.botania:dye13.name=綠色花粉 -item.botania:dye14.name=紅色花粉 -item.botania:dye15.name=黑色花粉 +item.botania:petal_white.name=白色神秘花瓣 +item.botania:petal_orange.name=橘色神秘花瓣 +item.botania:petal_magenta.name=洋紅色神秘花瓣 +item.botania:petal_light_blue.name=淺藍色神秘花瓣 +item.botania:petal_yellow.name=黃色神秘花瓣 +item.botania:petal_lime.name=淺綠色神秘花瓣 +item.botania:petal_pink.name=粉色神秘花瓣 +item.botania:petal_gray.name=灰色神秘花瓣 +item.botania:petal_silver.name=淺灰色神秘花瓣 +item.botania:petal_cyan.name=青色神秘花瓣 +item.botania:petal_purple.name=紫色神秘花瓣 +item.botania:petal_blue.name=藍色神秘花瓣 +item.botania:petal_brown.name=棕色神秘花瓣 +item.botania:petal_green.name=綠色神秘花瓣 +item.botania:petal_red.name=紅色神秘花瓣 +item.botania:petal_black.name=黑色神秘花瓣 +item.botania:dye_white.name=白色花粉 +item.botania:dye_orange.name=橘色花粉 +item.botania:dye_magenta.name=洋紅色花粉 +item.botania:dye_light_blue.name=淺藍色花粉 +item.botania:dye_yellow.name=黃色花粉 +item.botania:dye_lime.name=淺綠色花粉 +item.botania:dye_pink.name=粉色花粉 +item.botania:dye_gray.name=灰色花粉 +item.botania:dye_silver.name=淺灰色花粉 +item.botania:dye_cyan.name=青色花粉 +item.botania:dye_purple.name=紫色花粉 +item.botania:dye_blue.name=藍色花粉 +item.botania:dye_brown.name=棕色花粉 +item.botania:dye_green.name=綠色花粉 +item.botania:dye_red.name=紅色花粉 +item.botania:dye_black.name=黑色花粉 item.botania:pestleAndMortar.name=杵和臼 item.botania:twigWand.name=森林法杖 item.botania:manasteel_ingot.name=瑪那鋼錠 diff --git a/src/main/resources/assets/botania/recipes/_constants.json b/src/main/resources/assets/botania/recipes/_constants.json index 61fa7b60e..405900ef9 100644 --- a/src/main/resources/assets/botania/recipes/_constants.json +++ b/src/main/resources/assets/botania/recipes/_constants.json @@ -1,4 +1,46 @@ [ + { + "ingredient": [ + { "item": "botania:dye_white" }, + { "item": "botania:dye_orange" }, + { "item": "botania:dye_magenta" }, + { "item": "botania:dye_light_blue" }, + { "item": "botania:dye_yellow" }, + { "item": "botania:dye_lime" }, + { "item": "botania:dye_pink" }, + { "item": "botania:dye_gray" }, + { "item": "botania:dye_silver" }, + { "item": "botania:dye_cyan" }, + { "item": "botania:dye_purple" }, + { "item": "botania:dye_blue" }, + { "item": "botania:dye_brown" }, + { "item": "botania:dye_green" }, + { "item": "botania:dye_red" }, + { "item": "botania:dye_black" } + ], + "name": "ALL_DYES" + }, + { + "ingredient": [ + { "item": "botania:petal_white" }, + { "item": "botania:petal_orange" }, + { "item": "botania:petal_magenta" }, + { "item": "botania:petal_light_blue" }, + { "item": "botania:petal_yellow" }, + { "item": "botania:petal_lime" }, + { "item": "botania:petal_pink" }, + { "item": "botania:petal_gray" }, + { "item": "botania:petal_silver" }, + { "item": "botania:petal_cyan" }, + { "item": "botania:petal_purple" }, + { "item": "botania:petal_blue" }, + { "item": "botania:petal_brown" }, + { "item": "botania:petal_green" }, + { "item": "botania:petal_red" }, + { "item": "botania:petal_black" } + ], + "name": "ALL_PETALS" + }, { "ingredient": { "type": "forge:ore_dict", diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_0.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_0.json index ef0c14696..93eb4b4e8 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_0.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_0.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 0, + "item": "botania:petal_white", "count": 9 }, "ingredients": [ diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_1.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_1.json index be63fc2c6..665558e4f 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_1.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_1.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 1, + "item": "botania:petal_orange", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_10.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_10.json index 06be5903b..c14257ea0 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_10.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_10.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 10, + "item": "botania:petal_purple", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_11.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_11.json index 6c986faa3..115974907 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_11.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_11.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 11, + "item": "botania:petal_blue", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_12.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_12.json index a25e1266b..74dc260b8 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_12.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_12.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 12, + "item": "botania:petal_brown", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_13.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_13.json index 8666dfdbf..0926f491f 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_13.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_13.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 13, + "item": "botania:petal_green", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_14.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_14.json index dadcef4c2..a82295205 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_14.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_14.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 14, + "item": "botania:petal_red", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_15.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_15.json index 1f99b501d..7f1ab69a7 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_15.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_15.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 15, + "item": "botania:petal_black", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_2.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_2.json index 66751b1c1..fd104302f 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_2.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_2.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 2, + "item": "botania:petal_magenta", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_3.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_3.json index 3ab6ac784..40efb8ff4 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_3.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_3.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 3, + "item": "botania:petal_light_blue", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_4.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_4.json index fc9e9d7a7..cc72357a6 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_4.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_4.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 4, + "item": "botania:petal_yellow", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_5.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_5.json index 3415e7b81..4decab129 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_5.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_5.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 5, + "item": "botania:petal_lime", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_6.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_6.json index 1024a308b..d2c5f82bf 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_6.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_6.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 6, + "item": "botania:petal_pink", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_7.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_7.json index 9ea1ecaf9..f0345c281 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_7.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_7.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 7, + "item": "botania:petal_gray", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_8.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_8.json index badb241b7..9917e3efb 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_8.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_8.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 8, + "item": "botania:petal_silver", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_9.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_9.json index 9a0a6b55c..7c6308f87 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_9.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_9.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 9, + "item": "botania:petal_cyan", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/assets/botania/recipes/cosmetic_0.json b/src/main/resources/assets/botania/recipes/cosmetic_0.json index 132281d96..025f832d6 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_0.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_0.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:petal", - "data": 0 + "item": "botania:petal_white" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_1.json b/src/main/resources/assets/botania/recipes/cosmetic_1.json index fc8ac66a3..59413d034 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_1.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_1.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:petal", - "data": 1 + "item": "botania:petal_orange" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_10.json b/src/main/resources/assets/botania/recipes/cosmetic_10.json index 054b896c1..a1c250b0a 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_10.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_10.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:petal", - "data": 10 + "item": "botania:petal_purple" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_11.json b/src/main/resources/assets/botania/recipes/cosmetic_11.json index 47d520a8a..53ad86da7 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_11.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_11.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:petal", - "data": 11 + "item": "botania:petal_blue" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_12.json b/src/main/resources/assets/botania/recipes/cosmetic_12.json index 52711aceb..bd2b146d9 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_12.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_12.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:petal", - "data": 12 + "item": "botania:petal_brown" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_13.json b/src/main/resources/assets/botania/recipes/cosmetic_13.json index d9eff1342..ef1595a20 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_13.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_13.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:petal", - "data": 13 + "item": "botania:petal_green" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_14.json b/src/main/resources/assets/botania/recipes/cosmetic_14.json index c1b60fcb9..f756e38d7 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_14.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_14.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:petal", - "data": 14 + "item": "botania:petal_red" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_15.json b/src/main/resources/assets/botania/recipes/cosmetic_15.json index 35f835db4..1a5e1e334 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_15.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_15.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:petal", - "data": 15 + "item": "botania:petal_black" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_16.json b/src/main/resources/assets/botania/recipes/cosmetic_16.json index 0bb574be1..c39c0d71e 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_16.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_16.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:dye", - "data": 0 + "item": "botania:dye_white" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_17.json b/src/main/resources/assets/botania/recipes/cosmetic_17.json index 4bc330ac7..92cc0bf52 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_17.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_17.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:dye", - "data": 1 + "item": "botania:dye_orange" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_18.json b/src/main/resources/assets/botania/recipes/cosmetic_18.json index 5f037c50d..3edbb86f7 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_18.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_18.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:dye", - "data": 2 + "item": "botania:dye_magenta" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_19.json b/src/main/resources/assets/botania/recipes/cosmetic_19.json index 5675ed336..684774d2a 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_19.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_19.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:dye", - "data": 3 + "item": "botania:dye_light_blue" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_2.json b/src/main/resources/assets/botania/recipes/cosmetic_2.json index e448aa996..721a0a486 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_2.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_2.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:petal", - "data": 2 + "item": "botania:petal_magenta" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_20.json b/src/main/resources/assets/botania/recipes/cosmetic_20.json index 9ab7ce8fe..ac98a0cf6 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_20.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_20.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:dye", - "data": 4 + "item": "botania:dye_yellow" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_21.json b/src/main/resources/assets/botania/recipes/cosmetic_21.json index 342cc6bdc..d71d6e482 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_21.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_21.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:dye", - "data": 5 + "item": "botania:dye_lime" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_22.json b/src/main/resources/assets/botania/recipes/cosmetic_22.json index 9a56235c7..f12e5c9b2 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_22.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_22.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:dye", - "data": 6 + "item": "botania:dye_pink" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_23.json b/src/main/resources/assets/botania/recipes/cosmetic_23.json index aff8b0606..7a311c2cb 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_23.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_23.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:dye", - "data": 7 + "item": "botania:dye_gray" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_24.json b/src/main/resources/assets/botania/recipes/cosmetic_24.json index 73700be3e..199909a55 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_24.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_24.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:dye", - "data": 8 + "item": "botania:dye_silver" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_25.json b/src/main/resources/assets/botania/recipes/cosmetic_25.json index adf0d321d..4dcc88eb1 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_25.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_25.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:dye", - "data": 9 + "item": "botania:dye_cyan" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_26.json b/src/main/resources/assets/botania/recipes/cosmetic_26.json index bb4f4381d..51c205295 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_26.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_26.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:dye", - "data": 10 + "item": "botania:dye_purple" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_27.json b/src/main/resources/assets/botania/recipes/cosmetic_27.json index f3f10800d..8ad088151 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_27.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_27.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:dye", - "data": 11 + "item": "botania:dye_blue" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_28.json b/src/main/resources/assets/botania/recipes/cosmetic_28.json index 3af217b9b..e21a0c3d9 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_28.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_28.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:dye", - "data": 12 + "item": "botania:dye_brown" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_29.json b/src/main/resources/assets/botania/recipes/cosmetic_29.json index ace7a7779..f34d41f7e 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_29.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_29.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:dye", - "data": 13 + "item": "botania:dye_green" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_3.json b/src/main/resources/assets/botania/recipes/cosmetic_3.json index 89569bb48..1e1514b85 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_3.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_3.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:petal", - "data": 3 + "item": "botania:petal_light_blue" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_30.json b/src/main/resources/assets/botania/recipes/cosmetic_30.json index 2f49f94b6..83378f14c 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_30.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_30.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:dye", - "data": 14 + "item": "botania:dye_red" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_31.json b/src/main/resources/assets/botania/recipes/cosmetic_31.json index f1aa1c146..29968b4df 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_31.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_31.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:dye", - "data": 15 + "item": "botania:dye_black" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_4.json b/src/main/resources/assets/botania/recipes/cosmetic_4.json index c5dadc51e..e1fa90acb 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_4.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_4.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:petal", - "data": 4 + "item": "botania:petal_yellow" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_5.json b/src/main/resources/assets/botania/recipes/cosmetic_5.json index 91af4909c..acf4ac19f 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_5.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_5.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:petal", - "data": 5 + "item": "botania:petal_lime" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_6.json b/src/main/resources/assets/botania/recipes/cosmetic_6.json index a6373f8e2..085433787 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_6.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_6.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:petal", - "data": 6 + "item": "botania:petal_pink" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_7.json b/src/main/resources/assets/botania/recipes/cosmetic_7.json index d269d6b35..ac8d67431 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_7.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_7.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:petal", - "data": 7 + "item": "botania:petal_gray" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_8.json b/src/main/resources/assets/botania/recipes/cosmetic_8.json index 1bc9ff97f..4f895077e 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_8.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_8.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:petal", - "data": 8 + "item": "botania:petal_silver" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/cosmetic_9.json b/src/main/resources/assets/botania/recipes/cosmetic_9.json index 2cfac6c1c..9df89c74e 100644 --- a/src/main/resources/assets/botania/recipes/cosmetic_9.json +++ b/src/main/resources/assets/botania/recipes/cosmetic_9.json @@ -11,8 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "botania:petal", - "data": 9 + "item": "botania:petal_cyan" }, "S": { "item": "#MANASTRING" diff --git a/src/main/resources/assets/botania/recipes/dye_15.json b/src/main/resources/assets/botania/recipes/dye_black.json similarity index 81% rename from src/main/resources/assets/botania/recipes/dye_15.json rename to src/main/resources/assets/botania/recipes/dye_black.json index 52d819514..2ead081a1 100644 --- a/src/main/resources/assets/botania/recipes/dye_15.json +++ b/src/main/resources/assets/botania/recipes/dye_black.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dye", - "data": 15 + "item": "botania:dye_black" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/assets/botania/recipes/dye_11.json b/src/main/resources/assets/botania/recipes/dye_blue.json similarity index 81% rename from src/main/resources/assets/botania/recipes/dye_11.json rename to src/main/resources/assets/botania/recipes/dye_blue.json index 2ae177f78..1144712c6 100644 --- a/src/main/resources/assets/botania/recipes/dye_11.json +++ b/src/main/resources/assets/botania/recipes/dye_blue.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dye", - "data": 11 + "item": "botania:dye_blue" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/assets/botania/recipes/dye_12.json b/src/main/resources/assets/botania/recipes/dye_brown.json similarity index 81% rename from src/main/resources/assets/botania/recipes/dye_12.json rename to src/main/resources/assets/botania/recipes/dye_brown.json index cfdb1d708..62481e5ab 100644 --- a/src/main/resources/assets/botania/recipes/dye_12.json +++ b/src/main/resources/assets/botania/recipes/dye_brown.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dye", - "data": 12 + "item": "botania:dye_brown" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/assets/botania/recipes/dye_9.json b/src/main/resources/assets/botania/recipes/dye_cyan.json similarity index 82% rename from src/main/resources/assets/botania/recipes/dye_9.json rename to src/main/resources/assets/botania/recipes/dye_cyan.json index 461218ffe..05a736357 100644 --- a/src/main/resources/assets/botania/recipes/dye_9.json +++ b/src/main/resources/assets/botania/recipes/dye_cyan.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dye", - "data": 9 + "item": "botania:dye_cyan" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/assets/botania/recipes/dye_7.json b/src/main/resources/assets/botania/recipes/dye_gray.json similarity index 82% rename from src/main/resources/assets/botania/recipes/dye_7.json rename to src/main/resources/assets/botania/recipes/dye_gray.json index 390c1c258..44f553b7a 100644 --- a/src/main/resources/assets/botania/recipes/dye_7.json +++ b/src/main/resources/assets/botania/recipes/dye_gray.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dye", - "data": 7 + "item": "botania:dye_gray" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/assets/botania/recipes/dye_13.json b/src/main/resources/assets/botania/recipes/dye_green.json similarity index 81% rename from src/main/resources/assets/botania/recipes/dye_13.json rename to src/main/resources/assets/botania/recipes/dye_green.json index b7815e8bc..646d2668a 100644 --- a/src/main/resources/assets/botania/recipes/dye_13.json +++ b/src/main/resources/assets/botania/recipes/dye_green.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dye", - "data": 13 + "item": "botania:dye_green" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/assets/botania/recipes/dye_3.json b/src/main/resources/assets/botania/recipes/dye_light_blue.json similarity index 87% rename from src/main/resources/assets/botania/recipes/dye_3.json rename to src/main/resources/assets/botania/recipes/dye_light_blue.json index e081abf77..86790d0ac 100644 --- a/src/main/resources/assets/botania/recipes/dye_3.json +++ b/src/main/resources/assets/botania/recipes/dye_light_blue.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dye", - "data": 3 + "item": "botania:dye_light_blue" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/assets/botania/recipes/dye_5.json b/src/main/resources/assets/botania/recipes/dye_lime.json similarity index 82% rename from src/main/resources/assets/botania/recipes/dye_5.json rename to src/main/resources/assets/botania/recipes/dye_lime.json index 16eb850e1..f601f9696 100644 --- a/src/main/resources/assets/botania/recipes/dye_5.json +++ b/src/main/resources/assets/botania/recipes/dye_lime.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dye", - "data": 5 + "item": "botania:dye_lime" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/assets/botania/recipes/dye_2.json b/src/main/resources/assets/botania/recipes/dye_magenta.json similarity index 82% rename from src/main/resources/assets/botania/recipes/dye_2.json rename to src/main/resources/assets/botania/recipes/dye_magenta.json index 3351109c7..3edf2ce3c 100644 --- a/src/main/resources/assets/botania/recipes/dye_2.json +++ b/src/main/resources/assets/botania/recipes/dye_magenta.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dye", - "data": 2 + "item": "botania:dye_magenta" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/assets/botania/recipes/dye_2_double.json b/src/main/resources/assets/botania/recipes/dye_magenta_double.json similarity index 85% rename from src/main/resources/assets/botania/recipes/dye_2_double.json rename to src/main/resources/assets/botania/recipes/dye_magenta_double.json index 6927ed168..f4d3355d4 100644 --- a/src/main/resources/assets/botania/recipes/dye_2_double.json +++ b/src/main/resources/assets/botania/recipes/dye_magenta_double.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dye", - "data": 2, + "item": "botania:dye_magenta", "count": 2 }, "group": "botania:dye_double", diff --git a/src/main/resources/assets/botania/recipes/dye_1.json b/src/main/resources/assets/botania/recipes/dye_orange.json similarity index 87% rename from src/main/resources/assets/botania/recipes/dye_1.json rename to src/main/resources/assets/botania/recipes/dye_orange.json index 725718d16..f764e6707 100644 --- a/src/main/resources/assets/botania/recipes/dye_1.json +++ b/src/main/resources/assets/botania/recipes/dye_orange.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dye", - "data": 1 + "item": "botania:dye_orange" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/assets/botania/recipes/dye_6.json b/src/main/resources/assets/botania/recipes/dye_pink.json similarity index 87% rename from src/main/resources/assets/botania/recipes/dye_6.json rename to src/main/resources/assets/botania/recipes/dye_pink.json index 0f3d82110..23fa72fa8 100644 --- a/src/main/resources/assets/botania/recipes/dye_6.json +++ b/src/main/resources/assets/botania/recipes/dye_pink.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dye", - "data": 6 + "item": "botania:dye_pink" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/assets/botania/recipes/dye_6_double.json b/src/main/resources/assets/botania/recipes/dye_pink_double.json similarity index 85% rename from src/main/resources/assets/botania/recipes/dye_6_double.json rename to src/main/resources/assets/botania/recipes/dye_pink_double.json index 0f6b799ed..942f77679 100644 --- a/src/main/resources/assets/botania/recipes/dye_6_double.json +++ b/src/main/resources/assets/botania/recipes/dye_pink_double.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dye", - "data": 6, + "item": "botania:dye_pink", "count": 2 }, "group": "botania:dye_double", diff --git a/src/main/resources/assets/botania/recipes/dye_10.json b/src/main/resources/assets/botania/recipes/dye_purple.json similarity index 81% rename from src/main/resources/assets/botania/recipes/dye_10.json rename to src/main/resources/assets/botania/recipes/dye_purple.json index c782a2ee3..1a84ce402 100644 --- a/src/main/resources/assets/botania/recipes/dye_10.json +++ b/src/main/resources/assets/botania/recipes/dye_purple.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dye", - "data": 10 + "item": "botania:dye_purple" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/assets/botania/recipes/dye_14.json b/src/main/resources/assets/botania/recipes/dye_red.json similarity index 89% rename from src/main/resources/assets/botania/recipes/dye_14.json rename to src/main/resources/assets/botania/recipes/dye_red.json index 2071932c4..5f1d2b90d 100644 --- a/src/main/resources/assets/botania/recipes/dye_14.json +++ b/src/main/resources/assets/botania/recipes/dye_red.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dye", - "data": 14 + "item": "botania:dye_red" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/assets/botania/recipes/dye_14_double.json b/src/main/resources/assets/botania/recipes/dye_red_double.json similarity index 84% rename from src/main/resources/assets/botania/recipes/dye_14_double.json rename to src/main/resources/assets/botania/recipes/dye_red_double.json index c40ec71ec..e14a0ed4e 100644 --- a/src/main/resources/assets/botania/recipes/dye_14_double.json +++ b/src/main/resources/assets/botania/recipes/dye_red_double.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dye", - "data": 14, + "item": "botania:dye_red", "count": 2 }, "group": "botania:dye_double", diff --git a/src/main/resources/assets/botania/recipes/dye_8.json b/src/main/resources/assets/botania/recipes/dye_silver.json similarity index 91% rename from src/main/resources/assets/botania/recipes/dye_8.json rename to src/main/resources/assets/botania/recipes/dye_silver.json index 322c30b8c..05daff408 100644 --- a/src/main/resources/assets/botania/recipes/dye_8.json +++ b/src/main/resources/assets/botania/recipes/dye_silver.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dye", - "data": 8 + "item": "botania:dye_silver" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/assets/botania/recipes/dye_0.json b/src/main/resources/assets/botania/recipes/dye_white.json similarity index 82% rename from src/main/resources/assets/botania/recipes/dye_0.json rename to src/main/resources/assets/botania/recipes/dye_white.json index a0bed054e..2a225eb9b 100644 --- a/src/main/resources/assets/botania/recipes/dye_0.json +++ b/src/main/resources/assets/botania/recipes/dye_white.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dye", - "data": 0 + "item": "botania:dye_white" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/assets/botania/recipes/dye_4.json b/src/main/resources/assets/botania/recipes/dye_yellow.json similarity index 87% rename from src/main/resources/assets/botania/recipes/dye_4.json rename to src/main/resources/assets/botania/recipes/dye_yellow.json index 2d31636cb..ef0aba873 100644 --- a/src/main/resources/assets/botania/recipes/dye_4.json +++ b/src/main/resources/assets/botania/recipes/dye_yellow.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dye", - "data": 4 + "item": "botania:dye_yellow" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/assets/botania/recipes/dye_4_double.json b/src/main/resources/assets/botania/recipes/dye_yellow_double.json similarity index 85% rename from src/main/resources/assets/botania/recipes/dye_4_double.json rename to src/main/resources/assets/botania/recipes/dye_yellow_double.json index 290dc92e5..76697ef73 100644 --- a/src/main/resources/assets/botania/recipes/dye_4_double.json +++ b/src/main/resources/assets/botania/recipes/dye_yellow_double.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dye", - "data": 4, + "item": "botania:dye_yellow", "count": 2 }, "group": "botania:dye_double", diff --git a/src/main/resources/assets/botania/recipes/fertilizer_powder.json b/src/main/resources/assets/botania/recipes/fertilizer_powder.json index b633a4a7d..1e02bf691 100644 --- a/src/main/resources/assets/botania/recipes/fertilizer_powder.json +++ b/src/main/resources/assets/botania/recipes/fertilizer_powder.json @@ -17,20 +17,16 @@ "data": 15 }, { - "item": "botania:dye", - "data": 32767 + "item": "#ALL_DYES" }, { - "item": "botania:dye", - "data": 32767 + "item": "#ALL_DYES" }, { - "item": "botania:dye", - "data": 32767 + "item": "#ALL_DYES" }, { - "item": "botania:dye", - "data": 32767 + "item": "#ALL_DYES" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/flowerbag.json b/src/main/resources/assets/botania/recipes/flowerbag.json index 665db051c..e50d9710f 100644 --- a/src/main/resources/assets/botania/recipes/flowerbag.json +++ b/src/main/resources/assets/botania/recipes/flowerbag.json @@ -10,8 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:petal", - "data": 32767 + "item": "#ALL_PETALS" }, "W": { "item": "minecraft:wool", diff --git a/src/main/resources/assets/botania/recipes/garden_of_glass/fertilizer_powder.json b/src/main/resources/assets/botania/recipes/garden_of_glass/fertilizer_powder.json index cb0c6c09f..5faf15418 100644 --- a/src/main/resources/assets/botania/recipes/garden_of_glass/fertilizer_powder.json +++ b/src/main/resources/assets/botania/recipes/garden_of_glass/fertilizer_powder.json @@ -15,20 +15,16 @@ "data": 15 }, { - "item": "botania:dye", - "data": 32767 + "item": "#ALL_DYES" }, { - "item": "botania:dye", - "data": 32767 + "item": "#ALL_DYES" }, { - "item": "botania:dye", - "data": 32767 + "item": "#ALL_DYES" }, { - "item": "botania:dye", - "data": 32767 + "item": "#ALL_DYES" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/mushroom_0.json b/src/main/resources/assets/botania/recipes/mushroom_0.json index deea9d02c..9e474a252 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_0.json +++ b/src/main/resources/assets/botania/recipes/mushroom_0.json @@ -14,8 +14,7 @@ } ], { - "item": "botania:dye", - "data": 0 + "item": "botania:dye_white" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/mushroom_1.json b/src/main/resources/assets/botania/recipes/mushroom_1.json index fe9e539ca..249b89121 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_1.json +++ b/src/main/resources/assets/botania/recipes/mushroom_1.json @@ -14,8 +14,7 @@ } ], { - "item": "botania:dye", - "data": 1 + "item": "botania:dye_orange" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/mushroom_10.json b/src/main/resources/assets/botania/recipes/mushroom_10.json index 851fe4e01..fa04c331c 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_10.json +++ b/src/main/resources/assets/botania/recipes/mushroom_10.json @@ -14,8 +14,7 @@ } ], { - "item": "botania:dye", - "data": 10 + "item": "botania:dye_purple" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/mushroom_11.json b/src/main/resources/assets/botania/recipes/mushroom_11.json index c97fc8ebb..68ab18758 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_11.json +++ b/src/main/resources/assets/botania/recipes/mushroom_11.json @@ -14,8 +14,7 @@ } ], { - "item": "botania:dye", - "data": 11 + "item": "botania:dye_blue" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/mushroom_12.json b/src/main/resources/assets/botania/recipes/mushroom_12.json index e3f4e18c8..f13b5e43a 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_12.json +++ b/src/main/resources/assets/botania/recipes/mushroom_12.json @@ -14,8 +14,7 @@ } ], { - "item": "botania:dye", - "data": 12 + "item": "botania:dye_brown" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/mushroom_13.json b/src/main/resources/assets/botania/recipes/mushroom_13.json index 0cda1a2b6..1afcd29e1 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_13.json +++ b/src/main/resources/assets/botania/recipes/mushroom_13.json @@ -14,8 +14,7 @@ } ], { - "item": "botania:dye", - "data": 13 + "item": "botania:dye_green" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/mushroom_14.json b/src/main/resources/assets/botania/recipes/mushroom_14.json index e0df3f8a4..f52c8cef8 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_14.json +++ b/src/main/resources/assets/botania/recipes/mushroom_14.json @@ -14,8 +14,7 @@ } ], { - "item": "botania:dye", - "data": 14 + "item": "botania:dye_red" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/mushroom_15.json b/src/main/resources/assets/botania/recipes/mushroom_15.json index dc4d387ef..27b8a8628 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_15.json +++ b/src/main/resources/assets/botania/recipes/mushroom_15.json @@ -14,8 +14,7 @@ } ], { - "item": "botania:dye", - "data": 15 + "item": "botania:dye_black" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/mushroom_2.json b/src/main/resources/assets/botania/recipes/mushroom_2.json index c56cca362..92197c0c9 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_2.json +++ b/src/main/resources/assets/botania/recipes/mushroom_2.json @@ -14,8 +14,7 @@ } ], { - "item": "botania:dye", - "data": 2 + "item": "botania:dye_magenta" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/mushroom_3.json b/src/main/resources/assets/botania/recipes/mushroom_3.json index c07b4f540..0c383ca1e 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_3.json +++ b/src/main/resources/assets/botania/recipes/mushroom_3.json @@ -14,8 +14,7 @@ } ], { - "item": "botania:dye", - "data": 3 + "item": "botania:dye_light_blue" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/mushroom_4.json b/src/main/resources/assets/botania/recipes/mushroom_4.json index c0cba9ce3..537d881c8 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_4.json +++ b/src/main/resources/assets/botania/recipes/mushroom_4.json @@ -14,8 +14,7 @@ } ], { - "item": "botania:dye", - "data": 4 + "item": "botania:dye_yellow" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/mushroom_5.json b/src/main/resources/assets/botania/recipes/mushroom_5.json index 79f8e683d..53e67b803 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_5.json +++ b/src/main/resources/assets/botania/recipes/mushroom_5.json @@ -14,8 +14,7 @@ } ], { - "item": "botania:dye", - "data": 5 + "item": "botania:dye_lime" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/mushroom_6.json b/src/main/resources/assets/botania/recipes/mushroom_6.json index b065f36aa..275bd5eac 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_6.json +++ b/src/main/resources/assets/botania/recipes/mushroom_6.json @@ -14,8 +14,7 @@ } ], { - "item": "botania:dye", - "data": 6 + "item": "botania:dye_pink" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/mushroom_7.json b/src/main/resources/assets/botania/recipes/mushroom_7.json index 6e60c3cbd..9750b3e2b 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_7.json +++ b/src/main/resources/assets/botania/recipes/mushroom_7.json @@ -14,8 +14,7 @@ } ], { - "item": "botania:dye", - "data": 7 + "item": "botania:dye_gray" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/mushroom_8.json b/src/main/resources/assets/botania/recipes/mushroom_8.json index 3409c13a6..74f3a9f89 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_8.json +++ b/src/main/resources/assets/botania/recipes/mushroom_8.json @@ -14,8 +14,7 @@ } ], { - "item": "botania:dye", - "data": 8 + "item": "botania:dye_silver" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/mushroom_9.json b/src/main/resources/assets/botania/recipes/mushroom_9.json index 9fad2c137..443caddd5 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_9.json +++ b/src/main/resources/assets/botania/recipes/mushroom_9.json @@ -14,8 +14,7 @@ } ], { - "item": "botania:dye", - "data": 9 + "item": "botania:dye_cyan" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/petal_15.json b/src/main/resources/assets/botania/recipes/petal_black.json similarity index 78% rename from src/main/resources/assets/botania/recipes/petal_15.json rename to src/main/resources/assets/botania/recipes/petal_black.json index 2f3b4d7bd..289ad23bd 100644 --- a/src/main/resources/assets/botania/recipes/petal_15.json +++ b/src/main/resources/assets/botania/recipes/petal_black.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 15, + "item": "botania:petal_black", "count": 2 }, "group": "botania:petal", diff --git a/src/main/resources/assets/botania/recipes/petal_15_double.json b/src/main/resources/assets/botania/recipes/petal_black_double.json similarity index 80% rename from src/main/resources/assets/botania/recipes/petal_15_double.json rename to src/main/resources/assets/botania/recipes/petal_black_double.json index a5da7c8a1..0c4afc06b 100644 --- a/src/main/resources/assets/botania/recipes/petal_15_double.json +++ b/src/main/resources/assets/botania/recipes/petal_black_double.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 15, + "item": "botania:petal_black", "count": 4 }, "group": "botania:petal_double", diff --git a/src/main/resources/assets/botania/recipes/petal_11.json b/src/main/resources/assets/botania/recipes/petal_blue.json similarity index 78% rename from src/main/resources/assets/botania/recipes/petal_11.json rename to src/main/resources/assets/botania/recipes/petal_blue.json index 953b8f3d8..111dec9d8 100644 --- a/src/main/resources/assets/botania/recipes/petal_11.json +++ b/src/main/resources/assets/botania/recipes/petal_blue.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 11, + "item": "botania:petal_blue", "count": 2 }, "group": "botania:petal", diff --git a/src/main/resources/assets/botania/recipes/petal_11_double.json b/src/main/resources/assets/botania/recipes/petal_blue_double.json similarity index 80% rename from src/main/resources/assets/botania/recipes/petal_11_double.json rename to src/main/resources/assets/botania/recipes/petal_blue_double.json index d4ad09084..831f72da0 100644 --- a/src/main/resources/assets/botania/recipes/petal_11_double.json +++ b/src/main/resources/assets/botania/recipes/petal_blue_double.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 11, + "item": "botania:petal_blue", "count": 4 }, "group": "botania:petal_double", diff --git a/src/main/resources/assets/botania/recipes/petal_12.json b/src/main/resources/assets/botania/recipes/petal_brown.json similarity index 78% rename from src/main/resources/assets/botania/recipes/petal_12.json rename to src/main/resources/assets/botania/recipes/petal_brown.json index d2899ebea..42c8a166b 100644 --- a/src/main/resources/assets/botania/recipes/petal_12.json +++ b/src/main/resources/assets/botania/recipes/petal_brown.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 12, + "item": "botania:petal_brown", "count": 2 }, "group": "botania:petal", diff --git a/src/main/resources/assets/botania/recipes/petal_12_double.json b/src/main/resources/assets/botania/recipes/petal_brown_double.json similarity index 80% rename from src/main/resources/assets/botania/recipes/petal_12_double.json rename to src/main/resources/assets/botania/recipes/petal_brown_double.json index 36aa77d9b..683638989 100644 --- a/src/main/resources/assets/botania/recipes/petal_12_double.json +++ b/src/main/resources/assets/botania/recipes/petal_brown_double.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 12, + "item": "botania:petal_brown", "count": 4 }, "group": "botania:petal_double", diff --git a/src/main/resources/assets/botania/recipes/petal_9.json b/src/main/resources/assets/botania/recipes/petal_cyan.json similarity index 79% rename from src/main/resources/assets/botania/recipes/petal_9.json rename to src/main/resources/assets/botania/recipes/petal_cyan.json index b9f68ccfc..6de1efd5d 100644 --- a/src/main/resources/assets/botania/recipes/petal_9.json +++ b/src/main/resources/assets/botania/recipes/petal_cyan.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 9, + "item": "botania:petal_cyan", "count": 2 }, "group": "botania:petal", diff --git a/src/main/resources/assets/botania/recipes/petal_9_double.json b/src/main/resources/assets/botania/recipes/petal_cyan_double.json similarity index 80% rename from src/main/resources/assets/botania/recipes/petal_9_double.json rename to src/main/resources/assets/botania/recipes/petal_cyan_double.json index dae775cce..2015a4bc4 100644 --- a/src/main/resources/assets/botania/recipes/petal_9_double.json +++ b/src/main/resources/assets/botania/recipes/petal_cyan_double.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 9, + "item": "botania:petal_cyan", "count": 4 }, "group": "botania:petal_double", diff --git a/src/main/resources/assets/botania/recipes/petal_7.json b/src/main/resources/assets/botania/recipes/petal_gray.json similarity index 79% rename from src/main/resources/assets/botania/recipes/petal_7.json rename to src/main/resources/assets/botania/recipes/petal_gray.json index ec4ae8dbb..8f423edcb 100644 --- a/src/main/resources/assets/botania/recipes/petal_7.json +++ b/src/main/resources/assets/botania/recipes/petal_gray.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 7, + "item": "botania:petal_gray", "count": 2 }, "group": "botania:petal", diff --git a/src/main/resources/assets/botania/recipes/petal_7_double.json b/src/main/resources/assets/botania/recipes/petal_gray_double.json similarity index 80% rename from src/main/resources/assets/botania/recipes/petal_7_double.json rename to src/main/resources/assets/botania/recipes/petal_gray_double.json index e1572d501..c27063e16 100644 --- a/src/main/resources/assets/botania/recipes/petal_7_double.json +++ b/src/main/resources/assets/botania/recipes/petal_gray_double.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 7, + "item": "botania:petal_gray", "count": 4 }, "group": "botania:petal_double", diff --git a/src/main/resources/assets/botania/recipes/petal_13.json b/src/main/resources/assets/botania/recipes/petal_green.json similarity index 78% rename from src/main/resources/assets/botania/recipes/petal_13.json rename to src/main/resources/assets/botania/recipes/petal_green.json index c4865bf13..f5c80b38f 100644 --- a/src/main/resources/assets/botania/recipes/petal_13.json +++ b/src/main/resources/assets/botania/recipes/petal_green.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 13, + "item": "botania:petal_green", "count": 2 }, "group": "botania:petal", diff --git a/src/main/resources/assets/botania/recipes/petal_13_double.json b/src/main/resources/assets/botania/recipes/petal_green_double.json similarity index 80% rename from src/main/resources/assets/botania/recipes/petal_13_double.json rename to src/main/resources/assets/botania/recipes/petal_green_double.json index 03b7c3b36..56ebc58ba 100644 --- a/src/main/resources/assets/botania/recipes/petal_13_double.json +++ b/src/main/resources/assets/botania/recipes/petal_green_double.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 13, + "item": "botania:petal_green", "count": 4 }, "group": "botania:petal_double", diff --git a/src/main/resources/assets/botania/recipes/petal_3.json b/src/main/resources/assets/botania/recipes/petal_light_blue.json similarity index 79% rename from src/main/resources/assets/botania/recipes/petal_3.json rename to src/main/resources/assets/botania/recipes/petal_light_blue.json index f915c50a6..50688e6b4 100644 --- a/src/main/resources/assets/botania/recipes/petal_3.json +++ b/src/main/resources/assets/botania/recipes/petal_light_blue.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 3, + "item": "botania:petal_light_blue", "count": 2 }, "group": "botania:petal", diff --git a/src/main/resources/assets/botania/recipes/petal_3_double.json b/src/main/resources/assets/botania/recipes/petal_light_blue_double.json similarity index 80% rename from src/main/resources/assets/botania/recipes/petal_3_double.json rename to src/main/resources/assets/botania/recipes/petal_light_blue_double.json index a0320ddf5..8a444fd78 100644 --- a/src/main/resources/assets/botania/recipes/petal_3_double.json +++ b/src/main/resources/assets/botania/recipes/petal_light_blue_double.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 3, + "item": "botania:petal_light_blue", "count": 4 }, "group": "botania:petal_double", diff --git a/src/main/resources/assets/botania/recipes/petal_5.json b/src/main/resources/assets/botania/recipes/petal_lime.json similarity index 79% rename from src/main/resources/assets/botania/recipes/petal_5.json rename to src/main/resources/assets/botania/recipes/petal_lime.json index 02a972678..44f4bf85b 100644 --- a/src/main/resources/assets/botania/recipes/petal_5.json +++ b/src/main/resources/assets/botania/recipes/petal_lime.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 5, + "item": "botania:petal_lime", "count": 2 }, "group": "botania:petal", diff --git a/src/main/resources/assets/botania/recipes/petal_5_double.json b/src/main/resources/assets/botania/recipes/petal_lime_double.json similarity index 80% rename from src/main/resources/assets/botania/recipes/petal_5_double.json rename to src/main/resources/assets/botania/recipes/petal_lime_double.json index a7da5160a..eb8d818cc 100644 --- a/src/main/resources/assets/botania/recipes/petal_5_double.json +++ b/src/main/resources/assets/botania/recipes/petal_lime_double.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 5, + "item": "botania:petal_lime", "count": 4 }, "group": "botania:petal_double", diff --git a/src/main/resources/assets/botania/recipes/petal_2.json b/src/main/resources/assets/botania/recipes/petal_magenta.json similarity index 79% rename from src/main/resources/assets/botania/recipes/petal_2.json rename to src/main/resources/assets/botania/recipes/petal_magenta.json index dc5db7c9a..8b5924ae8 100644 --- a/src/main/resources/assets/botania/recipes/petal_2.json +++ b/src/main/resources/assets/botania/recipes/petal_magenta.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 2, + "item": "botania:petal_magenta", "count": 2 }, "group": "botania:petal", diff --git a/src/main/resources/assets/botania/recipes/petal_2_double.json b/src/main/resources/assets/botania/recipes/petal_magenta_double.json similarity index 80% rename from src/main/resources/assets/botania/recipes/petal_2_double.json rename to src/main/resources/assets/botania/recipes/petal_magenta_double.json index c7623565c..6aaa22e76 100644 --- a/src/main/resources/assets/botania/recipes/petal_2_double.json +++ b/src/main/resources/assets/botania/recipes/petal_magenta_double.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 2, + "item": "botania:petal_magenta", "count": 4 }, "group": "botania:petal_double", diff --git a/src/main/resources/assets/botania/recipes/petal_1.json b/src/main/resources/assets/botania/recipes/petal_orange.json similarity index 79% rename from src/main/resources/assets/botania/recipes/petal_1.json rename to src/main/resources/assets/botania/recipes/petal_orange.json index f7198d468..75e0af9a5 100644 --- a/src/main/resources/assets/botania/recipes/petal_1.json +++ b/src/main/resources/assets/botania/recipes/petal_orange.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 1, + "item": "botania:petal_orange", "count": 2 }, "group": "botania:petal", diff --git a/src/main/resources/assets/botania/recipes/petal_1_double.json b/src/main/resources/assets/botania/recipes/petal_orange_double.json similarity index 80% rename from src/main/resources/assets/botania/recipes/petal_1_double.json rename to src/main/resources/assets/botania/recipes/petal_orange_double.json index 4b6d7ec78..5607cd485 100644 --- a/src/main/resources/assets/botania/recipes/petal_1_double.json +++ b/src/main/resources/assets/botania/recipes/petal_orange_double.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 1, + "item": "botania:petal_orange", "count": 4 }, "group": "botania:petal_double", diff --git a/src/main/resources/assets/botania/recipes/petal_6.json b/src/main/resources/assets/botania/recipes/petal_pink.json similarity index 79% rename from src/main/resources/assets/botania/recipes/petal_6.json rename to src/main/resources/assets/botania/recipes/petal_pink.json index c165be0da..5fec7ee60 100644 --- a/src/main/resources/assets/botania/recipes/petal_6.json +++ b/src/main/resources/assets/botania/recipes/petal_pink.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 6, + "item": "botania:petal_pink", "count": 2 }, "group": "botania:petal", diff --git a/src/main/resources/assets/botania/recipes/petal_6_double.json b/src/main/resources/assets/botania/recipes/petal_pink_double.json similarity index 80% rename from src/main/resources/assets/botania/recipes/petal_6_double.json rename to src/main/resources/assets/botania/recipes/petal_pink_double.json index 27e86f482..dcedd76bd 100644 --- a/src/main/resources/assets/botania/recipes/petal_6_double.json +++ b/src/main/resources/assets/botania/recipes/petal_pink_double.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 6, + "item": "botania:petal_pink", "count": 4 }, "group": "botania:petal_double", diff --git a/src/main/resources/assets/botania/recipes/petal_10.json b/src/main/resources/assets/botania/recipes/petal_purple.json similarity index 78% rename from src/main/resources/assets/botania/recipes/petal_10.json rename to src/main/resources/assets/botania/recipes/petal_purple.json index 51463eb32..d37f83e35 100644 --- a/src/main/resources/assets/botania/recipes/petal_10.json +++ b/src/main/resources/assets/botania/recipes/petal_purple.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 10, + "item": "botania:petal_purple", "count": 2 }, "group": "botania:petal", diff --git a/src/main/resources/assets/botania/recipes/petal_10_double.json b/src/main/resources/assets/botania/recipes/petal_purple_double.json similarity index 80% rename from src/main/resources/assets/botania/recipes/petal_10_double.json rename to src/main/resources/assets/botania/recipes/petal_purple_double.json index 5dfc40d3b..261523f86 100644 --- a/src/main/resources/assets/botania/recipes/petal_10_double.json +++ b/src/main/resources/assets/botania/recipes/petal_purple_double.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 10, + "item": "botania:petal_purple", "count": 4 }, "group": "botania:petal_double", diff --git a/src/main/resources/assets/botania/recipes/petal_14.json b/src/main/resources/assets/botania/recipes/petal_red.json similarity index 78% rename from src/main/resources/assets/botania/recipes/petal_14.json rename to src/main/resources/assets/botania/recipes/petal_red.json index cb78dfe20..eeb304dab 100644 --- a/src/main/resources/assets/botania/recipes/petal_14.json +++ b/src/main/resources/assets/botania/recipes/petal_red.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 14, + "item": "botania:petal_red", "count": 2 }, "group": "botania:petal", diff --git a/src/main/resources/assets/botania/recipes/petal_14_double.json b/src/main/resources/assets/botania/recipes/petal_red_double.json similarity index 79% rename from src/main/resources/assets/botania/recipes/petal_14_double.json rename to src/main/resources/assets/botania/recipes/petal_red_double.json index 01037c46d..1c97155ff 100644 --- a/src/main/resources/assets/botania/recipes/petal_14_double.json +++ b/src/main/resources/assets/botania/recipes/petal_red_double.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 14, + "item": "botania:petal_red", "count": 4 }, "group": "botania:petal_double", diff --git a/src/main/resources/assets/botania/recipes/petal_8.json b/src/main/resources/assets/botania/recipes/petal_silver.json similarity index 79% rename from src/main/resources/assets/botania/recipes/petal_8.json rename to src/main/resources/assets/botania/recipes/petal_silver.json index eedf15370..4d8e444fe 100644 --- a/src/main/resources/assets/botania/recipes/petal_8.json +++ b/src/main/resources/assets/botania/recipes/petal_silver.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 8, + "item": "botania:petal_silver", "count": 2 }, "group": "botania:petal", diff --git a/src/main/resources/assets/botania/recipes/petal_8_double.json b/src/main/resources/assets/botania/recipes/petal_silver_double.json similarity index 80% rename from src/main/resources/assets/botania/recipes/petal_8_double.json rename to src/main/resources/assets/botania/recipes/petal_silver_double.json index 6a5a9f38a..a88977354 100644 --- a/src/main/resources/assets/botania/recipes/petal_8_double.json +++ b/src/main/resources/assets/botania/recipes/petal_silver_double.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 8, + "item": "botania:petal_silver", "count": 4 }, "group": "botania:petal_double", diff --git a/src/main/resources/assets/botania/recipes/petal_0.json b/src/main/resources/assets/botania/recipes/petal_white.json similarity index 79% rename from src/main/resources/assets/botania/recipes/petal_0.json rename to src/main/resources/assets/botania/recipes/petal_white.json index 3fe8e825d..d1526d540 100644 --- a/src/main/resources/assets/botania/recipes/petal_0.json +++ b/src/main/resources/assets/botania/recipes/petal_white.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 0, + "item": "botania:petal_white", "count": 2 }, "group": "botania:petal", diff --git a/src/main/resources/assets/botania/recipes/petal_0_double.json b/src/main/resources/assets/botania/recipes/petal_white_double.json similarity index 80% rename from src/main/resources/assets/botania/recipes/petal_0_double.json rename to src/main/resources/assets/botania/recipes/petal_white_double.json index cf2b4f1af..bee88b06c 100644 --- a/src/main/resources/assets/botania/recipes/petal_0_double.json +++ b/src/main/resources/assets/botania/recipes/petal_white_double.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 0, + "item": "botania:petal_white", "count": 4 }, "group": "botania:petal_double", diff --git a/src/main/resources/assets/botania/recipes/petal_4.json b/src/main/resources/assets/botania/recipes/petal_yellow.json similarity index 79% rename from src/main/resources/assets/botania/recipes/petal_4.json rename to src/main/resources/assets/botania/recipes/petal_yellow.json index 276643a50..df9607497 100644 --- a/src/main/resources/assets/botania/recipes/petal_4.json +++ b/src/main/resources/assets/botania/recipes/petal_yellow.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 4, + "item": "botania:petal_yellow", "count": 2 }, "group": "botania:petal", diff --git a/src/main/resources/assets/botania/recipes/petal_4_double.json b/src/main/resources/assets/botania/recipes/petal_yellow_double.json similarity index 80% rename from src/main/resources/assets/botania/recipes/petal_4_double.json rename to src/main/resources/assets/botania/recipes/petal_yellow_double.json index b4250069d..11cdd1acb 100644 --- a/src/main/resources/assets/botania/recipes/petal_4_double.json +++ b/src/main/resources/assets/botania/recipes/petal_yellow_double.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petal", - "data": 4, + "item": "botania:petal_yellow", "count": 4 }, "group": "botania:petal_double",