diff --git a/block_flattening_notes.txt b/block_flattening_notes.txt index a5a43de87..1ca8a4c03 100644 --- a/block_flattening_notes.txt +++ b/block_flattening_notes.txt @@ -54,4 +54,8 @@ reason: each is a different variant. mossy moved from actual state read from TE botania:opencrate[variant={open, crafty}, pattern={..}] => botania:opencrate => botania:craftcrate[pattern={..}] -reason: split open and crafty crate. Crafty patterns can stay blockstate properties since a pattern can only be changed by using an item on a existing crate \ No newline at end of file +reason: split open and crafty crate. Crafty patterns can stay blockstate properties since a pattern can only be changed by using an item on a existing crate + +botania:petalblock[color={16 colors}] +=> botania:{color}_petal_block +reason: each is a different variant 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 93a760bec..c1256ada1 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -22,6 +22,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockCamo; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.decor.BlockPetalBlock; import vazkii.botania.common.block.mana.BlockPool; import vazkii.botania.common.block.tile.TileCamo; import vazkii.botania.common.block.tile.mana.TilePool; @@ -72,11 +73,11 @@ public final class ColorHandler { ); // Petal Block - blocks.registerBlockColorHandler((state, world, pos, tintIndex) -> { - int meta = ModBlocks.petalBlock.getMetaFromState(state); - return EnumDyeColor.byMetadata(meta).getColorValue(); - }, - ModBlocks.petalBlock + blocks.registerBlockColorHandler((state, world, pos, tintIndex) -> ((BlockPetalBlock) state.getBlock()).color.getColorValue(), + ModBlocks.petalBlockWhite, ModBlocks.petalBlockOrange, ModBlocks.petalBlockMagenta, ModBlocks.petalBlockLightBlue, + ModBlocks.petalBlockYellow, ModBlocks.petalBlockLime, ModBlocks.petalBlockPink, ModBlocks.petalBlockGray, + ModBlocks.petalBlockSilver, ModBlocks.petalBlockCyan, ModBlocks.petalBlockPurple, ModBlocks.petalBlockBlue, + ModBlocks.petalBlockBrown, ModBlocks.petalBlockGreen, ModBlocks.petalBlockRed, ModBlocks.petalBlockBlack ); // Platforms @@ -114,7 +115,11 @@ public final class ColorHandler { 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.manaPool, ModBlocks.creativePool, ModBlocks.dilutedPool, ModBlocks.fabulousPool, ModBlocks.gaiaSpreader); + ModBlocks.petalBlockWhite, ModBlocks.petalBlockOrange, ModBlocks.petalBlockMagenta, ModBlocks.petalBlockLightBlue, + ModBlocks.petalBlockYellow, ModBlocks.petalBlockLime, ModBlocks.petalBlockPink, ModBlocks.petalBlockGray, + ModBlocks.petalBlockSilver, ModBlocks.petalBlockCyan, ModBlocks.petalBlockPurple, ModBlocks.petalBlockBlue, + ModBlocks.petalBlockBrown, ModBlocks.petalBlockGreen, ModBlocks.petalBlockRed, ModBlocks.petalBlockBlack, + ModBlocks.manaPool, ModBlocks.creativePool, ModBlocks.dilutedPool, ModBlocks.fabulousPool, ModBlocks.gaiaSpreader); items.registerItemColorHandler((s, t) -> t == 1 ? Color.HSBtoRGB(0.528F, (float) ((ItemManaMirror) ModItems.manaMirror).getMana(s) / (float) TilePool.MAX_MANA, 1F) : -1, ModItems.manaMirror); diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 38b4e6920..834fd07c1 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockDispenser; import net.minecraft.init.Blocks; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -216,7 +217,22 @@ public final class ModBlocks { public static final Block manaFlame = new BlockManaFlame(); public static final Block prism = new BlockPrism(); public static final Block enchantedSoil = new BlockEnchantedSoil(); - public static final Block petalBlock = new BlockPetalBlock(); + public static final Block petalBlockWhite = new BlockPetalBlock(EnumDyeColor.WHITE); + public static final Block petalBlockOrange = new BlockPetalBlock(EnumDyeColor.ORANGE); + public static final Block petalBlockMagenta = new BlockPetalBlock(EnumDyeColor.MAGENTA); + public static final Block petalBlockLightBlue = new BlockPetalBlock(EnumDyeColor.LIGHT_BLUE); + public static final Block petalBlockYellow = new BlockPetalBlock(EnumDyeColor.YELLOW); + public static final Block petalBlockLime = new BlockPetalBlock(EnumDyeColor.LIME); + public static final Block petalBlockPink = new BlockPetalBlock(EnumDyeColor.PINK); + public static final Block petalBlockGray = new BlockPetalBlock(EnumDyeColor.GRAY); + public static final Block petalBlockSilver = new BlockPetalBlock(EnumDyeColor.SILVER); + public static final Block petalBlockCyan = new BlockPetalBlock(EnumDyeColor.CYAN); + public static final Block petalBlockPurple = new BlockPetalBlock(EnumDyeColor.PURPLE); + public static final Block petalBlockBlue = new BlockPetalBlock(EnumDyeColor.BLUE); + public static final Block petalBlockBrown = new BlockPetalBlock(EnumDyeColor.BROWN); + public static final Block petalBlockGreen = new BlockPetalBlock(EnumDyeColor.GREEN); + public static final Block petalBlockRed = new BlockPetalBlock(EnumDyeColor.RED); + public static final Block petalBlockBlack = new BlockPetalBlock(EnumDyeColor.BLACK); public static final Block corporeaIndex = new BlockCorporeaIndex(); public static final Block corporeaFunnel = new BlockCorporeaFunnel(); public static final Block mushroom = new BlockModMushroom(); @@ -350,7 +366,22 @@ public final class ModBlocks { r.register(manaFlame); r.register(prism); r.register(enchantedSoil); - r.register(petalBlock); + r.register(petalBlockWhite); + r.register(petalBlockOrange); + r.register(petalBlockMagenta); + r.register(petalBlockLightBlue); + r.register(petalBlockYellow); + r.register(petalBlockLime); + r.register(petalBlockPink); + r.register(petalBlockGray); + r.register(petalBlockSilver); + r.register(petalBlockCyan); + r.register(petalBlockPurple); + r.register(petalBlockBlue); + r.register(petalBlockBrown); + r.register(petalBlockGreen); + r.register(petalBlockRed); + r.register(petalBlockBlack); r.register(corporeaIndex); r.register(corporeaFunnel); r.register(mushroom); @@ -484,7 +515,22 @@ public final class ModBlocks { r.register(new ItemBlockFloatingSpecialFlower(floatingSpecialFlower).setRegistryName(floatingSpecialFlower.getRegistryName())); r.register(new ItemBlockMod(prism).setRegistryName(prism.getRegistryName())); r.register(new ItemBlockMod(enchantedSoil).setRegistryName(enchantedSoil.getRegistryName())); - r.register(new ItemBlockWithMetadataAndName(petalBlock).setRegistryName(petalBlock.getRegistryName())); + r.register(new ItemBlockMod(petalBlockWhite).setRegistryName(petalBlockWhite.getRegistryName())); + r.register(new ItemBlockMod(petalBlockOrange).setRegistryName(petalBlockOrange.getRegistryName())); + r.register(new ItemBlockMod(petalBlockMagenta).setRegistryName(petalBlockMagenta.getRegistryName())); + r.register(new ItemBlockMod(petalBlockLightBlue).setRegistryName(petalBlockLightBlue.getRegistryName())); + r.register(new ItemBlockMod(petalBlockYellow).setRegistryName(petalBlockYellow.getRegistryName())); + r.register(new ItemBlockMod(petalBlockLime).setRegistryName(petalBlockLime.getRegistryName())); + r.register(new ItemBlockMod(petalBlockPink).setRegistryName(petalBlockPink.getRegistryName())); + r.register(new ItemBlockMod(petalBlockGray).setRegistryName(petalBlockGray.getRegistryName())); + r.register(new ItemBlockMod(petalBlockSilver).setRegistryName(petalBlockSilver.getRegistryName())); + r.register(new ItemBlockMod(petalBlockCyan).setRegistryName(petalBlockCyan.getRegistryName())); + r.register(new ItemBlockMod(petalBlockPurple).setRegistryName(petalBlockPurple.getRegistryName())); + r.register(new ItemBlockMod(petalBlockBlue).setRegistryName(petalBlockBlue.getRegistryName())); + r.register(new ItemBlockMod(petalBlockBrown).setRegistryName(petalBlockBrown.getRegistryName())); + r.register(new ItemBlockMod(petalBlockGreen).setRegistryName(petalBlockGreen.getRegistryName())); + r.register(new ItemBlockMod(petalBlockRed).setRegistryName(petalBlockRed.getRegistryName())); + r.register(new ItemBlockMod(petalBlockBlack).setRegistryName(petalBlockBlack.getRegistryName())); r.register(new ItemBlockMod(corporeaIndex).setRegistryName(corporeaIndex.getRegistryName())); r.register(new ItemBlockMod(corporeaFunnel).setRegistryName(corporeaFunnel.getRegistryName())); r.register(new ItemBlockWithMetadataAndName(mushroom).setRegistryName(mushroom.getRegistryName())); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java index b9fe84277..ed3cc9285 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -37,54 +37,16 @@ import javax.annotation.Nonnull; public class BlockPetalBlock extends BlockMod implements ILexiconable { - public BlockPetalBlock() { - super(Material.PLANTS, LibBlockNames.PETAL_BLOCK); + public final EnumDyeColor color; + public BlockPetalBlock(EnumDyeColor color) { + super(Material.PLANTS, color.getName() + LibBlockNames.PETAL_BLOCK_SUFFIX); setHardness(0.4F); setSoundType(SoundType.PLANT); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); - } - - @Nonnull - @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, BotaniaStateProps.COLOR); - } - - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.COLOR).getMetadata(); - } - - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta >= EnumDyeColor.values().length) { - meta = 0; - } - return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); - } - - @Override - public void getSubBlocks(CreativeTabs tab, NonNullList list) { - for(int i = 0; i < 16; i++) - list.add(new ItemStack(this, 1, i)); - } - - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); + this.color = color; } @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.flowers; } - - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).build()); - ModelHandler.registerBlockToState(this, EnumDyeColor.values().length); - } - } diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index eee62c573..6fbde020c 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -418,7 +418,22 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.shinyFlower); addBlock(ModBlocks.floatingFlower); addBlock(ModBlocks.floatingSpecialFlower); - addBlock(ModBlocks.petalBlock); + addBlock(ModBlocks.petalBlockWhite); + addBlock(ModBlocks.petalBlockOrange); + addBlock(ModBlocks.petalBlockMagenta); + addBlock(ModBlocks.petalBlockLightBlue); + addBlock(ModBlocks.petalBlockYellow); + addBlock(ModBlocks.petalBlockLime); + addBlock(ModBlocks.petalBlockPink); + addBlock(ModBlocks.petalBlockGray); + addBlock(ModBlocks.petalBlockSilver); + addBlock(ModBlocks.petalBlockCyan); + addBlock(ModBlocks.petalBlockPurple); + addBlock(ModBlocks.petalBlockBlue); + addBlock(ModBlocks.petalBlockBrown); + addBlock(ModBlocks.petalBlockGreen); + addBlock(ModBlocks.petalBlockRed); + addBlock(ModBlocks.petalBlockBlack); addBlock(ModBlocks.mushroom); addBlock(ModBlocks.blazeBlock); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index c7600dbbd..39bc2b703 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -420,7 +420,7 @@ public final class ModCraftingRecipes { recipeFertilizerPowder = gogPath("fertilizer_powder"); recipeFerilizerDye = path("fertilizer_dye"); recipesPetalsDouble = allOfGroup("petal_double"); - recipesPetalBlocks = allOfGroup(ModBlocks.petalBlock.getRegistryName()); + recipesPetalBlocks = allOfGroup("petal_block"); recipesReversePetalBlocks = allOfGroup("petal_block_deconstruct"); recipeApothecary = ModBlocks.defaultAltar.getRegistryName(); diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index 13eb83615..6d48e1cad 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -208,6 +208,7 @@ public class FlattenItems implements IFixableData { case 3: return ModBlocks.gaiaSpreader.getRegistryName().toString(); } }); + LOOKUP.put("botania:petalblock", i -> LibMisc.MOD_ID + ":" + EnumDyeColor.byMetadata(i).getName() + LibBlockNames.PETAL_BLOCK_SUFFIX); } @Override diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index 5ad927bb7..ecb10d04b 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -74,7 +74,7 @@ public final class LibBlockNames { public static final String ENCHANTED_SOIL = "enchantedSoil"; public static final String BIOME_STONE_A = "biomeStoneA"; public static final String BIOME_STONE_B = "biomeStoneB"; - public static final String PETAL_BLOCK = "petalBlock"; + public static final String PETAL_BLOCK_SUFFIX = "_petal_block"; public static final String CORPOREA_INDEX = "corporeaIndex"; public static final String CORPOREA_FUNNEL = "corporeaFunnel"; public static final String END_STONE_BRICK = "endStoneBrick"; diff --git a/src/main/resources/assets/botania/blockstates/petalblock.json b/src/main/resources/assets/botania/blockstates/black_petal_block.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/petalblock.json rename to src/main/resources/assets/botania/blockstates/black_petal_block.json diff --git a/src/main/resources/assets/botania/blockstates/blue_petal_block.json b/src/main/resources/assets/botania/blockstates/blue_petal_block.json new file mode 100644 index 000000000..c2e7134c7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/blue_petal_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:petal_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/brown_petal_block.json b/src/main/resources/assets/botania/blockstates/brown_petal_block.json new file mode 100644 index 000000000..c2e7134c7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/brown_petal_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:petal_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/cyan_petal_block.json b/src/main/resources/assets/botania/blockstates/cyan_petal_block.json new file mode 100644 index 000000000..c2e7134c7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/cyan_petal_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:petal_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/gray_petal_block.json b/src/main/resources/assets/botania/blockstates/gray_petal_block.json new file mode 100644 index 000000000..c2e7134c7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/gray_petal_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:petal_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/green_petal_block.json b/src/main/resources/assets/botania/blockstates/green_petal_block.json new file mode 100644 index 000000000..c2e7134c7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/green_petal_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:petal_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/light_blue_petal_block.json b/src/main/resources/assets/botania/blockstates/light_blue_petal_block.json new file mode 100644 index 000000000..c2e7134c7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/light_blue_petal_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:petal_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/lime_petal_block.json b/src/main/resources/assets/botania/blockstates/lime_petal_block.json new file mode 100644 index 000000000..c2e7134c7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/lime_petal_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:petal_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/magenta_petal_block.json b/src/main/resources/assets/botania/blockstates/magenta_petal_block.json new file mode 100644 index 000000000..c2e7134c7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/magenta_petal_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:petal_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/orange_petal_block.json b/src/main/resources/assets/botania/blockstates/orange_petal_block.json new file mode 100644 index 000000000..c2e7134c7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/orange_petal_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:petal_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pink_petal_block.json b/src/main/resources/assets/botania/blockstates/pink_petal_block.json new file mode 100644 index 000000000..c2e7134c7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pink_petal_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:petal_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/purple_petal_block.json b/src/main/resources/assets/botania/blockstates/purple_petal_block.json new file mode 100644 index 000000000..c2e7134c7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/purple_petal_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:petal_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/red_petal_block.json b/src/main/resources/assets/botania/blockstates/red_petal_block.json new file mode 100644 index 000000000..c2e7134c7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/red_petal_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:petal_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/silver_petal_block.json b/src/main/resources/assets/botania/blockstates/silver_petal_block.json new file mode 100644 index 000000000..c2e7134c7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/silver_petal_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:petal_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/white_petal_block.json b/src/main/resources/assets/botania/blockstates/white_petal_block.json new file mode 100644 index 000000000..c2e7134c7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/white_petal_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:petal_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/yellow_petal_block.json b/src/main/resources/assets/botania/blockstates/yellow_petal_block.json new file mode 100644 index 000000000..c2e7134c7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/yellow_petal_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:petal_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index 6a2a2106b..53d4c54bb 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -967,22 +967,22 @@ tile.botania:biomeStoneB4SlabFull.name=Metamorphic Swamp Stone Brick Slab tile.botania:biomeStoneB5SlabFull.name=Metamorphic Desert Stone Brick Slab tile.botania:biomeStoneB6SlabFull.name=Metamorphic Taiga Stone Brick Slab tile.botania:biomeStoneB7SlabFull.name=Metamorphic Mesa Stone Bricks Slab -tile.botania:petalBlock0.name=White Petal Block -tile.botania:petalBlock1.name=Orange Petal Block -tile.botania:petalBlock2.name=Magenta Petal Block -tile.botania:petalBlock3.name=Light Blue Petal Block -tile.botania:petalBlock4.name=Yellow Petal Block -tile.botania:petalBlock5.name=Lime Petal Block -tile.botania:petalBlock6.name=Pink Petal Block -tile.botania:petalBlock7.name=Gray Petal Block -tile.botania:petalBlock8.name=Light Gray Petal Block -tile.botania:petalBlock9.name=Cyan Petal Block -tile.botania:petalBlock10.name=Purple Petal Block -tile.botania:petalBlock11.name=Blue Petal Block -tile.botania:petalBlock12.name=Brown Petal Block -tile.botania:petalBlock13.name=Green Petal Block -tile.botania:petalBlock14.name=Red Petal Block -tile.botania:petalBlock15.name=Black Petal Block +tile.botania:white_petal_block.name=White Petal Block +tile.botania:orange_petal_block.name=Orange Petal Block +tile.botania:magenta_petal_block.name=Magenta Petal Block +tile.botania:light_blue_petal_block.name=Light Blue Petal Block +tile.botania:yellow_petal_block.name=Yellow Petal Block +tile.botania:lime_petal_block.name=Lime Petal Block +tile.botania:pink_petal_block.name=Pink Petal Block +tile.botania:gray_petal_block.name=Gray Petal Block +tile.botania:silver_petal_block.name=Light Gray Petal Block +tile.botania:cyan_petal_block.name=Cyan Petal Block +tile.botania:purple_petal_block.name=Purple Petal Block +tile.botania:blue_petal_block.name=Blue Petal Block +tile.botania:brown_petal_block.name=Brown Petal Block +tile.botania:green_petal_block.name=Green Petal Block +tile.botania:red_petal_block.name=Red Petal Block +tile.botania:black_petal_block.name=Black Petal Block tile.botania:corporeaIndex.name=Corporea Index tile.botania:corporeaFunnel.name=Corporea Funnel tile.botania:endStoneBrick0.name=End Stone Bricks diff --git a/src/main/resources/assets/botania/lang/es_es.lang b/src/main/resources/assets/botania/lang/es_es.lang index dd3da2046..13ce0604c 100644 --- a/src/main/resources/assets/botania/lang/es_es.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -796,22 +796,22 @@ tile.botania:biomeStoneB4Slab.name=Losa de ladrillos de piedra metamórfica de p tile.botania:biomeStoneB5Slab.name=Losa de ladrillos de piedra metamórfica de desierto tile.botania:biomeStoneB6Slab.name=Losa de ladrillos de piedra metamórfica de Taiga tile.botania:biomeStoneB7Slab.name=Losa de ladrillos de piedra metamórfica de mesa -tile.botania:petalBlock0.name=Bloque de pétalos blancos -tile.botania:petalBlock1.name=Bloque de pétalos naranjas -tile.botania:petalBlock2.name=Bloque de pétalos magentas -tile.botania:petalBlock3.name=Bloque de pétalos azules claros -tile.botania:petalBlock4.name=Bloque de pétalos amarillos -tile.botania:petalBlock5.name=Bloque de pétalos lima -tile.botania:petalBlock6.name=Bloque de pétalos rosas -tile.botania:petalBlock7.name=Bloque de pétalos grises -tile.botania:petalBlock8.name=Bloque de pétalos grises claros -tile.botania:petalBlock9.name=Bloque de pétalos cian -tile.botania:petalBlock10.name=Bloque de pétalos púrpuras -tile.botania:petalBlock11.name=Bloque de pétalos azules -tile.botania:petalBlock12.name=Bloque de pétalos marrones -tile.botania:petalBlock13.name=Bloque de pétalos verdes -tile.botania:petalBlock14.name=Bloque de pétalos rojos -tile.botania:petalBlock15.name=Bloque de pétalos negros +tile.botania:white_petal_block.name=Bloque de pétalos blancos +tile.botania:orange_petal_block.name=Bloque de pétalos naranjas +tile.botania:magenta_petal_block.name=Bloque de pétalos magentas +tile.botania:light_blue_petal_block.name=Bloque de pétalos azules claros +tile.botania:yellow_petal_block.name=Bloque de pétalos amarillos +tile.botania:lime_petal_block.name=Bloque de pétalos lima +tile.botania:pink_petal_block.name=Bloque de pétalos rosas +tile.botania:gray_petal_block.name=Bloque de pétalos grises +tile.botania:silver_petal_block.name=Bloque de pétalos grises claros +tile.botania:cyan_petal_block.name=Bloque de pétalos cian +tile.botania:purple_petal_block.name=Bloque de pétalos púrpuras +tile.botania:blue_petal_block.name=Bloque de pétalos azules +tile.botania:brown_petal_block.name=Bloque de pétalos marrones +tile.botania:green_petal_block.name=Bloque de pétalos verdes +tile.botania:red_petal_block.name=Bloque de pétalos rojos +tile.botania:black_petal_block.name=Bloque de pétalos negros tile.botania:corporeaIndex.name=Índice de corporea tile.botania:corporeaFunnel.name=Embudo de corporea tile.botania:endStoneBrick0.name=Ladrillos de piedra del Fin diff --git a/src/main/resources/assets/botania/lang/fr_fr.lang b/src/main/resources/assets/botania/lang/fr_fr.lang index 90194f528..701fb0886 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -722,22 +722,22 @@ tile.botania:biomeStoneB4Slab.name=Dalle de brique de roche métamorphique des m tile.botania:biomeStoneB5Slab.name=Dalle de brique de roche métamorphique des déserts tile.botania:biomeStoneB6Slab.name=Dalle de brique de roche métamorphique des taigas tile.botania:biomeStoneB7Slab.name=Dalle de brique de roche métamorphique des mesas -tile.botania:petalBlock0.name=Bloc de pétale blanche -tile.botania:petalBlock1.name=Bloc de pétale orange -tile.botania:petalBlock2.name=Bloc de pétale magenta -tile.botania:petalBlock3.name=Bloc de pétale bleue claire -tile.botania:petalBlock4.name=Bloc de pétale jaune -tile.botania:petalBlock5.name=Bloc de pétale citron -tile.botania:petalBlock6.name=Bloc de pétale rose -tile.botania:petalBlock7.name=Bloc de pétale grise -tile.botania:petalBlock8.name=Bloc de pétale grise claire -tile.botania:petalBlock9.name=Bloc de pétale cyan -tile.botania:petalBlock10.name=Bloc de pétale violette -tile.botania:petalBlock11.name=Bloc de pétale bleue -tile.botania:petalBlock12.name=Bloc de pétale marron -tile.botania:petalBlock13.name=Bloc de pétale verte -tile.botania:petalBlock14.name=Bloc de pétale rouge -tile.botania:petalBlock15.name=Bloc de pétale noire +tile.botania:white_petal_block.name=Bloc de pétale blanche +tile.botania:orange_petal_block.name=Bloc de pétale orange +tile.botania:magenta_petal_block.name=Bloc de pétale magenta +tile.botania:light_blue_petal_block.name=Bloc de pétale bleue claire +tile.botania:yellow_petal_block.name=Bloc de pétale jaune +tile.botania:lime_petal_block.name=Bloc de pétale citron +tile.botania:pink_petal_block.name=Bloc de pétale rose +tile.botania:gray_petal_block.name=Bloc de pétale grise +tile.botania:silver_petal_block.name=Bloc de pétale grise claire +tile.botania:cyan_petal_block.name=Bloc de pétale cyan +tile.botania:purple_petal_block.name=Bloc de pétale violette +tile.botania:blue_petal_block.name=Bloc de pétale bleue +tile.botania:brown_petal_block.name=Bloc de pétale marron +tile.botania:green_petal_block.name=Bloc de pétale verte +tile.botania:red_petal_block.name=Bloc de pétale rouge +tile.botania:black_petal_block.name=Bloc de pétale noire tile.botania:corporeaIndex.name=Index de Corporea tile.botania:corporeaFunnel.name=Cheminée de Corporea tile.botania:endStoneBrick0.name=Brique de pierre du vide diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index 50d10d09b..71d6c6826 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -756,22 +756,22 @@ tile.botania:biomeStoneB4SlabFull.name=沼に変質した石レンガのハー tile.botania:biomeStoneB5SlabFull.name=砂漠に変質した石レンガのハーフブロック tile.botania:biomeStoneB6SlabFull.name=タイガに変質した石レンガのハーフブロック tile.botania:biomeStoneB7SlabFull.name=メサに変質した石レンガのハーフブロック -tile.botania:petalBlock0.name=白色の花びらブロック -tile.botania:petalBlock1.name=橙色の花びらブロック -tile.botania:petalBlock2.name=赤紫色の花びらブロック -tile.botania:petalBlock3.name=空色の花びらブロック -tile.botania:petalBlock4.name=黄色の花びらブロック -tile.botania:petalBlock5.name=黄緑色の花びらブロック -tile.botania:petalBlock6.name=桃色の花びらブロック -tile.botania:petalBlock7.name=灰色の花びらブロック -tile.botania:petalBlock8.name=薄灰色の花びらブロック -tile.botania:petalBlock9.name=水色の花びらブロック -tile.botania:petalBlock10.name=紫色の花びらブロック -tile.botania:petalBlock11.name=青色の花びらブロック -tile.botania:petalBlock12.name=茶色の花びらブロック -tile.botania:petalBlock13.name=緑色の花びらブロック -tile.botania:petalBlock14.name=赤色の花びらブロック -tile.botania:petalBlock15.name=黒色の花びらブロック +tile.botania:white_petal_block.name=白色の花びらブロック +tile.botania:orange_petal_block.name=橙色の花びらブロック +tile.botania:magenta_petal_block.name=赤紫色の花びらブロック +tile.botania:light_blue_petal_block.name=空色の花びらブロック +tile.botania:yellow_petal_block.name=黄色の花びらブロック +tile.botania:lime_petal_block.name=黄緑色の花びらブロック +tile.botania:pink_petal_block.name=桃色の花びらブロック +tile.botania:gray_petal_block.name=灰色の花びらブロック +tile.botania:silver_petal_block.name=薄灰色の花びらブロック +tile.botania:cyan_petal_block.name=水色の花びらブロック +tile.botania:purple_petal_block.name=紫色の花びらブロック +tile.botania:blue_petal_block.name=青色の花びらブロック +tile.botania:brown_petal_block.name=茶色の花びらブロック +tile.botania:green_petal_block.name=緑色の花びらブロック +tile.botania:red_petal_block.name=赤色の花びらブロック +tile.botania:black_petal_block.name=黒色の花びらブロック tile.botania:corporeaIndex.name=コーポリア見出し tile.botania:corporeaFunnel.name=コーポリア漏斗 tile.botania:endStoneBrick0.name=エンドストーンレンガ diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index 7dfd09e93..4ee77e872 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -761,22 +761,22 @@ tile.botania:biomeStoneB4Slab.name=변성습지 석재벽돌 반블럭 tile.botania:biomeStoneB5Slab.name=변성황야 석재벽돌 반블럭 tile.botania:biomeStoneB6Slab.name=변성침엽수림 석재벽돌 반블럭 tile.botania:biomeStoneB7Slab.name=변성메사 석재벽돌 반블럭 -tile.botania:petalBlock0.name=하얀색 꽃잎 블럭 -tile.botania:petalBlock1.name=주황색 꽃잎 블럭 -tile.botania:petalBlock2.name=자홍색 꽃잎 블럭 -tile.botania:petalBlock3.name=하늘색 꽃잎 블럭 -tile.botania:petalBlock4.name=노랑색 꽃잎 블럭 -tile.botania:petalBlock5.name=연두색 꽃잎 블럭 -tile.botania:petalBlock6.name=분홍색 꽃잎 블럭 -tile.botania:petalBlock7.name=회색 꽃잎 블럭 -tile.botania:petalBlock8.name=밝은 회색 꽃잎 블럭 -tile.botania:petalBlock9.name=청록색 꽃잎 블럭 -tile.botania:petalBlock10.name=보라색 꽃잎 블럭 -tile.botania:petalBlock11.name=파랑색 꽃잎 블럭 -tile.botania:petalBlock12.name=갈색 꽃잎 블럭 -tile.botania:petalBlock13.name=초록색 꽃잎 블럭 -tile.botania:petalBlock14.name=빨강색 꽃잎 블럭 -tile.botania:petalBlock15.name=검은색 꽃잎 블럭 +tile.botania:white_petal_block.name=하얀색 꽃잎 블럭 +tile.botania:orange_petal_block.name=주황색 꽃잎 블럭 +tile.botania:magenta_petal_block.name=자홍색 꽃잎 블럭 +tile.botania:light_blue_petal_block.name=하늘색 꽃잎 블럭 +tile.botania:yellow_petal_block.name=노랑색 꽃잎 블럭 +tile.botania:lime_petal_block.name=연두색 꽃잎 블럭 +tile.botania:pink_petal_block.name=분홍색 꽃잎 블럭 +tile.botania:gray_petal_block.name=회색 꽃잎 블럭 +tile.botania:silver_petal_block.name=밝은 회색 꽃잎 블럭 +tile.botania:cyan_petal_block.name=청록색 꽃잎 블럭 +tile.botania:purple_petal_block.name=보라색 꽃잎 블럭 +tile.botania:blue_petal_block.name=파랑색 꽃잎 블럭 +tile.botania:brown_petal_block.name=갈색 꽃잎 블럭 +tile.botania:green_petal_block.name=초록색 꽃잎 블럭 +tile.botania:red_petal_block.name=빨강색 꽃잎 블럭 +tile.botania:black_petal_block.name=검은색 꽃잎 블럭 tile.botania:endStoneBrick0.name=엔더 석재벽돌 tile.botania:endStoneBrick1.name=조각된 엔더 석재벽돌 tile.botania:endStoneBrick2.name=엔더 벽돌 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index e8a7d8c41..ff59e786f 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -829,22 +829,22 @@ tile.botania:biomeStoneB4SlabFull.name=Veranderlijke Moerassteen Baksteen Plaat tile.botania:biomeStoneB5SlabFull.name=Veranderlijke Woestijnsteen Baksteen Plaat tile.botania:biomeStoneB6SlabFull.name=Veranderlijke Winterwoudsteen Baksteen Plaat tile.botania:biomeStoneB7SlabFull.name=Veranderlijke Hoogvlaktesteen Baksteen Plaat -tile.botania:petalBlock0.name=Wit Bloemblad Blok -tile.botania:petalBlock1.name=Oranje Bloemblad Blok -tile.botania:petalBlock2.name=Magenta Bloemblad Blok -tile.botania:petalBlock3.name=Lichtblauw Bloemblad Blok -tile.botania:petalBlock4.name=Geel Bloemblad Blok -tile.botania:petalBlock5.name=Lichtgroen Bloemblad Blok -tile.botania:petalBlock6.name=Roze Bloemblad Blok -tile.botania:petalBlock7.name=Grijs Bloemblad Blok -tile.botania:petalBlock8.name=Lichtgrijs Bloemblad Blok -tile.botania:petalBlock9.name=Blauwgroen Bloemblad Blok -tile.botania:petalBlock10.name=Paars Bloemblad Blok -tile.botania:petalBlock11.name=Blauw Bloemblad Blok -tile.botania:petalBlock12.name=Bruin Bloemblad Blok -tile.botania:petalBlock13.name=Groen Bloemblad Blok -tile.botania:petalBlock14.name=Rood Bloemblad Blok -tile.botania:petalBlock15.name=Zwart Bloemblad Blok +tile.botania:white_petal_block.name=Wit Bloemblad Blok +tile.botania:orange_petal_block.name=Oranje Bloemblad Blok +tile.botania:magenta_petal_block.name=Magenta Bloemblad Blok +tile.botania:light_blue_petal_block.name=Lichtblauw Bloemblad Blok +tile.botania:yellow_petal_block.name=Geel Bloemblad Blok +tile.botania:lime_petal_block.name=Lichtgroen Bloemblad Blok +tile.botania:pink_petal_block.name=Roze Bloemblad Blok +tile.botania:gray_petal_block.name=Grijs Bloemblad Blok +tile.botania:silver_petal_block.name=Lichtgrijs Bloemblad Blok +tile.botania:cyan_petal_block.name=Blauwgroen Bloemblad Blok +tile.botania:purple_petal_block.name=Paars Bloemblad Blok +tile.botania:blue_petal_block.name=Blauw Bloemblad Blok +tile.botania:brown_petal_block.name=Bruin Bloemblad Blok +tile.botania:green_petal_block.name=Groen Bloemblad Blok +tile.botania:red_petal_block.name=Rood Bloemblad Blok +tile.botania:black_petal_block.name=Zwart Bloemblad Blok tile.botania:corporeaIndex.name=Corporea Index tile.botania:corporeaFunnel.name=Corporea Trechter tile.botania:endStoneBrick0.name=Endsteen Bakstenen diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index 4a463db7a..d86d44786 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -972,22 +972,22 @@ tile.botania:biomeStoneB4SlabFull.name=Laje de Tijolos Metamórficos - Pântano tile.botania:biomeStoneB5SlabFull.name=Laje de Tijolos Metamórficos - Deserto tile.botania:biomeStoneB6SlabFull.name=Laje de Tijolos Metamórficos - Taiga tile.botania:biomeStoneB7SlabFull.name=Laje de Tijolos Metamórficos - Mesa -tile.botania:petalBlock0.name=Bloco de Pétalas Branco -tile.botania:petalBlock1.name=Bloco de Pétalas Laranja -tile.botania:petalBlock2.name=Bloco de Pétalas Magenta -tile.botania:petalBlock3.name=Bloco de Pétalas Azul Claro -tile.botania:petalBlock4.name=Bloco de Pétalas Amarelo -tile.botania:petalBlock5.name=Bloco de Pétalas Lima -tile.botania:petalBlock6.name=Bloco de Pétalas Rosa -tile.botania:petalBlock7.name=Bloco de Pétalas Cinza -tile.botania:petalBlock8.name=Bloco de Pétalas Cinza Claro -tile.botania:petalBlock9.name=Bloco de Pétalas Ciano -tile.botania:petalBlock10.name=Bloco de Pétalas Roxo -tile.botania:petalBlock11.name=Bloco de Pétalas Azul -tile.botania:petalBlock12.name=Bloco de Pétalas Marrom -tile.botania:petalBlock13.name=Bloco de Pétalas Verde -tile.botania:petalBlock14.name=Bloco de Pétalas Vermelho -tile.botania:petalBlock15.name=Bloco de Pétalas Preto +tile.botania:white_petal_block.name=Bloco de Pétalas Branco +tile.botania:orange_petal_block.name=Bloco de Pétalas Laranja +tile.botania:magenta_petal_block.name=Bloco de Pétalas Magenta +tile.botania:light_blue_petal_block.name=Bloco de Pétalas Azul Claro +tile.botania:yellow_petal_block.name=Bloco de Pétalas Amarelo +tile.botania:lime_petal_block.name=Bloco de Pétalas Lima +tile.botania:pink_petal_block.name=Bloco de Pétalas Rosa +tile.botania:gray_petal_block.name=Bloco de Pétalas Cinza +tile.botania:silver_petal_block.name=Bloco de Pétalas Cinza Claro +tile.botania:cyan_petal_block.name=Bloco de Pétalas Ciano +tile.botania:purple_petal_block.name=Bloco de Pétalas Roxo +tile.botania:blue_petal_block.name=Bloco de Pétalas Azul +tile.botania:brown_petal_block.name=Bloco de Pétalas Marrom +tile.botania:green_petal_block.name=Bloco de Pétalas Verde +tile.botania:red_petal_block.name=Bloco de Pétalas Vermelho +tile.botania:black_petal_block.name=Bloco de Pétalas Preto tile.botania:corporeaIndex.name=Índice Corporea tile.botania:corporeaFunnel.name=Exaustor Corporea tile.botania:endStoneBrick0.name=Tijolos de Pedra do Fim diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index a7080422a..e45c2a4b3 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -967,22 +967,22 @@ tile.botania:biomeStoneB4SlabFull.name=变质沼泽石砖台阶 tile.botania:biomeStoneB5SlabFull.name=变质沙漠石砖台阶 tile.botania:biomeStoneB6SlabFull.name=变质雪原石砖台阶 tile.botania:biomeStoneB7SlabFull.name=变质高原石砖台阶 -tile.botania:petalBlock0.name=白色花瓣块 -tile.botania:petalBlock1.name=橙色花瓣块 -tile.botania:petalBlock2.name=品红色花瓣块 -tile.botania:petalBlock3.name=淡蓝色花瓣块 -tile.botania:petalBlock4.name=黄色花瓣块 -tile.botania:petalBlock5.name=黄绿色花瓣块 -tile.botania:petalBlock6.name=粉色花瓣块 -tile.botania:petalBlock7.name=灰色花瓣块 -tile.botania:petalBlock8.name=淡灰色花瓣块 -tile.botania:petalBlock9.name=青色花瓣块 -tile.botania:petalBlock10.name=紫色花瓣块 -tile.botania:petalBlock11.name=蓝色花瓣块 -tile.botania:petalBlock12.name=棕色花瓣块 -tile.botania:petalBlock13.name=绿色花瓣块 -tile.botania:petalBlock14.name=红色花瓣块 -tile.botania:petalBlock15.name=黑色花瓣块 +tile.botania:white_petal_block.name=白色花瓣块 +tile.botania:orange_petal_block.name=橙色花瓣块 +tile.botania:magenta_petal_block.name=品红色花瓣块 +tile.botania:light_blue_petal_block.name=淡蓝色花瓣块 +tile.botania:yellow_petal_block.name=黄色花瓣块 +tile.botania:lime_petal_block.name=黄绿色花瓣块 +tile.botania:pink_petal_block.name=粉色花瓣块 +tile.botania:gray_petal_block.name=灰色花瓣块 +tile.botania:silver_petal_block.name=淡灰色花瓣块 +tile.botania:cyan_petal_block.name=青色花瓣块 +tile.botania:purple_petal_block.name=紫色花瓣块 +tile.botania:blue_petal_block.name=蓝色花瓣块 +tile.botania:brown_petal_block.name=棕色花瓣块 +tile.botania:green_petal_block.name=绿色花瓣块 +tile.botania:red_petal_block.name=红色花瓣块 +tile.botania:black_petal_block.name=黑色花瓣块 tile.botania:corporeaIndex.name=多媒体索引 tile.botania:corporeaFunnel.name=多媒体漏斗 tile.botania:endStoneBrick0.name=末地石砖 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index 24643ebd4..9c1a27028 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -936,22 +936,22 @@ tile.botania:biomeStoneB4SlabFull.name=變質沼澤石磚半磚 tile.botania:biomeStoneB5SlabFull.name=變質沙漠石磚半磚 tile.botania:biomeStoneB6SlabFull.name=變質雪原石磚半磚 tile.botania:biomeStoneB7SlabFull.name=變質高原石磚半磚 -tile.botania:petalBlock0.name=白色花瓣塊 -tile.botania:petalBlock1.name=橘色花瓣塊 -tile.botania:petalBlock2.name=洋紅色花瓣塊 -tile.botania:petalBlock3.name=淺藍色花瓣塊 -tile.botania:petalBlock4.name=黃色花瓣塊 -tile.botania:petalBlock5.name=淺綠色花瓣塊 -tile.botania:petalBlock6.name=粉色花瓣塊 -tile.botania:petalBlock7.name=灰色花瓣塊 -tile.botania:petalBlock8.name=淺灰色花瓣塊 -tile.botania:petalBlock9.name=青色花瓣塊 -tile.botania:petalBlock10.name=紫色花瓣塊 -tile.botania:petalBlock11.name=藍色花瓣塊 -tile.botania:petalBlock12.name=棕色花瓣塊 -tile.botania:petalBlock13.name=綠色花瓣塊 -tile.botania:petalBlock14.name=紅色花瓣塊 -tile.botania:petalBlock15.name=黑色花瓣塊 +tile.botania:white_petal_block.name=白色花瓣塊 +tile.botania:orange_petal_block.name=橘色花瓣塊 +tile.botania:magenta_petal_block.name=洋紅色花瓣塊 +tile.botania:light_blue_petal_block.name=淺藍色花瓣塊 +tile.botania:yellow_petal_block.name=黃色花瓣塊 +tile.botania:lime_petal_block.name=淺綠色花瓣塊 +tile.botania:pink_petal_block.name=粉色花瓣塊 +tile.botania:gray_petal_block.name=灰色花瓣塊 +tile.botania:silver_petal_block.name=淺灰色花瓣塊 +tile.botania:cyan_petal_block.name=青色花瓣塊 +tile.botania:purple_petal_block.name=紫色花瓣塊 +tile.botania:blue_petal_block.name=藍色花瓣塊 +tile.botania:brown_petal_block.name=棕色花瓣塊 +tile.botania:green_petal_block.name=綠色花瓣塊 +tile.botania:red_petal_block.name=紅色花瓣塊 +tile.botania:black_petal_block.name=黑色花瓣塊 tile.botania:corporeaIndex.name=多媒體索引 tile.botania:corporeaFunnel.name=多媒體漏斗 tile.botania:endStoneBrick0.name=終界石磚 diff --git a/src/main/resources/assets/botania/recipes/petalblock_15.json b/src/main/resources/assets/botania/recipes/black_petal_block.json similarity index 66% rename from src/main/resources/assets/botania/recipes/petalblock_15.json rename to src/main/resources/assets/botania/recipes/black_petal_block.json index 85f7c20e6..5f2b5385a 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_15.json +++ b/src/main/resources/assets/botania/recipes/black_petal_block.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petalblock", - "data": 15 + "item": "botania:black_petal_block" }, "pattern": [ "PPP", @@ -9,7 +8,7 @@ "PPP" ], "type": "forge:ore_shaped", - "group": "botania:petalblock", + "group": "botania:petal_block", "key": { "P": { "item": "#PETALBLACK" diff --git a/src/main/resources/assets/botania/recipes/petalblock_11.json b/src/main/resources/assets/botania/recipes/blue_petal_block.json similarity index 66% rename from src/main/resources/assets/botania/recipes/petalblock_11.json rename to src/main/resources/assets/botania/recipes/blue_petal_block.json index d1363e300..346118e86 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_11.json +++ b/src/main/resources/assets/botania/recipes/blue_petal_block.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petalblock", - "data": 11 + "item": "botania:blue_petal_block" }, "pattern": [ "PPP", @@ -9,7 +8,7 @@ "PPP" ], "type": "forge:ore_shaped", - "group": "botania:petalblock", + "group": "botania:petal_block", "key": { "P": { "item": "#PETALBLUE" diff --git a/src/main/resources/assets/botania/recipes/petalblock_12.json b/src/main/resources/assets/botania/recipes/brown_petal_block.json similarity index 66% rename from src/main/resources/assets/botania/recipes/petalblock_12.json rename to src/main/resources/assets/botania/recipes/brown_petal_block.json index eb31b746b..a83bb0b28 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_12.json +++ b/src/main/resources/assets/botania/recipes/brown_petal_block.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petalblock", - "data": 12 + "item": "botania:brown_petal_block" }, "pattern": [ "PPP", @@ -9,7 +8,7 @@ "PPP" ], "type": "forge:ore_shaped", - "group": "botania:petalblock", + "group": "botania:petal_block", "key": { "P": { "item": "#PETALBROWN" diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_15.json b/src/main/resources/assets/botania/recipes/conversions/black_petal_block_deconstruct.json similarity index 78% rename from src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_15.json rename to src/main/resources/assets/botania/recipes/conversions/black_petal_block_deconstruct.json index 7f1ab69a7..50f0fda4d 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_15.json +++ b/src/main/resources/assets/botania/recipes/conversions/black_petal_block_deconstruct.json @@ -6,8 +6,7 @@ "group": "botania:petal_block_deconstruct", "ingredients": [ { - "item": "botania:petalblock", - "data": 15 + "item": "botania:black_petal_block" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_11.json b/src/main/resources/assets/botania/recipes/conversions/blue_petal_block_deconstruct.json similarity index 78% rename from src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_11.json rename to src/main/resources/assets/botania/recipes/conversions/blue_petal_block_deconstruct.json index 115974907..59408d4f5 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_11.json +++ b/src/main/resources/assets/botania/recipes/conversions/blue_petal_block_deconstruct.json @@ -6,8 +6,7 @@ "group": "botania:petal_block_deconstruct", "ingredients": [ { - "item": "botania:petalblock", - "data": 11 + "item": "botania:blue_petal_block" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_12.json b/src/main/resources/assets/botania/recipes/conversions/brown_petal_block_deconstruct.json similarity index 78% rename from src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_12.json rename to src/main/resources/assets/botania/recipes/conversions/brown_petal_block_deconstruct.json index 74dc260b8..c18f7ec6f 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_12.json +++ b/src/main/resources/assets/botania/recipes/conversions/brown_petal_block_deconstruct.json @@ -6,8 +6,7 @@ "group": "botania:petal_block_deconstruct", "ingredients": [ { - "item": "botania:petalblock", - "data": 12 + "item": "botania:brown_petal_block" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_9.json b/src/main/resources/assets/botania/recipes/conversions/cyan_petal_block_deconstruct.json similarity index 78% rename from src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_9.json rename to src/main/resources/assets/botania/recipes/conversions/cyan_petal_block_deconstruct.json index 7c6308f87..a821c35bd 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_9.json +++ b/src/main/resources/assets/botania/recipes/conversions/cyan_petal_block_deconstruct.json @@ -6,8 +6,7 @@ "group": "botania:petal_block_deconstruct", "ingredients": [ { - "item": "botania:petalblock", - "data": 9 + "item": "botania:cyan_petal_block" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_7.json b/src/main/resources/assets/botania/recipes/conversions/gray_petal_block_deconstruct.json similarity index 78% rename from src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_7.json rename to src/main/resources/assets/botania/recipes/conversions/gray_petal_block_deconstruct.json index f0345c281..97b289c81 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_7.json +++ b/src/main/resources/assets/botania/recipes/conversions/gray_petal_block_deconstruct.json @@ -6,8 +6,7 @@ "group": "botania:petal_block_deconstruct", "ingredients": [ { - "item": "botania:petalblock", - "data": 7 + "item": "botania:gray_petal_block" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_13.json b/src/main/resources/assets/botania/recipes/conversions/green_petal_block_deconstruct.json similarity index 78% rename from src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_13.json rename to src/main/resources/assets/botania/recipes/conversions/green_petal_block_deconstruct.json index 0926f491f..c1a21387d 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_13.json +++ b/src/main/resources/assets/botania/recipes/conversions/green_petal_block_deconstruct.json @@ -6,8 +6,7 @@ "group": "botania:petal_block_deconstruct", "ingredients": [ { - "item": "botania:petalblock", - "data": 13 + "item": "botania:green_petal_block" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_3.json b/src/main/resources/assets/botania/recipes/conversions/light_blue_petal_block_deconstruct.json similarity index 79% rename from src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_3.json rename to src/main/resources/assets/botania/recipes/conversions/light_blue_petal_block_deconstruct.json index 40efb8ff4..8513d2ce4 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_3.json +++ b/src/main/resources/assets/botania/recipes/conversions/light_blue_petal_block_deconstruct.json @@ -6,8 +6,7 @@ "group": "botania:petal_block_deconstruct", "ingredients": [ { - "item": "botania:petalblock", - "data": 3 + "item": "botania:light_blue_petal_block" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_5.json b/src/main/resources/assets/botania/recipes/conversions/lime_petal_block_deconstruct.json similarity index 78% rename from src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_5.json rename to src/main/resources/assets/botania/recipes/conversions/lime_petal_block_deconstruct.json index 4decab129..2a80b573d 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_5.json +++ b/src/main/resources/assets/botania/recipes/conversions/lime_petal_block_deconstruct.json @@ -6,8 +6,7 @@ "group": "botania:petal_block_deconstruct", "ingredients": [ { - "item": "botania:petalblock", - "data": 5 + "item": "botania:lime_petal_block" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_2.json b/src/main/resources/assets/botania/recipes/conversions/magenta_petal_block_deconstruct.json similarity index 79% rename from src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_2.json rename to src/main/resources/assets/botania/recipes/conversions/magenta_petal_block_deconstruct.json index fd104302f..cd15621db 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_2.json +++ b/src/main/resources/assets/botania/recipes/conversions/magenta_petal_block_deconstruct.json @@ -6,8 +6,7 @@ "group": "botania:petal_block_deconstruct", "ingredients": [ { - "item": "botania:petalblock", - "data": 2 + "item": "botania:magenta_petal_block" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_1.json b/src/main/resources/assets/botania/recipes/conversions/orange_petal_block_deconstruct.json similarity index 79% rename from src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_1.json rename to src/main/resources/assets/botania/recipes/conversions/orange_petal_block_deconstruct.json index 665558e4f..1b119d05c 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_1.json +++ b/src/main/resources/assets/botania/recipes/conversions/orange_petal_block_deconstruct.json @@ -6,8 +6,7 @@ "group": "botania:petal_block_deconstruct", "ingredients": [ { - "item": "botania:petalblock", - "data": 1 + "item": "botania:orange_petal_block" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_6.json b/src/main/resources/assets/botania/recipes/conversions/pink_petal_block_deconstruct.json similarity index 78% rename from src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_6.json rename to src/main/resources/assets/botania/recipes/conversions/pink_petal_block_deconstruct.json index d2c5f82bf..70495f127 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_6.json +++ b/src/main/resources/assets/botania/recipes/conversions/pink_petal_block_deconstruct.json @@ -6,8 +6,7 @@ "group": "botania:petal_block_deconstruct", "ingredients": [ { - "item": "botania:petalblock", - "data": 6 + "item": "botania:pink_petal_block" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_10.json b/src/main/resources/assets/botania/recipes/conversions/purple_petal_block_deconstruct.json similarity index 78% rename from src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_10.json rename to src/main/resources/assets/botania/recipes/conversions/purple_petal_block_deconstruct.json index c14257ea0..87994cf8b 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_10.json +++ b/src/main/resources/assets/botania/recipes/conversions/purple_petal_block_deconstruct.json @@ -6,8 +6,7 @@ "group": "botania:petal_block_deconstruct", "ingredients": [ { - "item": "botania:petalblock", - "data": 10 + "item": "botania:purple_petal_block" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_14.json b/src/main/resources/assets/botania/recipes/conversions/red_petal_block_deconstruct.json similarity index 78% rename from src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_14.json rename to src/main/resources/assets/botania/recipes/conversions/red_petal_block_deconstruct.json index a82295205..84faab3c2 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_14.json +++ b/src/main/resources/assets/botania/recipes/conversions/red_petal_block_deconstruct.json @@ -6,8 +6,7 @@ "group": "botania:petal_block_deconstruct", "ingredients": [ { - "item": "botania:petalblock", - "data": 14 + "item": "botania:red_petal_block" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_8.json b/src/main/resources/assets/botania/recipes/conversions/silver_petal_block_deconstruct.json similarity index 79% rename from src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_8.json rename to src/main/resources/assets/botania/recipes/conversions/silver_petal_block_deconstruct.json index 9917e3efb..db6c6bd96 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_8.json +++ b/src/main/resources/assets/botania/recipes/conversions/silver_petal_block_deconstruct.json @@ -6,8 +6,7 @@ "group": "botania:petal_block_deconstruct", "ingredients": [ { - "item": "botania:petalblock", - "data": 8 + "item": "botania:silver_petal_block" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_0.json b/src/main/resources/assets/botania/recipes/conversions/white_petal_block_deconstruct.json similarity index 74% rename from src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_0.json rename to src/main/resources/assets/botania/recipes/conversions/white_petal_block_deconstruct.json index 93eb4b4e8..bea70013a 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_0.json +++ b/src/main/resources/assets/botania/recipes/conversions/white_petal_block_deconstruct.json @@ -5,8 +5,7 @@ }, "ingredients": [ { - "item": "botania:petalblock", - "data": 0 + "item": "botania:white_petal_block" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_4.json b/src/main/resources/assets/botania/recipes/conversions/yellow_petal_block_deconstruct.json similarity index 79% rename from src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_4.json rename to src/main/resources/assets/botania/recipes/conversions/yellow_petal_block_deconstruct.json index cc72357a6..bfc91ad6f 100644 --- a/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_4.json +++ b/src/main/resources/assets/botania/recipes/conversions/yellow_petal_block_deconstruct.json @@ -6,8 +6,7 @@ "group": "botania:petal_block_deconstruct", "ingredients": [ { - "item": "botania:petalblock", - "data": 4 + "item": "botania:yellow_petal_block" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/petalblock_9.json b/src/main/resources/assets/botania/recipes/cyan_petal_block.json similarity index 66% rename from src/main/resources/assets/botania/recipes/petalblock_9.json rename to src/main/resources/assets/botania/recipes/cyan_petal_block.json index fa3a05eac..2f6b70b2c 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_9.json +++ b/src/main/resources/assets/botania/recipes/cyan_petal_block.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petalblock", - "data": 9 + "item": "botania:cyan_petal_block" }, "pattern": [ "PPP", @@ -9,7 +8,7 @@ "PPP" ], "type": "forge:ore_shaped", - "group": "botania:petalblock", + "group": "botania:petal_block", "key": { "P": { "item": "#PETALCYAN" diff --git a/src/main/resources/assets/botania/recipes/petalblock_7.json b/src/main/resources/assets/botania/recipes/gray_petal_block.json similarity index 66% rename from src/main/resources/assets/botania/recipes/petalblock_7.json rename to src/main/resources/assets/botania/recipes/gray_petal_block.json index b36cca901..d2822e2d2 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_7.json +++ b/src/main/resources/assets/botania/recipes/gray_petal_block.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petalblock", - "data": 7 + "item": "botania:gray_petal_block" }, "pattern": [ "PPP", @@ -9,7 +8,7 @@ "PPP" ], "type": "forge:ore_shaped", - "group": "botania:petalblock", + "group": "botania:petal_block", "key": { "P": { "item": "#PETALGRAY" diff --git a/src/main/resources/assets/botania/recipes/petalblock_13.json b/src/main/resources/assets/botania/recipes/green_petal_block.json similarity index 66% rename from src/main/resources/assets/botania/recipes/petalblock_13.json rename to src/main/resources/assets/botania/recipes/green_petal_block.json index 5cf1afaa2..131e08b64 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_13.json +++ b/src/main/resources/assets/botania/recipes/green_petal_block.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petalblock", - "data": 13 + "item": "botania:green_petal_block" }, "pattern": [ "PPP", @@ -9,7 +8,7 @@ "PPP" ], "type": "forge:ore_shaped", - "group": "botania:petalblock", + "group": "botania:petal_block", "key": { "P": { "item": "#PETALGREEN" diff --git a/src/main/resources/assets/botania/recipes/petalblock_3.json b/src/main/resources/assets/botania/recipes/light_blue_petal_block.json similarity index 67% rename from src/main/resources/assets/botania/recipes/petalblock_3.json rename to src/main/resources/assets/botania/recipes/light_blue_petal_block.json index b6b0adf63..fc6dec840 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_3.json +++ b/src/main/resources/assets/botania/recipes/light_blue_petal_block.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petalblock", - "data": 3 + "item": "botania:light_blue_petal_block" }, "pattern": [ "PPP", @@ -9,7 +8,7 @@ "PPP" ], "type": "forge:ore_shaped", - "group": "botania:petalblock", + "group": "botania:petal_block", "key": { "P": { "item": "#PETALLIGHTBLUE" diff --git a/src/main/resources/assets/botania/recipes/petalblock_5.json b/src/main/resources/assets/botania/recipes/lime_petal_block.json similarity index 66% rename from src/main/resources/assets/botania/recipes/petalblock_5.json rename to src/main/resources/assets/botania/recipes/lime_petal_block.json index 1203e4857..c1c9ac938 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_5.json +++ b/src/main/resources/assets/botania/recipes/lime_petal_block.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petalblock", - "data": 5 + "item": "botania:lime_petal_block" }, "pattern": [ "PPP", @@ -9,7 +8,7 @@ "PPP" ], "type": "forge:ore_shaped", - "group": "botania:petalblock", + "group": "botania:petal_block", "key": { "P": { "item": "#PETALLIME" diff --git a/src/main/resources/assets/botania/recipes/petalblock_2.json b/src/main/resources/assets/botania/recipes/magenta_petal_block.json similarity index 67% rename from src/main/resources/assets/botania/recipes/petalblock_2.json rename to src/main/resources/assets/botania/recipes/magenta_petal_block.json index 6cceebc31..f2bd2b3e9 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_2.json +++ b/src/main/resources/assets/botania/recipes/magenta_petal_block.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petalblock", - "data": 2 + "item": "botania:magenta_petal_block" }, "pattern": [ "PPP", @@ -9,7 +8,7 @@ "PPP" ], "type": "forge:ore_shaped", - "group": "botania:petalblock", + "group": "botania:petal_block", "key": { "P": { "item": "#PETALMAGENTA" diff --git a/src/main/resources/assets/botania/recipes/petalblock_1.json b/src/main/resources/assets/botania/recipes/orange_petal_block.json similarity index 67% rename from src/main/resources/assets/botania/recipes/petalblock_1.json rename to src/main/resources/assets/botania/recipes/orange_petal_block.json index 8977df4ad..79076fdf2 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_1.json +++ b/src/main/resources/assets/botania/recipes/orange_petal_block.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petalblock", - "data": 1 + "item": "botania:orange_petal_block" }, "pattern": [ "PPP", @@ -9,7 +8,7 @@ "PPP" ], "type": "forge:ore_shaped", - "group": "botania:petalblock", + "group": "botania:petal_block", "key": { "P": { "item": "#PETALORANGE" diff --git a/src/main/resources/assets/botania/recipes/petalblock_6.json b/src/main/resources/assets/botania/recipes/pink_petal_block.json similarity index 66% rename from src/main/resources/assets/botania/recipes/petalblock_6.json rename to src/main/resources/assets/botania/recipes/pink_petal_block.json index ee41a07ac..dfd6b6820 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_6.json +++ b/src/main/resources/assets/botania/recipes/pink_petal_block.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petalblock", - "data": 6 + "item": "botania:pink_petal_block" }, "pattern": [ "PPP", @@ -9,7 +8,7 @@ "PPP" ], "type": "forge:ore_shaped", - "group": "botania:petalblock", + "group": "botania:petal_block", "key": { "P": { "item": "#PETALPINK" diff --git a/src/main/resources/assets/botania/recipes/petalblock_10.json b/src/main/resources/assets/botania/recipes/purple_petal_block.json similarity index 66% rename from src/main/resources/assets/botania/recipes/petalblock_10.json rename to src/main/resources/assets/botania/recipes/purple_petal_block.json index 40542d250..fe51c1be4 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_10.json +++ b/src/main/resources/assets/botania/recipes/purple_petal_block.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petalblock", - "data": 10 + "item": "botania:purple_petal_block" }, "pattern": [ "PPP", @@ -9,7 +8,7 @@ "PPP" ], "type": "forge:ore_shaped", - "group": "botania:petalblock", + "group": "botania:petal_block", "key": { "P": { "item": "#PETALPURPLE" diff --git a/src/main/resources/assets/botania/recipes/petalblock_14.json b/src/main/resources/assets/botania/recipes/red_petal_block.json similarity index 66% rename from src/main/resources/assets/botania/recipes/petalblock_14.json rename to src/main/resources/assets/botania/recipes/red_petal_block.json index 8ccd22dff..8f86caa52 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_14.json +++ b/src/main/resources/assets/botania/recipes/red_petal_block.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petalblock", - "data": 14 + "item": "botania:red_petal_block" }, "pattern": [ "PPP", @@ -9,7 +8,7 @@ "PPP" ], "type": "forge:ore_shaped", - "group": "botania:petalblock", + "group": "botania:petal_block", "key": { "P": { "item": "#PETALRED" diff --git a/src/main/resources/assets/botania/recipes/petalblock_8.json b/src/main/resources/assets/botania/recipes/silver_petal_block.json similarity index 67% rename from src/main/resources/assets/botania/recipes/petalblock_8.json rename to src/main/resources/assets/botania/recipes/silver_petal_block.json index 4327e322c..422541184 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_8.json +++ b/src/main/resources/assets/botania/recipes/silver_petal_block.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petalblock", - "data": 8 + "item": "botania:silver_petal_block" }, "pattern": [ "PPP", @@ -9,7 +8,7 @@ "PPP" ], "type": "forge:ore_shaped", - "group": "botania:petalblock", + "group": "botania:petal_block", "key": { "P": { "item": "#PETALLIGHTGRAY" diff --git a/src/main/resources/assets/botania/recipes/petalblock_0.json b/src/main/resources/assets/botania/recipes/white_petal_block.json similarity index 66% rename from src/main/resources/assets/botania/recipes/petalblock_0.json rename to src/main/resources/assets/botania/recipes/white_petal_block.json index 049ba764a..8a0aeadb7 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_0.json +++ b/src/main/resources/assets/botania/recipes/white_petal_block.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petalblock", - "data": 0 + "item": "botania:white_petal_block" }, "pattern": [ "PPP", @@ -9,7 +8,7 @@ "PPP" ], "type": "forge:ore_shaped", - "group": "botania:petalblock", + "group": "botania:petal_block", "key": { "P": { "item": "#PETALWHITE" diff --git a/src/main/resources/assets/botania/recipes/petalblock_4.json b/src/main/resources/assets/botania/recipes/yellow_petal_block.json similarity index 67% rename from src/main/resources/assets/botania/recipes/petalblock_4.json rename to src/main/resources/assets/botania/recipes/yellow_petal_block.json index e61a0410f..170677b29 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_4.json +++ b/src/main/resources/assets/botania/recipes/yellow_petal_block.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:petalblock", - "data": 4 + "item": "botania:yellow_petal_block" }, "pattern": [ "PPP", @@ -9,7 +8,7 @@ "PPP" ], "type": "forge:ore_shaped", - "group": "botania:petalblock", + "group": "botania:petal_block", "key": { "P": { "item": "#PETALYELLOW"