From d8d0d0ff130ae3b545c602b36668d09a1334e3fe Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 6 Mar 2018 00:55:31 -0600 Subject: [PATCH] Flatten azulejos --- block_flattening_notes.txt | 5 + .../botania/api/state/BotaniaStateProps.java | 4 - .../api/state/enums/CustomBrickVariant.java | 41 -------- .../botania/common/block/ModBlocks.java | 53 ++++++++++- .../common/block/decor/BlockAzulejo.java | 39 ++++++++ .../common/block/decor/BlockCustomBrick.java | 95 ------------------- .../common/core/BotaniaCreativeTab.java | 17 +++- .../common/crafting/ModCraftingRecipes.java | 2 +- .../botania/common/fixers/FlattenItems.java | 19 ++++ .../botania/common/lib/LibBlockNames.java | 2 +- .../assets/botania/blockstates/azulejo_0.json | 5 + .../assets/botania/blockstates/azulejo_1.json | 5 + .../botania/blockstates/azulejo_10.json | 5 + .../botania/blockstates/azulejo_11.json | 5 + .../botania/blockstates/azulejo_12.json | 5 + .../botania/blockstates/azulejo_13.json | 5 + .../botania/blockstates/azulejo_14.json | 5 + .../botania/blockstates/azulejo_15.json | 5 + .../assets/botania/blockstates/azulejo_2.json | 5 + .../assets/botania/blockstates/azulejo_3.json | 5 + .../assets/botania/blockstates/azulejo_4.json | 5 + .../assets/botania/blockstates/azulejo_5.json | 5 + .../assets/botania/blockstates/azulejo_6.json | 5 + .../assets/botania/blockstates/azulejo_7.json | 5 + .../assets/botania/blockstates/azulejo_8.json | 5 + .../assets/botania/blockstates/azulejo_9.json | 5 + .../botania/blockstates/custombrick.json | 20 ---- .../resources/assets/botania/lang/en_us.lang | 32 +++---- .../resources/assets/botania/lang/es_es.lang | 32 +++---- .../resources/assets/botania/lang/fr_fr.lang | 32 +++---- .../resources/assets/botania/lang/ja_jp.lang | 32 +++---- .../resources/assets/botania/lang/ko_kr.lang | 32 +++---- .../resources/assets/botania/lang/nl_nl.lang | 32 +++---- .../resources/assets/botania/lang/pt_br.lang | 32 +++---- .../resources/assets/botania/lang/ru_ru.lang | 32 +++---- .../resources/assets/botania/lang/zh_cn.lang | 32 +++---- .../resources/assets/botania/lang/zh_tw.lang | 32 +++---- .../{custombrick_0.json => azulejo_0.json} | 3 +- ...{custombrick_3.json => azulejo_0_alt.json} | 6 +- .../{custombrick_1.json => azulejo_1.json} | 6 +- .../{custombrick_4.json => azulejo_10.json} | 6 +- .../{custombrick_2.json => azulejo_11.json} | 6 +- .../assets/botania/recipes/azulejo_12.json | 12 +++ .../assets/botania/recipes/azulejo_13.json | 12 +++ .../assets/botania/recipes/azulejo_14.json | 12 +++ .../assets/botania/recipes/azulejo_15.json | 12 +++ .../assets/botania/recipes/azulejo_2.json | 12 +++ .../assets/botania/recipes/azulejo_3.json | 12 +++ .../assets/botania/recipes/azulejo_4.json | 12 +++ .../assets/botania/recipes/azulejo_5.json | 12 +++ .../assets/botania/recipes/azulejo_6.json | 12 +++ .../assets/botania/recipes/azulejo_7.json | 12 +++ .../assets/botania/recipes/azulejo_8.json | 12 +++ .../assets/botania/recipes/azulejo_9.json | 12 +++ .../botania/recipes/custombrick_0_alt.json | 14 --- .../botania/recipes/custombrick_10.json | 14 --- .../botania/recipes/custombrick_11.json | 14 --- .../botania/recipes/custombrick_12.json | 14 --- .../botania/recipes/custombrick_13.json | 14 --- .../botania/recipes/custombrick_14.json | 14 --- .../botania/recipes/custombrick_15.json | 14 --- .../assets/botania/recipes/custombrick_5.json | 14 --- .../assets/botania/recipes/custombrick_6.json | 14 --- .../assets/botania/recipes/custombrick_7.json | 14 --- .../assets/botania/recipes/custombrick_8.json | 14 --- .../assets/botania/recipes/custombrick_9.json | 14 --- 66 files changed, 523 insertions(+), 513 deletions(-) delete mode 100644 src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java create mode 100644 src/main/java/vazkii/botania/common/block/decor/BlockAzulejo.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java create mode 100644 src/main/resources/assets/botania/blockstates/azulejo_0.json create mode 100644 src/main/resources/assets/botania/blockstates/azulejo_1.json create mode 100644 src/main/resources/assets/botania/blockstates/azulejo_10.json create mode 100644 src/main/resources/assets/botania/blockstates/azulejo_11.json create mode 100644 src/main/resources/assets/botania/blockstates/azulejo_12.json create mode 100644 src/main/resources/assets/botania/blockstates/azulejo_13.json create mode 100644 src/main/resources/assets/botania/blockstates/azulejo_14.json create mode 100644 src/main/resources/assets/botania/blockstates/azulejo_15.json create mode 100644 src/main/resources/assets/botania/blockstates/azulejo_2.json create mode 100644 src/main/resources/assets/botania/blockstates/azulejo_3.json create mode 100644 src/main/resources/assets/botania/blockstates/azulejo_4.json create mode 100644 src/main/resources/assets/botania/blockstates/azulejo_5.json create mode 100644 src/main/resources/assets/botania/blockstates/azulejo_6.json create mode 100644 src/main/resources/assets/botania/blockstates/azulejo_7.json create mode 100644 src/main/resources/assets/botania/blockstates/azulejo_8.json create mode 100644 src/main/resources/assets/botania/blockstates/azulejo_9.json delete mode 100644 src/main/resources/assets/botania/blockstates/custombrick.json rename src/main/resources/assets/botania/recipes/{custombrick_0.json => azulejo_0.json} (76%) rename src/main/resources/assets/botania/recipes/{custombrick_3.json => azulejo_0_alt.json} (57%) rename src/main/resources/assets/botania/recipes/{custombrick_1.json => azulejo_1.json} (57%) rename src/main/resources/assets/botania/recipes/{custombrick_4.json => azulejo_10.json} (57%) rename src/main/resources/assets/botania/recipes/{custombrick_2.json => azulejo_11.json} (57%) create mode 100644 src/main/resources/assets/botania/recipes/azulejo_12.json create mode 100644 src/main/resources/assets/botania/recipes/azulejo_13.json create mode 100644 src/main/resources/assets/botania/recipes/azulejo_14.json create mode 100644 src/main/resources/assets/botania/recipes/azulejo_15.json create mode 100644 src/main/resources/assets/botania/recipes/azulejo_2.json create mode 100644 src/main/resources/assets/botania/recipes/azulejo_3.json create mode 100644 src/main/resources/assets/botania/recipes/azulejo_4.json create mode 100644 src/main/resources/assets/botania/recipes/azulejo_5.json create mode 100644 src/main/resources/assets/botania/recipes/azulejo_6.json create mode 100644 src/main/resources/assets/botania/recipes/azulejo_7.json create mode 100644 src/main/resources/assets/botania/recipes/azulejo_8.json create mode 100644 src/main/resources/assets/botania/recipes/azulejo_9.json delete mode 100644 src/main/resources/assets/botania/recipes/custombrick_0_alt.json delete mode 100644 src/main/resources/assets/botania/recipes/custombrick_10.json delete mode 100644 src/main/resources/assets/botania/recipes/custombrick_11.json delete mode 100644 src/main/resources/assets/botania/recipes/custombrick_12.json delete mode 100644 src/main/resources/assets/botania/recipes/custombrick_13.json delete mode 100644 src/main/resources/assets/botania/recipes/custombrick_14.json delete mode 100644 src/main/resources/assets/botania/recipes/custombrick_15.json delete mode 100644 src/main/resources/assets/botania/recipes/custombrick_5.json delete mode 100644 src/main/resources/assets/botania/recipes/custombrick_6.json delete mode 100644 src/main/resources/assets/botania/recipes/custombrick_7.json delete mode 100644 src/main/resources/assets/botania/recipes/custombrick_8.json delete mode 100644 src/main/resources/assets/botania/recipes/custombrick_9.json diff --git a/block_flattening_notes.txt b/block_flattening_notes.txt index d738df0cf..984b66fdb 100644 --- a/block_flattening_notes.txt +++ b/block_flattening_notes.txt @@ -18,3 +18,8 @@ botania:forestdrum[variant={wild, gathering, canopy}] => botania:drum_gathering => botania:drum_canopy +botania:custombrick[variant={azulejo_0, ..., azulejo_15}] +=> botania:azulejo_0 +=> ... +=> botania:azulejo_15 +(ordered 0, 13, 14, 15, then 1-12, due to legacy reasons) \ No newline at end of file diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 8c858c02c..268963c7c 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -27,7 +27,6 @@ import vazkii.botania.api.state.enums.BiomeBrickVariant; import vazkii.botania.api.state.enums.BiomeStoneVariant; import vazkii.botania.api.state.enums.CratePattern; import vazkii.botania.api.state.enums.CrateVariant; -import vazkii.botania.api.state.enums.CustomBrickVariant; import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.api.state.enums.LivingWoodVariant; import vazkii.botania.api.state.enums.LuminizerVariant; @@ -104,9 +103,6 @@ public final class BotaniaStateProps { } }); - // BlockCustomBrick - public static final PropertyEnum CUSTOMBRICK_VARIANT = PropertyEnum.create("variant", CustomBrickVariant.class); - // BlockDreamWood, BlockLivingWood public static final PropertyEnum LIVINGWOOD_VARIANT = PropertyEnum.create("variant", LivingWoodVariant.class); diff --git a/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java b/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java deleted file mode 100644 index d3ef2e03a..000000000 --- a/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - *

- * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - */ -package vazkii.botania.api.state.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum CustomBrickVariant implements IStringSerializable { - /* Azulejos 0, 13, 14, and 15 replaced the old bricks - They are here at the top because putting them at the bottom while deleting the bricks - would shift the variants of azulejos in older worlds.*/ - AZULEJO_0, - AZULEJO_13, - AZULEJO_14, - AZULEJO_15, - AZULEJO_1, - AZULEJO_2, - AZULEJO_3, - AZULEJO_4, - AZULEJO_5, - AZULEJO_6, - AZULEJO_7, - AZULEJO_8, - AZULEJO_9, - AZULEJO_10, - AZULEJO_11, - AZULEJO_12; - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } - -} diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 76a9d417f..f3aeb0cc0 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -33,7 +33,7 @@ import vazkii.botania.common.block.corporea.BlockCorporeaInterceptor; import vazkii.botania.common.block.corporea.BlockCorporeaRetainer; import vazkii.botania.common.block.decor.BlockBlaze; import vazkii.botania.common.block.decor.BlockBuriedPetals; -import vazkii.botania.common.block.decor.BlockCustomBrick; +import vazkii.botania.common.block.decor.BlockAzulejo; import vazkii.botania.common.block.decor.BlockElfGlass; import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.block.decor.BlockManaFlame; @@ -164,7 +164,22 @@ public final class ModBlocks { public static final Block floatingFlower = new BlockFloatingFlower(); public static final Block tinyPotato = new BlockTinyPotato(); public static final Block spawnerClaw = new BlockSpawnerClaw(); - public static final Block customBrick = new BlockCustomBrick(); + public static final Block azulejo0 = new BlockAzulejo(0); + public static final Block azulejo1 = new BlockAzulejo(1); + public static final Block azulejo2 = new BlockAzulejo(2); + public static final Block azulejo3 = new BlockAzulejo(3); + public static final Block azulejo4 = new BlockAzulejo(4); + public static final Block azulejo5 = new BlockAzulejo(5); + public static final Block azulejo6 = new BlockAzulejo(6); + public static final Block azulejo7 = new BlockAzulejo(7); + public static final Block azulejo8 = new BlockAzulejo(8); + public static final Block azulejo9 = new BlockAzulejo(9); + public static final Block azulejo10 = new BlockAzulejo(10); + public static final Block azulejo11 = new BlockAzulejo(11); + public static final Block azulejo12 = new BlockAzulejo(12); + public static final Block azulejo13 = new BlockAzulejo(13); + public static final Block azulejo14 = new BlockAzulejo(14); + public static final Block azulejo15 = new BlockAzulejo(15); public static final Block enderEye = new BlockEnderEye(); public static final Block starfield = new BlockStarfield(); public static final Block rfGenerator = new BlockRFGenerator(); @@ -263,7 +278,22 @@ public final class ModBlocks { r.register(floatingFlower); r.register(tinyPotato); r.register(spawnerClaw); - r.register(customBrick); + r.register(azulejo0); + r.register(azulejo1); + r.register(azulejo2); + r.register(azulejo3); + r.register(azulejo4); + r.register(azulejo5); + r.register(azulejo6); + r.register(azulejo7); + r.register(azulejo8); + r.register(azulejo9); + r.register(azulejo10); + r.register(azulejo11); + r.register(azulejo12); + r.register(azulejo13); + r.register(azulejo14); + r.register(azulejo15); r.register(enderEye); r.register(starfield); r.register(rfGenerator); @@ -363,7 +393,22 @@ public final class ModBlocks { r.register(new ItemBlockWithMetadataAndName(floatingFlower).setRegistryName(floatingFlower.getRegistryName())); r.register(new ItemBlockTinyPotato(tinyPotato).setRegistryName(tinyPotato.getRegistryName())); r.register(new ItemBlockMod(spawnerClaw).setRegistryName(spawnerClaw.getRegistryName())); - r.register(new ItemBlockWithMetadataAndName(customBrick).setRegistryName(customBrick.getRegistryName())); + r.register(new ItemBlockMod(azulejo0).setRegistryName(azulejo0.getRegistryName())); + r.register(new ItemBlockMod(azulejo1).setRegistryName(azulejo1.getRegistryName())); + r.register(new ItemBlockMod(azulejo2).setRegistryName(azulejo2.getRegistryName())); + r.register(new ItemBlockMod(azulejo3).setRegistryName(azulejo3.getRegistryName())); + r.register(new ItemBlockMod(azulejo4).setRegistryName(azulejo4.getRegistryName())); + r.register(new ItemBlockMod(azulejo5).setRegistryName(azulejo5.getRegistryName())); + r.register(new ItemBlockMod(azulejo6).setRegistryName(azulejo6.getRegistryName())); + r.register(new ItemBlockMod(azulejo7).setRegistryName(azulejo7.getRegistryName())); + r.register(new ItemBlockMod(azulejo8).setRegistryName(azulejo8.getRegistryName())); + r.register(new ItemBlockMod(azulejo9).setRegistryName(azulejo9.getRegistryName())); + r.register(new ItemBlockMod(azulejo10).setRegistryName(azulejo10.getRegistryName())); + r.register(new ItemBlockMod(azulejo11).setRegistryName(azulejo11.getRegistryName())); + r.register(new ItemBlockMod(azulejo12).setRegistryName(azulejo12.getRegistryName())); + r.register(new ItemBlockMod(azulejo13).setRegistryName(azulejo13.getRegistryName())); + r.register(new ItemBlockMod(azulejo14).setRegistryName(azulejo14.getRegistryName())); + r.register(new ItemBlockMod(azulejo15).setRegistryName(azulejo15.getRegistryName())); r.register(new ItemBlockMod(enderEye).setRegistryName(enderEye.getRegistryName())); r.register(new ItemBlockMod(starfield).setRegistryName(starfield.getRegistryName())); r.register(new ItemBlockMod(rfGenerator).setRegistryName(rfGenerator.getRegistryName())); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockAzulejo.java b/src/main/java/vazkii/botania/common/block/decor/BlockAzulejo.java new file mode 100644 index 000000000..f3b2555f7 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/BlockAzulejo.java @@ -0,0 +1,39 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Jul 28, 2014, 9:51:48 PM (GMT)] + */ +package vazkii.botania.common.block.decor; + +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.block.BlockMod; +import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibBlockNames; + +public class BlockAzulejo extends BlockMod implements ILexiconable { + + public BlockAzulejo(int variant) { + super(Material.ROCK, LibBlockNames.AZULEJO_PREFIX + variant); + setHardness(2.0F); + setResistance(5.0F); + setSoundType(SoundType.STONE); + } + + @Override + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { + return LexiconData.azulejo; + } + +} diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java deleted file mode 100644 index ee6bc9a99..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 28, 2014, 9:51:48 PM (GMT)] - */ -package vazkii.botania.common.block.decor; - -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.CustomBrickVariant; -import vazkii.botania.client.core.handler.ModelHandler; -import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibBlockNames; - -import javax.annotation.Nonnull; - -public class BlockCustomBrick extends BlockMod implements ILexiconable { - - public BlockCustomBrick() { - super(Material.ROCK, LibBlockNames.CUSTOM_BRICK); - setHardness(2.0F); - setResistance(5.0F); - setSoundType(SoundType.STONE); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, CustomBrickVariant.AZULEJO_0)); - } - - @Nonnull - @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, BotaniaStateProps.CUSTOMBRICK_VARIANT); - } - - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.CUSTOMBRICK_VARIANT).ordinal(); - } - - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta >= CustomBrickVariant.values().length) { - meta = 0; - } - return getDefaultState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, CustomBrickVariant.values()[meta]); - } - - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } - - @Override - public void getSubBlocks(CreativeTabs tab, NonNullList stacks) { - for(int i = 0; i < CustomBrickVariant.values().length; i++) - stacks.add(new ItemStack(this, 1, i)); - } - - @Nonnull - @Override - public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { - return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.azulejo; - } - - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerBlockToState(this, CustomBrickVariant.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 c59573cc7..95e37d086 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -403,7 +403,22 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.blazeBlock); - addBlock(ModBlocks.customBrick); + addBlock(ModBlocks.azulejo0); + addBlock(ModBlocks.azulejo1); + addBlock(ModBlocks.azulejo2); + addBlock(ModBlocks.azulejo3); + addBlock(ModBlocks.azulejo4); + addBlock(ModBlocks.azulejo5); + addBlock(ModBlocks.azulejo6); + addBlock(ModBlocks.azulejo7); + addBlock(ModBlocks.azulejo8); + addBlock(ModBlocks.azulejo9); + addBlock(ModBlocks.azulejo10); + addBlock(ModBlocks.azulejo11); + addBlock(ModBlocks.azulejo12); + addBlock(ModBlocks.azulejo13); + addBlock(ModBlocks.azulejo14); + addBlock(ModBlocks.azulejo15); addBlock(ModFluffBlocks.livingwoodStairs); addBlock(ModFluffBlocks.livingwoodSlab); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 509ac8c04..ddde72eff 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -678,7 +678,7 @@ public final class ModCraftingRecipes { recipeSunnyQuartz = ModItems.sunnyQuartz.getRegistryName(); recipesShinyFlowers = allOfGroup(ModBlocks.shinyFlower.getRegistryName()); recipesMiniIsland = allOfGroup(ModBlocks.floatingFlower.getRegistryName()); - recipeAzulejo = path("custombrick_4"); + recipeAzulejo = ModBlocks.azulejo0.getRegistryName(); recipesAzulejoCycling = allOfGroup("azulejo_cycling"); recipeStarfield = ModBlocks.starfield.getRegistryName(); recipesMushrooms = allOfGroup(ModBlocks.mushroom.getRegistryName()); diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index 43f5bf606..62a9d41e9 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -9,6 +9,7 @@ import vazkii.botania.api.state.enums.CratePattern; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic; +import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; @@ -146,6 +147,24 @@ public class FlattenItems implements IFixableData { case 4: return ModBlocks.dragonstoneBlock.getRegistryName().toString(); } }); + LOOKUP.put("botania:custombrick", i -> { + int new_variant = 0; + // azulejos 1-12 in metas 4-15 + if (i >= 4) { + new_variant = i - 3; + } else { + // azulejos 0, 13, 14, 15 in metas 0-3 + switch (i) { + default: + case 0: new_variant = 0; break; + case 1: new_variant = 13; break; + case 2: new_variant = 14; break; + case 3: new_variant = 15; break; + } + } + + return LibMisc.MOD_ID + ":" + LibBlockNames.AZULEJO_PREFIX + new_variant; + }); } @Override diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index 5dff64048..c63129b4d 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -49,7 +49,7 @@ public final class LibBlockNames { public static final String SPAWNER_CLAW = "spawnerClaw"; public static final String REED_BLOCK = "reedBlock"; public static final String THATCH = "thatch"; - public static final String CUSTOM_BRICK = "customBrick"; + public static final String AZULEJO_PREFIX = "azulejo_"; public static final String ENDER_EYE_BLOCK = "enderEyeBlock"; public static final String STARFIELD = "starfield"; public static final String RF_GENERATOR = "rfGenerator"; diff --git a/src/main/resources/assets/botania/blockstates/azulejo_0.json b/src/main/resources/assets/botania/blockstates/azulejo_0.json new file mode 100644 index 000000000..eee3bdbf5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/azulejo_0.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:bricks/azulejo_0" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/azulejo_1.json b/src/main/resources/assets/botania/blockstates/azulejo_1.json new file mode 100644 index 000000000..b36f655f6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/azulejo_1.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:bricks/azulejo_1" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/azulejo_10.json b/src/main/resources/assets/botania/blockstates/azulejo_10.json new file mode 100644 index 000000000..f7bca3f70 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/azulejo_10.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:bricks/azulejo_10" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/azulejo_11.json b/src/main/resources/assets/botania/blockstates/azulejo_11.json new file mode 100644 index 000000000..bcc316096 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/azulejo_11.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:bricks/azulejo_11" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/azulejo_12.json b/src/main/resources/assets/botania/blockstates/azulejo_12.json new file mode 100644 index 000000000..e3ab47694 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/azulejo_12.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:bricks/azulejo_12" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/azulejo_13.json b/src/main/resources/assets/botania/blockstates/azulejo_13.json new file mode 100644 index 000000000..55b550c5a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/azulejo_13.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:bricks/azulejo_13" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/azulejo_14.json b/src/main/resources/assets/botania/blockstates/azulejo_14.json new file mode 100644 index 000000000..f7d74446f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/azulejo_14.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:bricks/azulejo_14" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/azulejo_15.json b/src/main/resources/assets/botania/blockstates/azulejo_15.json new file mode 100644 index 000000000..6f422b8c0 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/azulejo_15.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:bricks/azulejo_15" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/azulejo_2.json b/src/main/resources/assets/botania/blockstates/azulejo_2.json new file mode 100644 index 000000000..e6f68987a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/azulejo_2.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:bricks/azulejo_2" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/azulejo_3.json b/src/main/resources/assets/botania/blockstates/azulejo_3.json new file mode 100644 index 000000000..a55397825 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/azulejo_3.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:bricks/azulejo_3" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/azulejo_4.json b/src/main/resources/assets/botania/blockstates/azulejo_4.json new file mode 100644 index 000000000..e179911f2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/azulejo_4.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:bricks/azulejo_4" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/azulejo_5.json b/src/main/resources/assets/botania/blockstates/azulejo_5.json new file mode 100644 index 000000000..6e82298ad --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/azulejo_5.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:bricks/azulejo_5" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/azulejo_6.json b/src/main/resources/assets/botania/blockstates/azulejo_6.json new file mode 100644 index 000000000..0839a3c90 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/azulejo_6.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:bricks/azulejo_6" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/azulejo_7.json b/src/main/resources/assets/botania/blockstates/azulejo_7.json new file mode 100644 index 000000000..6e4c0a18b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/azulejo_7.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:bricks/azulejo_7" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/azulejo_8.json b/src/main/resources/assets/botania/blockstates/azulejo_8.json new file mode 100644 index 000000000..119a8d312 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/azulejo_8.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:bricks/azulejo_8" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/azulejo_9.json b/src/main/resources/assets/botania/blockstates/azulejo_9.json new file mode 100644 index 000000000..129eef800 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/azulejo_9.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:bricks/azulejo_9" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/custombrick.json b/src/main/resources/assets/botania/blockstates/custombrick.json deleted file mode 100644 index 3b06e2bf0..000000000 --- a/src/main/resources/assets/botania/blockstates/custombrick.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "variant=azulejo_0": { "model": "botania:bricks/azulejo_0" }, - "variant=azulejo_1": { "model": "botania:bricks/azulejo_1" }, - "variant=azulejo_2": { "model": "botania:bricks/azulejo_2" }, - "variant=azulejo_3": { "model": "botania:bricks/azulejo_3" }, - "variant=azulejo_4": { "model": "botania:bricks/azulejo_4" }, - "variant=azulejo_5": { "model": "botania:bricks/azulejo_5" }, - "variant=azulejo_6": { "model": "botania:bricks/azulejo_6" }, - "variant=azulejo_7": { "model": "botania:bricks/azulejo_7" }, - "variant=azulejo_8": { "model": "botania:bricks/azulejo_8" }, - "variant=azulejo_9": { "model": "botania:bricks/azulejo_9" }, - "variant=azulejo_10": { "model": "botania:bricks/azulejo_10" }, - "variant=azulejo_11": { "model": "botania:bricks/azulejo_11" }, - "variant=azulejo_12": { "model": "botania:bricks/azulejo_12" }, - "variant=azulejo_13": { "model": "botania:bricks/azulejo_13" }, - "variant=azulejo_14": { "model": "botania:bricks/azulejo_14" }, - "variant=azulejo_15": { "model": "botania:bricks/azulejo_15" } - } -} \ 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 3d6b9033e..dda1f1fb6 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -828,22 +828,22 @@ tile.botania:miniIsland14.name=Floating Red Flower tile.botania:miniIsland15.name=Floating Black Flower tile.botania:tinyPotato.name=Tiny Potato tile.botania:spawnerClaw.name=Life Imbuer -tile.botania:customBrick0.name=Azulejo -tile.botania:customBrick1.name=Azulejo -tile.botania:customBrick2.name=Azulejo -tile.botania:customBrick3.name=Azulejo -tile.botania:customBrick4.name=Azulejo -tile.botania:customBrick5.name=Azulejo -tile.botania:customBrick6.name=Azulejo -tile.botania:customBrick7.name=Azulejo -tile.botania:customBrick8.name=Azulejo -tile.botania:customBrick9.name=Azulejo -tile.botania:customBrick10.name=Azulejo -tile.botania:customBrick11.name=Azulejo -tile.botania:customBrick12.name=Azulejo -tile.botania:customBrick13.name=Azulejo -tile.botania:customBrick14.name=Azulejo -tile.botania:customBrick15.name=Azulejo +tile.botania:azulejo_0.name=Azulejo +tile.botania:azulejo_1.name=Azulejo +tile.botania:azulejo_2.name=Azulejo +tile.botania:azulejo_3.name=Azulejo +tile.botania:azulejo_4.name=Azulejo +tile.botania:azulejo_5.name=Azulejo +tile.botania:azulejo_6.name=Azulejo +tile.botania:azulejo_7.name=Azulejo +tile.botania:azulejo_8.name=Azulejo +tile.botania:azulejo_9.name=Azulejo +tile.botania:azulejo_10.name=Azulejo +tile.botania:azulejo_11.name=Azulejo +tile.botania:azulejo_12.name=Azulejo +tile.botania:azulejo_13.name=Azulejo +tile.botania:azulejo_14.name=Azulejo +tile.botania:azulejo_15.name=Azulejo tile.botania:enderEyeBlock.name=Ender Overseer tile.botania:starfield.name=Starfield Creator tile.botania:rfGenerator.name=Mana Fluxfield diff --git a/src/main/resources/assets/botania/lang/es_es.lang b/src/main/resources/assets/botania/lang/es_es.lang index ceaa7ad60..2b0986aa6 100644 --- a/src/main/resources/assets/botania/lang/es_es.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -675,10 +675,10 @@ tile.botania:miniIsland14.name=Flor flotante roja tile.botania:miniIsland15.name=Flor flotante negra tile.botania:tinyPotato.name=Patatita tile.botania:spawnerClaw.name=Imbusor de vida -tile.botania:customBrick0.name=Ladrillo infernal -tile.botania:customBrick1.name=Ladrillo de almas -tile.botania:customBrick2.name=Ladrillo de escarcha -tile.botania:customBrick3.name=Teja +tile.botania:azulejo_0.name=Ladrillo infernal +tile.botania:azulejo_1.name=Ladrillo de almas +tile.botania:azulejo_2.name=Ladrillo de escarcha +tile.botania:azulejo_3.name=Teja tile.botania:customBrick0Stairs.name=Escaleras de ladrillo infernal tile.botania:customBrick1Stairs.name=Escaleras de ladrillo de almas tile.botania:customBrick2Stairs.name=Escaleras de ladrillo de escarcha @@ -687,18 +687,18 @@ tile.botania:customBrick0Slab.name=Losa de ladrillo infernal tile.botania:customBrick1Slab.name=Losa de ladrillo de almas tile.botania:customBrick2Slab.name=Losa de de ladrillo de escarcha tile.botania:customBrick3Slab.name=Losa de teja -tile.botania:customBrick4.name=Azulejo -tile.botania:customBrick5.name=Azulejo -tile.botania:customBrick6.name=Azulejo -tile.botania:customBrick7.name=Azulejo -tile.botania:customBrick8.name=Azulejo -tile.botania:customBrick9.name=Azulejo -tile.botania:customBrick10.name=Azulejo -tile.botania:customBrick11.name=Azulejo -tile.botania:customBrick12.name=Azulejo -tile.botania:customBrick13.name=Azulejo -tile.botania:customBrick14.name=Azulejo -tile.botania:customBrick15.name=Azulejo +tile.botania:azulejo_4.name=Azulejo +tile.botania:azulejo_5.name=Azulejo +tile.botania:azulejo_6.name=Azulejo +tile.botania:azulejo_7.name=Azulejo +tile.botania:azulejo_8.name=Azulejo +tile.botania:azulejo_9.name=Azulejo +tile.botania:azulejo_10.name=Azulejo +tile.botania:azulejo_11.name=Azulejo +tile.botania:azulejo_12.name=Azulejo +tile.botania:azulejo_13.name=Azulejo +tile.botania:azulejo_14.name=Azulejo +tile.botania:azulejo_15.name=Azulejo tile.botania:enderEyeBlock.name=Supervisor del Fin tile.botania:starfield.name=Creador de campo estrellado tile.botania:rfGenerator.name=Flujificador de maná diff --git a/src/main/resources/assets/botania/lang/fr_fr.lang b/src/main/resources/assets/botania/lang/fr_fr.lang index c9c57fe23..3e79206d8 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -601,10 +601,10 @@ tile.botania:miniIsland14.name=Fleur flottante rouge tile.botania:miniIsland15.name=Fleur flottante noire tile.botania:tinyPotato.name=Minuscule pomme de terre tile.botania:spawnerClaw.name=Imbueur de vie -tile.botania:customBrick0.name=Brique cauchemardesque -tile.botania:customBrick1.name=Brique d'âme -tile.botania:customBrick2.name=Brique glaciale -tile.botania:customBrick3.name=Tuile de toit +tile.botania:azulejo_0.name=Brique cauchemardesque +tile.botania:azulejo_1.name=Brique d'âme +tile.botania:azulejo_2.name=Brique glaciale +tile.botania:azulejo_3.name=Tuile de toit tile.botania:customBrick0Stairs.name=Escaliers en brique cauchemardesque tile.botania:customBrick1Stairs.name=Escaliers en brique d'âme tile.botania:customBrick2Stairs.name=Escaliers en brique glaciale @@ -613,18 +613,18 @@ tile.botania:customBrick0Slab.name=Dalle en brique cauchemardesque tile.botania:customBrick1Slab.name=Dalle en brique d'âme tile.botania:customBrick2Slab.name=Dalle en brique glaciale tile.botania:customBrick3Slab.name=Dalle en tuile de toit -tile.botania:customBrick4.name=Azuléjo -tile.botania:customBrick5.name=Azuléjo -tile.botania:customBrick6.name=Azuléjo -tile.botania:customBrick7.name=Azuléjo -tile.botania:customBrick8.name=Azuléjo -tile.botania:customBrick9.name=Azuléjo -tile.botania:customBrick10.name=Azuléjo -tile.botania:customBrick11.name=Azuléjo -tile.botania:customBrick12.name=Azuléjo -tile.botania:customBrick13.name=Azuléjo -tile.botania:customBrick14.name=Azuléjo -tile.botania:customBrick15.name=Azuléjo +tile.botania:azulejo_4.name=Azuléjo +tile.botania:azulejo_5.name=Azuléjo +tile.botania:azulejo_6.name=Azuléjo +tile.botania:azulejo_7.name=Azuléjo +tile.botania:azulejo_8.name=Azuléjo +tile.botania:azulejo_9.name=Azuléjo +tile.botania:azulejo_10.name=Azuléjo +tile.botania:azulejo_11.name=Azuléjo +tile.botania:azulejo_12.name=Azuléjo +tile.botania:azulejo_13.name=Azuléjo +tile.botania:azulejo_14.name=Azuléjo +tile.botania:azulejo_15.name=Azuléjo tile.botania:enderEyeBlock.name=Surveillant du néant tile.botania:starfield.name=Créateur de champ d'étoiles tile.botania:rfGenerator.name=Champflux de mana diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index 93e4667aa..c7ce50a22 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -605,10 +605,10 @@ tile.botania:miniIsland14.name=浮遊する赤色の神秘の花 tile.botania:miniIsland15.name=浮遊する黒色の神秘の花 tile.botania:tinyPotato.name=小さなポテト tile.botania:spawnerClaw.name=生命浸透器 -tile.botania:customBrick0.name=地獄レンガ -tile.botania:customBrick1.name=ソウルレンガ -tile.botania:customBrick2.name=雪レンガ -tile.botania:customBrick3.name=屋根瓦 +tile.botania:azulejo_0.name=地獄レンガ +tile.botania:azulejo_1.name=ソウルレンガ +tile.botania:azulejo_2.name=雪レンガ +tile.botania:azulejo_3.name=屋根瓦 tile.botania:customBrick0Stairs.name=地獄レンガの階段 tile.botania:customBrick1Stairs.name=ソウルレンガの階段 tile.botania:customBrick2Stairs.name=雪レンガの階段 @@ -621,18 +621,18 @@ tile.botania:customBrick2Slab.name=雪レンガのハーフブロック tile.botania:customBrick2SlabFull.name=雪レンガのハーフブロック tile.botania:customBrick3Slab.name=屋根瓦のハーフブロック tile.botania:customBrick3SlabFull.name=屋根瓦のハーフブロック -tile.botania:customBrick4.name=アズレージョ -tile.botania:customBrick5.name=アズレージョ -tile.botania:customBrick6.name=アズレージョ -tile.botania:customBrick7.name=アズレージョ -tile.botania:customBrick8.name=アズレージョ -tile.botania:customBrick9.name=アズレージョ -tile.botania:customBrick10.name=アズレージョ -tile.botania:customBrick11.name=アズレージョ -tile.botania:customBrick12.name=アズレージョ -tile.botania:customBrick13.name=アズレージョ -tile.botania:customBrick14.name=アズレージョ -tile.botania:customBrick15.name=アズレージョ +tile.botania:azulejo_4.name=アズレージョ +tile.botania:azulejo_5.name=アズレージョ +tile.botania:azulejo_6.name=アズレージョ +tile.botania:azulejo_7.name=アズレージョ +tile.botania:azulejo_8.name=アズレージョ +tile.botania:azulejo_9.name=アズレージョ +tile.botania:azulejo_10.name=アズレージョ +tile.botania:azulejo_11.name=アズレージョ +tile.botania:azulejo_12.name=アズレージョ +tile.botania:azulejo_13.name=アズレージョ +tile.botania:azulejo_14.name=アズレージョ +tile.botania:azulejo_15.name=アズレージョ tile.botania:enderEyeBlock.name=エンダー監視ブロック tile.botania:starfield.name=星空生成器 tile.botania:rfGenerator.name=マナ-フラックス変換器 diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index a9152e9e0..c1ef22ef0 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -640,10 +640,10 @@ tile.botania:miniIsland14.name=부유 빨간색 꽃 tile.botania:miniIsland15.name=부유 검은색 꽃 tile.botania:tinyPotato.name=타이니 포테이토 tile.botania:spawnerClaw.name=생명 침투 -tile.botania:customBrick0.name=지옥 벽돌 -tile.botania:customBrick1.name=영혼 벽돌 -tile.botania:customBrick2.name=서리 벽돌 -tile.botania:customBrick3.name=기와 +tile.botania:azulejo_0.name=지옥 벽돌 +tile.botania:azulejo_1.name=영혼 벽돌 +tile.botania:azulejo_2.name=서리 벽돌 +tile.botania:azulejo_3.name=기와 tile.botania:customBrick0Stairs.name=지옥 벽돌 계단 tile.botania:customBrick1Stairs.name=영혼 벽돌 계단 tile.botania:customBrick2Stairs.name=서리 벽돌 계단 @@ -652,18 +652,18 @@ tile.botania:customBrick0Slab.name=지옥 벽돌 반블럭 tile.botania:customBrick1Slab.name=영혼 벽돌 반블럭 tile.botania:customBrick2Slab.name=서리 벽돌 반블럭 tile.botania:customBrick3Slab.name=기와 반블럭 -tile.botania:customBrick4.name=아줄레주 -tile.botania:customBrick5.name=아줄레주 -tile.botania:customBrick6.name=아줄레주 -tile.botania:customBrick7.name=아줄레주 -tile.botania:customBrick8.name=아줄레주 -tile.botania:customBrick9.name=아줄레주 -tile.botania:customBrick10.name=아줄레주 -tile.botania:customBrick11.name=아줄레주 -tile.botania:customBrick12.name=아줄레주 -tile.botania:customBrick13.name=아줄레주 -tile.botania:customBrick14.name=아줄레주 -tile.botania:customBrick15.name=아줄레주 +tile.botania:azulejo_4.name=아줄레주 +tile.botania:azulejo_5.name=아줄레주 +tile.botania:azulejo_6.name=아줄레주 +tile.botania:azulejo_7.name=아줄레주 +tile.botania:azulejo_8.name=아줄레주 +tile.botania:azulejo_9.name=아줄레주 +tile.botania:azulejo_10.name=아줄레주 +tile.botania:azulejo_11.name=아줄레주 +tile.botania:azulejo_12.name=아줄레주 +tile.botania:azulejo_13.name=아줄레주 +tile.botania:azulejo_14.name=아줄레주 +tile.botania:azulejo_15.name=아줄레주 tile.botania:enderEyeBlock.name=엔더 감독관 tile.botania:starfield.name=별 생성기 tile.botania:rfGenerator.name=마나 플럭스변환기 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index c19e515fd..7007f45a5 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -678,10 +678,10 @@ tile.botania:miniIsland14.name=Drijvende Rode Bloem tile.botania:miniIsland15.name=Drijvende Zwarte Bloem tile.botania:tinyPotato.name=Kleine Aardappel tile.botania:spawnerClaw.name=Levensbrenger -tile.botania:customBrick0.name=Helse Baksteen -tile.botania:customBrick1.name=Zielen Baksteen -tile.botania:customBrick2.name=Bevroren Baksteen -tile.botania:customBrick3.name=Dakpan +tile.botania:azulejo_0.name=Helse Baksteen +tile.botania:azulejo_1.name=Zielen Baksteen +tile.botania:azulejo_2.name=Bevroren Baksteen +tile.botania:azulejo_3.name=Dakpan tile.botania:customBrick0Stairs.name=Helse Baksteen Trap tile.botania:customBrick1Stairs.name=Zielen Baksteen Trap tile.botania:customBrick2Stairs.name=Bevroren Baksteen Trap @@ -694,18 +694,18 @@ tile.botania:customBrick2Slab.name=Bevroren Baksteen Plaat tile.botania:customBrick2SlabFull.name=Bevroren Baksteen Plaat tile.botania:customBrick3Slab.name=Dakpan Plaat tile.botania:customBrick3SlabFull.name=Dakpan Plaat -tile.botania:customBrick4.name=Azulejo -tile.botania:customBrick5.name=Azulejo -tile.botania:customBrick6.name=Azulejo -tile.botania:customBrick7.name=Azulejo -tile.botania:customBrick8.name=Azulejo -tile.botania:customBrick9.name=Azulejo -tile.botania:customBrick10.name=Azulejo -tile.botania:customBrick11.name=Azulejo -tile.botania:customBrick12.name=Azulejo -tile.botania:customBrick13.name=Azulejo -tile.botania:customBrick14.name=Azulejo -tile.botania:customBrick15.name=Azulejo +tile.botania:azulejo_4.name=Azulejo +tile.botania:azulejo_5.name=Azulejo +tile.botania:azulejo_6.name=Azulejo +tile.botania:azulejo_7.name=Azulejo +tile.botania:azulejo_8.name=Azulejo +tile.botania:azulejo_9.name=Azulejo +tile.botania:azulejo_10.name=Azulejo +tile.botania:azulejo_11.name=Azulejo +tile.botania:azulejo_12.name=Azulejo +tile.botania:azulejo_13.name=Azulejo +tile.botania:azulejo_14.name=Azulejo +tile.botania:azulejo_15.name=Azulejo tile.botania:enderEyeBlock.name=Ender Opzichter tile.botania:starfield.name=Sterrenmaker tile.botania:rfGenerator.name=Mana Veld diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index 8dca8843b..575e8d478 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -821,10 +821,10 @@ tile.botania:miniIsland14.name=Flor Vermelha Flutuante tile.botania:miniIsland15.name=Flor Preta Flutuante tile.botania:tinyPotato.name=Batatinha tile.botania:spawnerClaw.name=Imbuidor de Vida -tile.botania:customBrick0.name=Tijolo Infernal -tile.botania:customBrick1.name=Tijolo da Alma -tile.botania:customBrick2.name=Tijolo Invernal -tile.botania:customBrick3.name=Ladrilhos de Tijolo +tile.botania:azulejo_0.name=Tijolo Infernal +tile.botania:azulejo_1.name=Tijolo da Alma +tile.botania:azulejo_2.name=Tijolo Invernal +tile.botania:azulejo_3.name=Ladrilhos de Tijolo tile.botania:customBrick0Stairs.name=Escadas de Tijolo Infernal tile.botania:customBrick1Stairs.name=Escadas de Tijolo da Alma tile.botania:customBrick2Stairs.name=Escadas de Tijolo Invernal @@ -837,18 +837,18 @@ tile.botania:customBrick2Slab.name=Laje de Tijolo Invernal tile.botania:customBrick2SlabFull.name=Laje de Tijolo Invernal tile.botania:customBrick3Slab.name=Laje de Ladrilhos de Tijolo tile.botania:customBrick3SlabFull.name=Laje de Ladrilhos de Tijolo -tile.botania:customBrick4.name=Azulejo -tile.botania:customBrick5.name=Azulejo -tile.botania:customBrick6.name=Azulejo -tile.botania:customBrick7.name=Azulejo -tile.botania:customBrick8.name=Azulejo -tile.botania:customBrick9.name=Azulejo -tile.botania:customBrick10.name=Azulejo -tile.botania:customBrick11.name=Azulejo -tile.botania:customBrick12.name=Azulejo -tile.botania:customBrick13.name=Azulejo -tile.botania:customBrick14.name=Azulejo -tile.botania:customBrick15.name=Azulejo +tile.botania:azulejo_4.name=Azulejo +tile.botania:azulejo_5.name=Azulejo +tile.botania:azulejo_6.name=Azulejo +tile.botania:azulejo_7.name=Azulejo +tile.botania:azulejo_8.name=Azulejo +tile.botania:azulejo_9.name=Azulejo +tile.botania:azulejo_10.name=Azulejo +tile.botania:azulejo_11.name=Azulejo +tile.botania:azulejo_12.name=Azulejo +tile.botania:azulejo_13.name=Azulejo +tile.botania:azulejo_14.name=Azulejo +tile.botania:azulejo_15.name=Azulejo tile.botania:enderEyeBlock.name=Fiscalizador do Fim tile.botania:starfield.name=Projetor de Estrelas tile.botania:rfGenerator.name=Fluxo-campo de Mana diff --git a/src/main/resources/assets/botania/lang/ru_ru.lang b/src/main/resources/assets/botania/lang/ru_ru.lang index 301c941bf..61c0d5554 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.lang +++ b/src/main/resources/assets/botania/lang/ru_ru.lang @@ -410,10 +410,10 @@ tile.botania:miniIsland14.name=Парящий красный цветок tile.botania:miniIsland15.name=Парящий чёрный цветок tile.botania:tinyPotato.name=Миникартофель tile.botania:spawnerClaw.name=Вдох жизни -tile.botania:customBrick0.name=Адский кирпич -tile.botania:customBrick1.name=Душевный кирпич -tile.botania:customBrick2.name=Ледяной кирпич -tile.botania:customBrick3.name=Черепица +tile.botania:azulejo_0.name=Адский кирпич +tile.botania:azulejo_1.name=Душевный кирпич +tile.botania:azulejo_2.name=Ледяной кирпич +tile.botania:azulejo_3.name=Черепица tile.botania:customBrick0Stairs.name=Ступеньки из адского кирпича tile.botania:customBrick1Stairs.name=Ступеньки из душевного кирпича tile.botania:customBrick2Stairs.name=Ступеньки из ледяного кирпича @@ -422,18 +422,18 @@ tile.botania:customBrick0Slab.name=Плита из адского кирпича tile.botania:customBrick1Slab.name=Плита из душевного кирпича tile.botania:customBrick2Slab.name=Плита из ледяного кирпича tile.botania:customBrick3Slab.name=Плита из черепицы -tile.botania:customBrick4.name=Азулежу -tile.botania:customBrick5.name=Азулежу -tile.botania:customBrick6.name=Азулежу -tile.botania:customBrick7.name=Азулежу -tile.botania:customBrick8.name=Азулежу -tile.botania:customBrick9.name=Азулежу -tile.botania:customBrick10.name=Азулежу -tile.botania:customBrick11.name=Азулежу -tile.botania:customBrick12.name=Азулежу -tile.botania:customBrick13.name=Азулежу -tile.botania:customBrick14.name=Азулежу -tile.botania:customBrick15.name=Азулежу +tile.botania:azulejo_4.name=Азулежу +tile.botania:azulejo_5.name=Азулежу +tile.botania:azulejo_6.name=Азулежу +tile.botania:azulejo_7.name=Азулежу +tile.botania:azulejo_8.name=Азулежу +tile.botania:azulejo_9.name=Азулежу +tile.botania:azulejo_10.name=Азулежу +tile.botania:azulejo_11.name=Азулежу +tile.botania:azulejo_12.name=Азулежу +tile.botania:azulejo_13.name=Азулежу +tile.botania:azulejo_14.name=Азулежу +tile.botania:azulejo_15.name=Азулежу tile.botania:enderEyeBlock.name=Наблюдатель tile.botania:starfield.name=Творец созвездий tile.botania:rfGenerator.name=Мана-RF преобразователь diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index 72918684a..4f95e2b3c 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -828,22 +828,22 @@ tile.botania:miniIsland14.name=红色浮空花 tile.botania:miniIsland15.name=黑色浮空花 tile.botania:tinyPotato.name=小土豆 tile.botania:spawnerClaw.name=生命灌注器 -tile.botania:customBrick0.name=阿兹勒赫瓷砖 -tile.botania:customBrick1.name=阿兹勒赫瓷砖 -tile.botania:customBrick2.name=阿兹勒赫瓷砖 -tile.botania:customBrick3.name=阿兹勒赫瓷砖 -tile.botania:customBrick4.name=阿兹勒赫瓷砖 -tile.botania:customBrick5.name=阿兹勒赫瓷砖 -tile.botania:customBrick6.name=阿兹勒赫瓷砖 -tile.botania:customBrick7.name=阿兹勒赫瓷砖 -tile.botania:customBrick8.name=阿兹勒赫瓷砖 -tile.botania:customBrick9.name=阿兹勒赫瓷砖 -tile.botania:customBrick10.name=阿兹勒赫瓷砖 -tile.botania:customBrick11.name=阿兹勒赫瓷砖 -tile.botania:customBrick12.name=阿兹勒赫瓷砖 -tile.botania:customBrick13.name=阿兹勒赫瓷砖 -tile.botania:customBrick14.name=阿兹勒赫瓷砖 -tile.botania:customBrick15.name=阿兹勒赫瓷砖 +tile.botania:azulejo_0.name=阿兹勒赫瓷砖 +tile.botania:azulejo_1.name=阿兹勒赫瓷砖 +tile.botania:azulejo_2.name=阿兹勒赫瓷砖 +tile.botania:azulejo_3.name=阿兹勒赫瓷砖 +tile.botania:azulejo_4.name=阿兹勒赫瓷砖 +tile.botania:azulejo_5.name=阿兹勒赫瓷砖 +tile.botania:azulejo_6.name=阿兹勒赫瓷砖 +tile.botania:azulejo_7.name=阿兹勒赫瓷砖 +tile.botania:azulejo_8.name=阿兹勒赫瓷砖 +tile.botania:azulejo_9.name=阿兹勒赫瓷砖 +tile.botania:azulejo_10.name=阿兹勒赫瓷砖 +tile.botania:azulejo_11.name=阿兹勒赫瓷砖 +tile.botania:azulejo_12.name=阿兹勒赫瓷砖 +tile.botania:azulejo_13.name=阿兹勒赫瓷砖 +tile.botania:azulejo_14.name=阿兹勒赫瓷砖 +tile.botania:azulejo_15.name=阿兹勒赫瓷砖 tile.botania:enderEyeBlock.name=末影监视者 tile.botania:starfield.name=星空制造器 tile.botania:rfGenerator.name=魔力转换器 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index 18afd44c7..3f0f652f0 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -785,10 +785,10 @@ tile.botania:miniIsland14.name=紅色浮空花 tile.botania:miniIsland15.name=黑色浮空花 tile.botania:tinyPotato.name=小小馬鈴薯 tile.botania:spawnerClaw.name=生命灌注器 -tile.botania:customBrick0.name=煉獄磚塊 -tile.botania:customBrick1.name=靈魂磚塊 -tile.botania:customBrick2.name=霜凍磚塊 -tile.botania:customBrick3.name=瓦塊 +tile.botania:azulejo_0.name=煉獄磚塊 +tile.botania:azulejo_1.name=靈魂磚塊 +tile.botania:azulejo_2.name=霜凍磚塊 +tile.botania:azulejo_3.name=瓦塊 tile.botania:customBrick0Stairs.name=煉獄磚階梯 tile.botania:customBrick1Stairs.name=靈魂磚階梯 tile.botania:customBrick2Stairs.name=霜凍磚階梯 @@ -801,18 +801,18 @@ tile.botania:customBrick2Slab.name=霜凍磚半磚 tile.botania:customBrick2SlabFull.name=霜凍磚半磚 tile.botania:customBrick3Slab.name=瓦塊半磚 tile.botania:customBrick3SlabFull.name=瓦塊半磚 -tile.botania:customBrick4.name=阿茲勒赫瓷磚 -tile.botania:customBrick5.name=阿茲勒赫瓷磚 -tile.botania:customBrick6.name=阿茲勒赫瓷磚 -tile.botania:customBrick7.name=阿茲勒赫瓷磚 -tile.botania:customBrick8.name=阿茲勒赫瓷磚 -tile.botania:customBrick9.name=阿茲勒赫瓷磚 -tile.botania:customBrick10.name=阿茲勒赫瓷磚 -tile.botania:customBrick11.name=阿茲勒赫瓷磚 -tile.botania:customBrick12.name=阿茲勒赫瓷磚 -tile.botania:customBrick13.name=阿茲勒赫瓷磚 -tile.botania:customBrick14.name=阿茲勒赫瓷磚 -tile.botania:customBrick15.name=阿茲勒赫瓷磚 +tile.botania:azulejo_4.name=阿茲勒赫瓷磚 +tile.botania:azulejo_5.name=阿茲勒赫瓷磚 +tile.botania:azulejo_6.name=阿茲勒赫瓷磚 +tile.botania:azulejo_7.name=阿茲勒赫瓷磚 +tile.botania:azulejo_8.name=阿茲勒赫瓷磚 +tile.botania:azulejo_9.name=阿茲勒赫瓷磚 +tile.botania:azulejo_10.name=阿茲勒赫瓷磚 +tile.botania:azulejo_11.name=阿茲勒赫瓷磚 +tile.botania:azulejo_12.name=阿茲勒赫瓷磚 +tile.botania:azulejo_13.name=阿茲勒赫瓷磚 +tile.botania:azulejo_14.name=阿茲勒赫瓷磚 +tile.botania:azulejo_15.name=阿茲勒赫瓷磚 tile.botania:enderEyeBlock.name=終界監視者 tile.botania:starfield.name=星空製造器 tile.botania:rfGenerator.name=瑪那轉換器 diff --git a/src/main/resources/assets/botania/recipes/custombrick_0.json b/src/main/resources/assets/botania/recipes/azulejo_0.json similarity index 76% rename from src/main/resources/assets/botania/recipes/custombrick_0.json rename to src/main/resources/assets/botania/recipes/azulejo_0.json index 0dfb89556..ad9b6d526 100644 --- a/src/main/resources/assets/botania/recipes/custombrick_0.json +++ b/src/main/resources/assets/botania/recipes/azulejo_0.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:custombrick", - "data": 0 + "item": "botania:azulejo_0" }, "ingredients": [ { diff --git a/src/main/resources/assets/botania/recipes/custombrick_3.json b/src/main/resources/assets/botania/recipes/azulejo_0_alt.json similarity index 57% rename from src/main/resources/assets/botania/recipes/custombrick_3.json rename to src/main/resources/assets/botania/recipes/azulejo_0_alt.json index 776b65222..814fc6f2e 100644 --- a/src/main/resources/assets/botania/recipes/custombrick_3.json +++ b/src/main/resources/assets/botania/recipes/azulejo_0_alt.json @@ -1,13 +1,11 @@ { "result": { - "item": "botania:custombrick", - "data": 3 + "item": "botania:azulejo_0" }, "group": "botania:azulejo_cycling", "ingredients": [ { - "item": "botania:custombrick", - "data": 2 + "item": "botania:azulejo_15" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/custombrick_1.json b/src/main/resources/assets/botania/recipes/azulejo_1.json similarity index 57% rename from src/main/resources/assets/botania/recipes/custombrick_1.json rename to src/main/resources/assets/botania/recipes/azulejo_1.json index 4c8b1c366..0f2b0a2e3 100644 --- a/src/main/resources/assets/botania/recipes/custombrick_1.json +++ b/src/main/resources/assets/botania/recipes/azulejo_1.json @@ -1,13 +1,11 @@ { "result": { - "item": "botania:custombrick", - "data": 2 + "item": "botania:azulejo_1" }, "group": "botania:azulejo_cycling", "ingredients": [ { - "item": "botania:custombrick", - "data": 1 + "item": "botania:azulejo_0" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/custombrick_4.json b/src/main/resources/assets/botania/recipes/azulejo_10.json similarity index 57% rename from src/main/resources/assets/botania/recipes/custombrick_4.json rename to src/main/resources/assets/botania/recipes/azulejo_10.json index 56261d807..854b29b0b 100644 --- a/src/main/resources/assets/botania/recipes/custombrick_4.json +++ b/src/main/resources/assets/botania/recipes/azulejo_10.json @@ -1,13 +1,11 @@ { "result": { - "item": "botania:custombrick", - "data": 4 + "item": "botania:azulejo_10" }, "group": "botania:azulejo_cycling", "ingredients": [ { - "item": "botania:custombrick", - "data": 3 + "item": "botania:azulejo_9" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/custombrick_2.json b/src/main/resources/assets/botania/recipes/azulejo_11.json similarity index 57% rename from src/main/resources/assets/botania/recipes/custombrick_2.json rename to src/main/resources/assets/botania/recipes/azulejo_11.json index 2dcbc70f4..c2ff377bc 100644 --- a/src/main/resources/assets/botania/recipes/custombrick_2.json +++ b/src/main/resources/assets/botania/recipes/azulejo_11.json @@ -1,13 +1,11 @@ { "result": { - "item": "botania:custombrick", - "data": 1 + "item": "botania:azulejo_11" }, "group": "botania:azulejo_cycling", "ingredients": [ { - "item": "botania:custombrick", - "data": 0 + "item": "botania:azulejo_10" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/azulejo_12.json b/src/main/resources/assets/botania/recipes/azulejo_12.json new file mode 100644 index 000000000..6e86afaef --- /dev/null +++ b/src/main/resources/assets/botania/recipes/azulejo_12.json @@ -0,0 +1,12 @@ +{ + "result": { + "item": "botania:azulejo_12" + }, + "group": "botania:azulejo_cycling", + "ingredients": [ + { + "item": "botania:azulejo_11" + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/azulejo_13.json b/src/main/resources/assets/botania/recipes/azulejo_13.json new file mode 100644 index 000000000..8b756fb82 --- /dev/null +++ b/src/main/resources/assets/botania/recipes/azulejo_13.json @@ -0,0 +1,12 @@ +{ + "result": { + "item": "botania:azulejo_13" + }, + "group": "botania:azulejo_cycling", + "ingredients": [ + { + "item": "botania:azulejo_12" + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/azulejo_14.json b/src/main/resources/assets/botania/recipes/azulejo_14.json new file mode 100644 index 000000000..c82275190 --- /dev/null +++ b/src/main/resources/assets/botania/recipes/azulejo_14.json @@ -0,0 +1,12 @@ +{ + "result": { + "item": "botania:azulejo_14" + }, + "group": "botania:azulejo_cycling", + "ingredients": [ + { + "item": "botania:azulejo_13" + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/azulejo_15.json b/src/main/resources/assets/botania/recipes/azulejo_15.json new file mode 100644 index 000000000..a509b9e89 --- /dev/null +++ b/src/main/resources/assets/botania/recipes/azulejo_15.json @@ -0,0 +1,12 @@ +{ + "result": { + "item": "botania:azulejo_15" + }, + "group": "botania:azulejo_cycling", + "ingredients": [ + { + "item": "botania:azulejo_14" + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/azulejo_2.json b/src/main/resources/assets/botania/recipes/azulejo_2.json new file mode 100644 index 000000000..9d0c493d0 --- /dev/null +++ b/src/main/resources/assets/botania/recipes/azulejo_2.json @@ -0,0 +1,12 @@ +{ + "result": { + "item": "botania:azulejo_2" + }, + "group": "botania:azulejo_cycling", + "ingredients": [ + { + "item": "botania:azulejo_1" + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/azulejo_3.json b/src/main/resources/assets/botania/recipes/azulejo_3.json new file mode 100644 index 000000000..b9e4a6ccf --- /dev/null +++ b/src/main/resources/assets/botania/recipes/azulejo_3.json @@ -0,0 +1,12 @@ +{ + "result": { + "item": "botania:azulejo_3" + }, + "group": "botania:azulejo_cycling", + "ingredients": [ + { + "item": "botania:azulejo_2" + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/azulejo_4.json b/src/main/resources/assets/botania/recipes/azulejo_4.json new file mode 100644 index 000000000..909fab70a --- /dev/null +++ b/src/main/resources/assets/botania/recipes/azulejo_4.json @@ -0,0 +1,12 @@ +{ + "result": { + "item": "botania:azulejo_4" + }, + "group": "botania:azulejo_cycling", + "ingredients": [ + { + "item": "botania:azulejo_3" + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/azulejo_5.json b/src/main/resources/assets/botania/recipes/azulejo_5.json new file mode 100644 index 000000000..80882915c --- /dev/null +++ b/src/main/resources/assets/botania/recipes/azulejo_5.json @@ -0,0 +1,12 @@ +{ + "result": { + "item": "botania:azulejo_5" + }, + "group": "botania:azulejo_cycling", + "ingredients": [ + { + "item": "botania:azulejo_4" + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/azulejo_6.json b/src/main/resources/assets/botania/recipes/azulejo_6.json new file mode 100644 index 000000000..e7dd6ca8b --- /dev/null +++ b/src/main/resources/assets/botania/recipes/azulejo_6.json @@ -0,0 +1,12 @@ +{ + "result": { + "item": "botania:azulejo_6" + }, + "group": "botania:azulejo_cycling", + "ingredients": [ + { + "item": "botania:azulejo_5" + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/azulejo_7.json b/src/main/resources/assets/botania/recipes/azulejo_7.json new file mode 100644 index 000000000..be396bd7e --- /dev/null +++ b/src/main/resources/assets/botania/recipes/azulejo_7.json @@ -0,0 +1,12 @@ +{ + "result": { + "item": "botania:azulejo_7" + }, + "group": "botania:azulejo_cycling", + "ingredients": [ + { + "item": "botania:azulejo_6" + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/azulejo_8.json b/src/main/resources/assets/botania/recipes/azulejo_8.json new file mode 100644 index 000000000..0e29ca373 --- /dev/null +++ b/src/main/resources/assets/botania/recipes/azulejo_8.json @@ -0,0 +1,12 @@ +{ + "result": { + "item": "botania:azulejo_8" + }, + "group": "botania:azulejo_cycling", + "ingredients": [ + { + "item": "botania:azulejo_7" + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/azulejo_9.json b/src/main/resources/assets/botania/recipes/azulejo_9.json new file mode 100644 index 000000000..d33301671 --- /dev/null +++ b/src/main/resources/assets/botania/recipes/azulejo_9.json @@ -0,0 +1,12 @@ +{ + "result": { + "item": "botania:azulejo_9" + }, + "group": "botania:azulejo_cycling", + "ingredients": [ + { + "item": "botania:azulejo_8" + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/custombrick_0_alt.json b/src/main/resources/assets/botania/recipes/custombrick_0_alt.json deleted file mode 100644 index 262ef6757..000000000 --- a/src/main/resources/assets/botania/recipes/custombrick_0_alt.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "result": { - "item": "botania:custombrick", - "data": 0 - }, - "group": "botania:azulejo_cycling", - "ingredients": [ - { - "item": "botania:custombrick", - "data": 15 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/custombrick_10.json b/src/main/resources/assets/botania/recipes/custombrick_10.json deleted file mode 100644 index 1d0247cb4..000000000 --- a/src/main/resources/assets/botania/recipes/custombrick_10.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "result": { - "item": "botania:custombrick", - "data": 10 - }, - "group": "botania:azulejo_cycling", - "ingredients": [ - { - "item": "botania:custombrick", - "data": 9 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/custombrick_11.json b/src/main/resources/assets/botania/recipes/custombrick_11.json deleted file mode 100644 index bcf169ba2..000000000 --- a/src/main/resources/assets/botania/recipes/custombrick_11.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "result": { - "item": "botania:custombrick", - "data": 11 - }, - "group": "botania:azulejo_cycling", - "ingredients": [ - { - "item": "botania:custombrick", - "data": 10 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/custombrick_12.json b/src/main/resources/assets/botania/recipes/custombrick_12.json deleted file mode 100644 index 55e555ec4..000000000 --- a/src/main/resources/assets/botania/recipes/custombrick_12.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "result": { - "item": "botania:custombrick", - "data": 12 - }, - "group": "botania:azulejo_cycling", - "ingredients": [ - { - "item": "botania:custombrick", - "data": 11 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/custombrick_13.json b/src/main/resources/assets/botania/recipes/custombrick_13.json deleted file mode 100644 index 2e9f7a9ac..000000000 --- a/src/main/resources/assets/botania/recipes/custombrick_13.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "result": { - "item": "botania:custombrick", - "data": 13 - }, - "group": "botania:azulejo_cycling", - "ingredients": [ - { - "item": "botania:custombrick", - "data": 12 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/custombrick_14.json b/src/main/resources/assets/botania/recipes/custombrick_14.json deleted file mode 100644 index 1b26978cd..000000000 --- a/src/main/resources/assets/botania/recipes/custombrick_14.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "result": { - "item": "botania:custombrick", - "data": 14 - }, - "group": "botania:azulejo_cycling", - "ingredients": [ - { - "item": "botania:custombrick", - "data": 13 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/custombrick_15.json b/src/main/resources/assets/botania/recipes/custombrick_15.json deleted file mode 100644 index 49f3203a9..000000000 --- a/src/main/resources/assets/botania/recipes/custombrick_15.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "result": { - "item": "botania:custombrick", - "data": 15 - }, - "group": "botania:azulejo_cycling", - "ingredients": [ - { - "item": "botania:custombrick", - "data": 14 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/custombrick_5.json b/src/main/resources/assets/botania/recipes/custombrick_5.json deleted file mode 100644 index faaaddd3f..000000000 --- a/src/main/resources/assets/botania/recipes/custombrick_5.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "result": { - "item": "botania:custombrick", - "data": 5 - }, - "group": "botania:azulejo_cycling", - "ingredients": [ - { - "item": "botania:custombrick", - "data": 4 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/custombrick_6.json b/src/main/resources/assets/botania/recipes/custombrick_6.json deleted file mode 100644 index 67b38711a..000000000 --- a/src/main/resources/assets/botania/recipes/custombrick_6.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "result": { - "item": "botania:custombrick", - "data": 6 - }, - "group": "botania:azulejo_cycling", - "ingredients": [ - { - "item": "botania:custombrick", - "data": 5 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/custombrick_7.json b/src/main/resources/assets/botania/recipes/custombrick_7.json deleted file mode 100644 index 0a0dd4796..000000000 --- a/src/main/resources/assets/botania/recipes/custombrick_7.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "result": { - "item": "botania:custombrick", - "data": 7 - }, - "group": "botania:azulejo_cycling", - "ingredients": [ - { - "item": "botania:custombrick", - "data": 6 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/custombrick_8.json b/src/main/resources/assets/botania/recipes/custombrick_8.json deleted file mode 100644 index 1cc97ca66..000000000 --- a/src/main/resources/assets/botania/recipes/custombrick_8.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "result": { - "item": "botania:custombrick", - "data": 8 - }, - "group": "botania:azulejo_cycling", - "ingredients": [ - { - "item": "botania:custombrick", - "data": 7 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/custombrick_9.json b/src/main/resources/assets/botania/recipes/custombrick_9.json deleted file mode 100644 index 338175a8f..000000000 --- a/src/main/resources/assets/botania/recipes/custombrick_9.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "result": { - "item": "botania:custombrick", - "data": 9 - }, - "group": "botania:azulejo_cycling", - "ingredients": [ - { - "item": "botania:custombrick", - "data": 8 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file