diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 5f902cb52..7eaad1d90 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -22,6 +22,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.common.block.decor.BlockBiomeStone; import vazkii.botania.common.block.decor.panes.BlockModPane; import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartzPillar; import vazkii.botania.common.block.decor.quartz.BlockElfQuartzSlab; @@ -111,6 +112,8 @@ public final class ModFluffBlocks { @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "forest_stone" + SLAB_SUFFIX) public static Block biomeStoneForestSlab; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "forest_stone" + STAIR_SUFFIX) public static Block biomeStoneForestStairs; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "forest_cobblestone") public static Block biomeCobblestoneForest; + @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "forest_cobblestone" + SLAB_SUFFIX) public static Block biomeCobblestoneForestSlab; + @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "forest_cobblestone" + STAIR_SUFFIX) public static Block biomeCobblestoneForestStairs; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "forest_cobblestone" + WALL_SUFFIX) public static Block biomeWallForest; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "forest_bricks") public static Block biomeBrickForest; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "forest_bricks" + SLAB_SUFFIX) public static Block biomeBrickForestSlab; @@ -121,6 +124,8 @@ public final class ModFluffBlocks { @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "plains_stone" + SLAB_SUFFIX) public static Block biomeStonePlainsSlab; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "plains_stone" + STAIR_SUFFIX) public static Block biomeStonePlainsStairs; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "plains_cobblestone") public static Block biomeCobblestonePlains; + @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "plains_cobblestone" + SLAB_SUFFIX) public static Block biomeCobblestonePlainsSlab; + @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "plains_cobblestone" + STAIR_SUFFIX) public static Block biomeCobblestonePlainsStairs; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "plains_cobblestone" + WALL_SUFFIX) public static Block biomeWallPlains; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "plains_bricks") public static Block biomeBrickPlains; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "plains_bricks" + SLAB_SUFFIX) public static Block biomeBrickPlainsSlab; @@ -131,6 +136,8 @@ public final class ModFluffBlocks { @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mountain_stone" + SLAB_SUFFIX) public static Block biomeStoneMountainSlab; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mountain_stone" + STAIR_SUFFIX) public static Block biomeStoneMountainStairs; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mountain_cobblestone") public static Block biomeCobblestoneMountain; + @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mountain_cobblestone" + SLAB_SUFFIX) public static Block biomeCobblestoneMountainSlab; + @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mountain_cobblestone" + STAIR_SUFFIX) public static Block biomeCobblestoneMountainStairs; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mountain_cobblestone" + WALL_SUFFIX) public static Block biomeWallMountain; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mountain_bricks") public static Block biomeBrickMountain; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mountain_bricks" + SLAB_SUFFIX) public static Block biomeBrickMountainSlab; @@ -141,6 +148,8 @@ public final class ModFluffBlocks { @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "fungal_stone" + SLAB_SUFFIX) public static Block biomeStoneFungalSlab; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "fungal_stone" + STAIR_SUFFIX) public static Block biomeStoneFungalStairs; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "fungal_cobblestone") public static Block biomeCobblestoneFungal; + @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "fungal_cobblestone" + SLAB_SUFFIX) public static Block biomeCobblestoneFungalSlab; + @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "fungal_cobblestone" + STAIR_SUFFIX) public static Block biomeCobblestoneFungalStairs; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "fungal_cobblestone" + WALL_SUFFIX) public static Block biomeWallFungal; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "fungal_bricks") public static Block biomeBrickFungal; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "fungal_bricks" + SLAB_SUFFIX) public static Block biomeBrickFungalSlab; @@ -151,6 +160,8 @@ public final class ModFluffBlocks { @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "swamp_stone" + SLAB_SUFFIX) public static Block biomeStoneSwampSlab; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "swamp_stone" + STAIR_SUFFIX) public static Block biomeStoneSwampStairs; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "swamp_cobblestone") public static Block biomeCobblestoneSwamp; + @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "swamp_cobblestone" + SLAB_SUFFIX) public static Block biomeCobblestoneSwampSlab; + @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "swamp_cobblestone" + STAIR_SUFFIX) public static Block biomeCobblestoneSwampStairs; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "swamp_cobblestone" + WALL_SUFFIX) public static Block biomeWallSwamp; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "swamp_bricks") public static Block biomeBrickSwamp; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "swamp_bricks" + SLAB_SUFFIX) public static Block biomeBrickSwampSlab; @@ -161,6 +172,8 @@ public final class ModFluffBlocks { @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "desert_stone" + SLAB_SUFFIX) public static Block biomeStoneDesertSlab; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "desert_stone" + STAIR_SUFFIX) public static Block biomeStoneDesertStairs; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "desert_cobblestone") public static Block biomeCobblestoneDesert; + @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "desert_cobblestone" + SLAB_SUFFIX) public static Block biomeCobblestoneDesertSlab; + @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "desert_cobblestone" + STAIR_SUFFIX) public static Block biomeCobblestoneDesertStairs; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "desert_cobblestone" + WALL_SUFFIX) public static Block biomeWallDesert; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "desert_bricks") public static Block biomeBrickDesert; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "desert_bricks" + SLAB_SUFFIX) public static Block biomeBrickDesertSlab; @@ -171,6 +184,8 @@ public final class ModFluffBlocks { @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "taiga_stone" + SLAB_SUFFIX) public static Block biomeStoneTaigaSlab; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "taiga_stone" + STAIR_SUFFIX) public static Block biomeStoneTaigaStairs; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "taiga_cobblestone") public static Block biomeCobblestoneTaiga; + @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "taiga_cobblestone" + SLAB_SUFFIX) public static Block biomeCobblestoneTaigaSlab; + @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "taiga_cobblestone" + STAIR_SUFFIX) public static Block biomeCobblestoneTaigaStairs; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "taiga_cobblestone" + WALL_SUFFIX) public static Block biomeWallTaiga; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "taiga_bricks") public static Block biomeBrickTaiga; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "taiga_bricks" + SLAB_SUFFIX) public static Block biomeBrickTaigaSlab; @@ -181,6 +196,8 @@ public final class ModFluffBlocks { @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mesa_stone" + SLAB_SUFFIX) public static Block biomeStoneMesaSlab; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mesa_stone" + STAIR_SUFFIX) public static Block biomeStoneMesaStairs; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mesa_cobblestone") public static Block biomeCobblestoneMesa; + @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mesa_cobblestone" + SLAB_SUFFIX) public static Block biomeCobblestoneMesaSlab; + @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mesa_cobblestone" + STAIR_SUFFIX) public static Block biomeCobblestoneMesaStairs; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mesa_cobblestone" + WALL_SUFFIX) public static Block biomeWallMesa; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mesa_bricks") public static Block biomeBrickMesa; @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mesa_bricks" + SLAB_SUFFIX) public static Block biomeBrickMesaSlab; @@ -313,7 +330,7 @@ public final class ModFluffBlocks { "swamp", "desert", "taiga", "mesa" }; for (String variant : variants) { - base = new BlockModLexiconable(props, marimorph); + base = new BlockBiomeStone(props); register(r, base, LibBlockNames.METAMORPHIC_PREFIX + variant + "_stone"); register(r, new BlockBiomeStoneStairs(base.getDefaultState(), props), base.getRegistryName().getPath() + STAIR_SUFFIX); register(r, new BlockBiomeStoneSlab(props), base.getRegistryName().getPath() + SLAB_SUFFIX); @@ -424,6 +441,8 @@ public final class ModFluffBlocks { r.register(new ItemBlockMod(biomeBrickForestSlab, props).setRegistryName(biomeBrickForestSlab.getRegistryName())); r.register(new ItemBlockMod(biomeBrickForestStairs, props).setRegistryName(biomeBrickForestStairs.getRegistryName())); r.register(new ItemBlockMod(biomeCobblestoneForest, props).setRegistryName(biomeCobblestoneForest.getRegistryName())); + r.register(new ItemBlockMod(biomeCobblestoneForestSlab, props).setRegistryName(biomeCobblestoneForestSlab.getRegistryName())); + r.register(new ItemBlockMod(biomeCobblestoneForestStairs, props).setRegistryName(biomeCobblestoneForestStairs.getRegistryName())); r.register(new ItemBlockMod(biomeWallForest, props).setRegistryName(biomeWallForest.getRegistryName())); r.register(new ItemBlockMod(biomeChiseledBrickForest, props).setRegistryName(biomeChiseledBrickForest.getRegistryName())); @@ -434,6 +453,8 @@ public final class ModFluffBlocks { r.register(new ItemBlockMod(biomeBrickPlainsSlab, props).setRegistryName(biomeBrickPlainsSlab.getRegistryName())); r.register(new ItemBlockMod(biomeBrickPlainsStairs, props).setRegistryName(biomeBrickPlainsStairs.getRegistryName())); r.register(new ItemBlockMod(biomeCobblestonePlains, props).setRegistryName(biomeCobblestonePlains.getRegistryName())); + r.register(new ItemBlockMod(biomeCobblestonePlainsSlab, props).setRegistryName(biomeCobblestonePlainsSlab.getRegistryName())); + r.register(new ItemBlockMod(biomeCobblestonePlainsStairs, props).setRegistryName(biomeCobblestonePlainsStairs.getRegistryName())); r.register(new ItemBlockMod(biomeWallPlains, props).setRegistryName(biomeWallPlains.getRegistryName())); r.register(new ItemBlockMod(biomeChiseledBrickPlains, props).setRegistryName(biomeChiseledBrickPlains.getRegistryName())); @@ -444,6 +465,8 @@ public final class ModFluffBlocks { r.register(new ItemBlockMod(biomeBrickMountainSlab, props).setRegistryName(biomeBrickMountainSlab.getRegistryName())); r.register(new ItemBlockMod(biomeBrickMountainStairs, props).setRegistryName(biomeBrickMountainStairs.getRegistryName())); r.register(new ItemBlockMod(biomeCobblestoneMountain, props).setRegistryName(biomeCobblestoneMountain.getRegistryName())); + r.register(new ItemBlockMod(biomeCobblestoneMountainSlab, props).setRegistryName(biomeCobblestoneMountainSlab.getRegistryName())); + r.register(new ItemBlockMod(biomeCobblestoneMountainStairs, props).setRegistryName(biomeCobblestoneMountainStairs.getRegistryName())); r.register(new ItemBlockMod(biomeWallMountain, props).setRegistryName(biomeWallMountain.getRegistryName())); r.register(new ItemBlockMod(biomeChiseledBrickMountain, props).setRegistryName(biomeChiseledBrickMountain.getRegistryName())); @@ -454,6 +477,8 @@ public final class ModFluffBlocks { r.register(new ItemBlockMod(biomeBrickFungalSlab, props).setRegistryName(biomeBrickFungalSlab.getRegistryName())); r.register(new ItemBlockMod(biomeBrickFungalStairs, props).setRegistryName(biomeBrickFungalStairs.getRegistryName())); r.register(new ItemBlockMod(biomeCobblestoneFungal, props).setRegistryName(biomeCobblestoneFungal.getRegistryName())); + r.register(new ItemBlockMod(biomeCobblestoneFungalSlab, props).setRegistryName(biomeCobblestoneFungalSlab.getRegistryName())); + r.register(new ItemBlockMod(biomeCobblestoneFungalStairs, props).setRegistryName(biomeCobblestoneFungalStairs.getRegistryName())); r.register(new ItemBlockMod(biomeWallFungal, props).setRegistryName(biomeWallFungal.getRegistryName())); r.register(new ItemBlockMod(biomeChiseledBrickFungal, props).setRegistryName(biomeChiseledBrickFungal.getRegistryName())); @@ -464,6 +489,8 @@ public final class ModFluffBlocks { r.register(new ItemBlockMod(biomeBrickSwampSlab, props).setRegistryName(biomeBrickSwampSlab.getRegistryName())); r.register(new ItemBlockMod(biomeBrickSwampStairs, props).setRegistryName(biomeBrickSwampStairs.getRegistryName())); r.register(new ItemBlockMod(biomeCobblestoneSwamp, props).setRegistryName(biomeCobblestoneSwamp.getRegistryName())); + r.register(new ItemBlockMod(biomeCobblestoneSwampSlab, props).setRegistryName(biomeCobblestoneSwampSlab.getRegistryName())); + r.register(new ItemBlockMod(biomeCobblestoneSwampStairs, props).setRegistryName(biomeCobblestoneSwampStairs.getRegistryName())); r.register(new ItemBlockMod(biomeWallSwamp, props).setRegistryName(biomeWallSwamp.getRegistryName())); r.register(new ItemBlockMod(biomeChiseledBrickSwamp, props).setRegistryName(biomeChiseledBrickSwamp.getRegistryName())); @@ -474,6 +501,8 @@ public final class ModFluffBlocks { r.register(new ItemBlockMod(biomeBrickDesertSlab, props).setRegistryName(biomeBrickDesertSlab.getRegistryName())); r.register(new ItemBlockMod(biomeBrickDesertStairs, props).setRegistryName(biomeBrickDesertStairs.getRegistryName())); r.register(new ItemBlockMod(biomeCobblestoneDesert, props).setRegistryName(biomeCobblestoneDesert.getRegistryName())); + r.register(new ItemBlockMod(biomeCobblestoneDesertSlab, props).setRegistryName(biomeCobblestoneDesertSlab.getRegistryName())); + r.register(new ItemBlockMod(biomeCobblestoneDesertStairs, props).setRegistryName(biomeCobblestoneDesertStairs.getRegistryName())); r.register(new ItemBlockMod(biomeWallDesert, props).setRegistryName(biomeWallDesert.getRegistryName())); r.register(new ItemBlockMod(biomeChiseledBrickDesert, props).setRegistryName(biomeChiseledBrickDesert.getRegistryName())); @@ -484,6 +513,8 @@ public final class ModFluffBlocks { r.register(new ItemBlockMod(biomeBrickTaigaSlab, props).setRegistryName(biomeBrickTaigaSlab.getRegistryName())); r.register(new ItemBlockMod(biomeBrickTaigaStairs, props).setRegistryName(biomeBrickTaigaStairs.getRegistryName())); r.register(new ItemBlockMod(biomeCobblestoneTaiga, props).setRegistryName(biomeCobblestoneTaiga.getRegistryName())); + r.register(new ItemBlockMod(biomeCobblestoneTaigaSlab, props).setRegistryName(biomeCobblestoneTaigaSlab.getRegistryName())); + r.register(new ItemBlockMod(biomeCobblestoneTaigaStairs, props).setRegistryName(biomeCobblestoneTaigaStairs.getRegistryName())); r.register(new ItemBlockMod(biomeWallTaiga, props).setRegistryName(biomeWallTaiga.getRegistryName())); r.register(new ItemBlockMod(biomeChiseledBrickTaiga, props).setRegistryName(biomeChiseledBrickTaiga.getRegistryName())); @@ -494,6 +525,8 @@ public final class ModFluffBlocks { r.register(new ItemBlockMod(biomeBrickMesaSlab, props).setRegistryName(biomeBrickMesaSlab.getRegistryName())); r.register(new ItemBlockMod(biomeBrickMesaStairs, props).setRegistryName(biomeBrickMesaStairs.getRegistryName())); r.register(new ItemBlockMod(biomeCobblestoneMesa, props).setRegistryName(biomeCobblestoneMesa.getRegistryName())); + r.register(new ItemBlockMod(biomeCobblestoneMesaSlab, props).setRegistryName(biomeCobblestoneMesaSlab.getRegistryName())); + r.register(new ItemBlockMod(biomeCobblestoneMesaStairs, props).setRegistryName(biomeCobblestoneMesaStairs.getRegistryName())); r.register(new ItemBlockMod(biomeWallMesa, props).setRegistryName(biomeWallMesa.getRegistryName())); r.register(new ItemBlockMod(biomeChiseledBrickMesa, props).setRegistryName(biomeChiseledBrickMesa.getRegistryName())); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBiomeStone.java b/src/main/java/vazkii/botania/common/block/decor/BlockBiomeStone.java new file mode 100644 index 000000000..d6dc61f1d --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBiomeStone.java @@ -0,0 +1,49 @@ +package vazkii.botania.common.block.decor; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IItemProvider; +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.block.ModFluffBlocks; +import vazkii.botania.common.lexicon.LexiconData; + +import javax.annotation.Nonnull; + +public class BlockBiomeStone extends BlockMod implements ILexiconable { + public BlockBiomeStone(Properties builder) { + super(builder); + } + + @Nonnull + @Override + public IItemProvider getItemDropped(IBlockState state, World world, BlockPos pos, int fortune) { + if(this == ModFluffBlocks.biomeStoneForest) + return ModFluffBlocks.biomeCobblestoneForest; + if(this == ModFluffBlocks.biomeStonePlains) + return ModFluffBlocks.biomeCobblestonePlains; + if(this == ModFluffBlocks.biomeStoneMountain) + return ModFluffBlocks.biomeCobblestoneMountain; + if(this == ModFluffBlocks.biomeStoneFungal) + return ModFluffBlocks.biomeCobblestoneFungal; + if(this == ModFluffBlocks.biomeStoneSwamp) + return ModFluffBlocks.biomeCobblestoneSwamp; + if(this == ModFluffBlocks.biomeStoneDesert) + return ModFluffBlocks.biomeCobblestoneDesert; + if(this == ModFluffBlocks.biomeStoneTaiga) + return ModFluffBlocks.biomeCobblestoneTaiga; + if(this == ModFluffBlocks.biomeStoneMesa) + return ModFluffBlocks.biomeCobblestoneMesa; + return Blocks.AIR; + } + + @Override + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { + return LexiconData.marimorphosis; + } +} diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index b9dcbfde6..bed4bf9c7 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -517,15 +517,89 @@ public final class BotaniaCreativeTab extends ItemGroup { addItem(ModFluffBlocks.sunnyQuartzSlab); addItem(ModFluffBlocks.sunnyQuartzStairs); - /* todo 1.13 cba to type this all out rn - addItem(ModFluffBlocks.biomeStoneA); - addItem(ModFluffBlocks.biomeStoneB); - for(int i = 0; i < 24; i++) - addItem(ModFluffBlocks.biomeStoneStairs[i]); - for(int i = 0; i < 24; i++) - addItem(ModFluffBlocks.biomeStoneSlabs[i]); - addItem(ModFluffBlocks.biomeStoneWall); - */ + addItem(ModFluffBlocks.biomeStoneForest); + addItem(ModFluffBlocks.biomeStonePlains); + addItem(ModFluffBlocks.biomeStoneMountain); + addItem(ModFluffBlocks.biomeStoneFungal); + addItem(ModFluffBlocks.biomeStoneSwamp); + addItem(ModFluffBlocks.biomeStoneDesert); + addItem(ModFluffBlocks.biomeStoneTaiga); + addItem(ModFluffBlocks.biomeStoneMesa); + addItem(ModFluffBlocks.biomeCobblestoneForest); + addItem(ModFluffBlocks.biomeCobblestonePlains); + addItem(ModFluffBlocks.biomeCobblestoneMountain); + addItem(ModFluffBlocks.biomeCobblestoneFungal); + addItem(ModFluffBlocks.biomeCobblestoneSwamp); + addItem(ModFluffBlocks.biomeCobblestoneDesert); + addItem(ModFluffBlocks.biomeCobblestoneTaiga); + addItem(ModFluffBlocks.biomeCobblestoneMesa); + addItem(ModFluffBlocks.biomeBrickForest); + addItem(ModFluffBlocks.biomeBrickPlains); + addItem(ModFluffBlocks.biomeBrickMountain); + addItem(ModFluffBlocks.biomeBrickFungal); + addItem(ModFluffBlocks.biomeBrickSwamp); + addItem(ModFluffBlocks.biomeBrickDesert); + addItem(ModFluffBlocks.biomeBrickTaiga); + addItem(ModFluffBlocks.biomeBrickMesa); + + addItem(ModFluffBlocks.biomeStoneForestStairs); + addItem(ModFluffBlocks.biomeStonePlainsStairs); + addItem(ModFluffBlocks.biomeStoneMountainStairs); + addItem(ModFluffBlocks.biomeStoneFungalStairs); + addItem(ModFluffBlocks.biomeStoneSwampStairs); + addItem(ModFluffBlocks.biomeStoneDesertStairs); + addItem(ModFluffBlocks.biomeStoneTaigaStairs); + addItem(ModFluffBlocks.biomeStoneMesaStairs); + addItem(ModFluffBlocks.biomeCobblestoneForestStairs); + addItem(ModFluffBlocks.biomeCobblestonePlainsStairs); + addItem(ModFluffBlocks.biomeCobblestoneMountainStairs); + addItem(ModFluffBlocks.biomeCobblestoneFungalStairs); + addItem(ModFluffBlocks.biomeCobblestoneSwampStairs); + addItem(ModFluffBlocks.biomeCobblestoneDesertStairs); + addItem(ModFluffBlocks.biomeCobblestoneTaigaStairs); + addItem(ModFluffBlocks.biomeCobblestoneMesaStairs); + addItem(ModFluffBlocks.biomeBrickForestStairs); + addItem(ModFluffBlocks.biomeBrickPlainsStairs); + addItem(ModFluffBlocks.biomeBrickMountainStairs); + addItem(ModFluffBlocks.biomeBrickFungalStairs); + addItem(ModFluffBlocks.biomeBrickSwampStairs); + addItem(ModFluffBlocks.biomeBrickDesertStairs); + addItem(ModFluffBlocks.biomeBrickTaigaStairs); + addItem(ModFluffBlocks.biomeBrickMesaStairs); + + addItem(ModFluffBlocks.biomeStoneForestSlab); + addItem(ModFluffBlocks.biomeStonePlainsSlab); + addItem(ModFluffBlocks.biomeStoneMountainSlab); + addItem(ModFluffBlocks.biomeStoneFungalSlab); + addItem(ModFluffBlocks.biomeStoneSwampSlab); + addItem(ModFluffBlocks.biomeStoneDesertSlab); + addItem(ModFluffBlocks.biomeStoneTaigaSlab); + addItem(ModFluffBlocks.biomeStoneMesaSlab); + addItem(ModFluffBlocks.biomeCobblestoneForestSlab); + addItem(ModFluffBlocks.biomeCobblestonePlainsSlab); + addItem(ModFluffBlocks.biomeCobblestoneMountainSlab); + addItem(ModFluffBlocks.biomeCobblestoneFungalSlab); + addItem(ModFluffBlocks.biomeCobblestoneSwampSlab); + addItem(ModFluffBlocks.biomeCobblestoneDesertSlab); + addItem(ModFluffBlocks.biomeCobblestoneTaigaSlab); + addItem(ModFluffBlocks.biomeCobblestoneMesaSlab); + addItem(ModFluffBlocks.biomeBrickForestSlab); + addItem(ModFluffBlocks.biomeBrickPlainsSlab); + addItem(ModFluffBlocks.biomeBrickMountainSlab); + addItem(ModFluffBlocks.biomeBrickFungalSlab); + addItem(ModFluffBlocks.biomeBrickSwampSlab); + addItem(ModFluffBlocks.biomeBrickDesertSlab); + addItem(ModFluffBlocks.biomeBrickTaigaSlab); + addItem(ModFluffBlocks.biomeBrickMesaSlab); + + addItem(ModFluffBlocks.biomeWallForest); + addItem(ModFluffBlocks.biomeWallPlains); + addItem(ModFluffBlocks.biomeWallMountain); + addItem(ModFluffBlocks.biomeWallFungal); + addItem(ModFluffBlocks.biomeWallSwamp); + addItem(ModFluffBlocks.biomeWallDesert); + addItem(ModFluffBlocks.biomeWallTaiga); + addItem(ModFluffBlocks.biomeWallMesa); addItem(ModFluffBlocks.whitePavement); addItem(ModFluffBlocks.blackPavement); diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java index 94e61a029..2bd33c9a1 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java @@ -18,9 +18,11 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.RecipeSerializers; import net.minecraft.item.crafting.ShapedRecipe; import net.minecraft.network.PacketBuffer; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import vazkii.botania.common.Botania; @@ -68,6 +70,12 @@ public class ArmorUpgradeRecipe implements IRecipe { return compose.getRecipeOutput(); } + @Nonnull + @Override + public NonNullList getIngredients() { + return compose.getIngredients(); + } + @Nonnull @Override public ResourceLocation getId() { diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java index a8252c87d..f728e92da 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java @@ -88,6 +88,12 @@ public class HelmRevealingRecipe implements IRecipe { return compose.getRecipeOutput(); } + @Nonnull + @Override + public NonNullList getIngredients() { + return compose.getIngredients(); + } + @Override public boolean isDynamic() { return true; diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaUpgradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaUpgradeRecipe.java index 377bd76e1..8065d7fe7 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaUpgradeRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaUpgradeRecipe.java @@ -16,9 +16,11 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.RecipeSerializers; import net.minecraft.item.crafting.ShapedRecipe; import net.minecraft.network.PacketBuffer; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaItem; @@ -62,6 +64,12 @@ public class ManaUpgradeRecipe implements IRecipe { return output(compose.getCraftingResult(inv), inv); } + @Nonnull + @Override + public NonNullList getIngredients() { + return compose.getIngredients(); + } + @Override public boolean canFit(int width, int height) { return compose.canFit(width, height); diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ShapelessManaUpgradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ShapelessManaUpgradeRecipe.java index bf92b83d9..9242ddf9a 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ShapelessManaUpgradeRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ShapelessManaUpgradeRecipe.java @@ -15,9 +15,11 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.RecipeSerializers; import net.minecraft.item.crafting.ShapelessRecipe; import net.minecraft.network.PacketBuffer; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import vazkii.botania.common.lib.LibMisc; @@ -54,6 +56,12 @@ public class ShapelessManaUpgradeRecipe implements IRecipe { return compose.getRecipeOutput(); } + @Nonnull + @Override + public NonNullList getIngredients() { + return compose.getIngredients(); + } + @Nonnull @Override public ResourceLocation getId() { diff --git a/src/main/resources/assets/botania/models/block/template.json b/src/main/resources/assets/botania/models/block/template.json new file mode 100644 index 000000000..270327332 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/template.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/PARENT" +} diff --git a/src/main/resources/assets/botania/models/item/chiseled_metamorphic_desert_bricks.json b/src/main/resources/assets/botania/models/item/chiseled_metamorphic_desert_bricks.json new file mode 100644 index 000000000..46fe9ae8b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/chiseled_metamorphic_desert_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/chiseled_desert_bricks" +} diff --git a/src/main/resources/assets/botania/models/item/chiseled_metamorphic_forest_bricks.json b/src/main/resources/assets/botania/models/item/chiseled_metamorphic_forest_bricks.json new file mode 100644 index 000000000..976e2a54b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/chiseled_metamorphic_forest_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/chiseled_forest_bricks" +} diff --git a/src/main/resources/assets/botania/models/item/chiseled_metamorphic_fungal_bricks.json b/src/main/resources/assets/botania/models/item/chiseled_metamorphic_fungal_bricks.json new file mode 100644 index 000000000..d49121da7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/chiseled_metamorphic_fungal_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/chiseled_fungal_bricks" +} diff --git a/src/main/resources/assets/botania/models/item/chiseled_metamorphic_mesa_bricks.json b/src/main/resources/assets/botania/models/item/chiseled_metamorphic_mesa_bricks.json new file mode 100644 index 000000000..11243782e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/chiseled_metamorphic_mesa_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/chiseled_mesa_bricks" +} diff --git a/src/main/resources/assets/botania/models/item/chiseled_metamorphic_mountain_bricks.json b/src/main/resources/assets/botania/models/item/chiseled_metamorphic_mountain_bricks.json new file mode 100644 index 000000000..9f7a1c324 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/chiseled_metamorphic_mountain_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/chiseled_mountain_bricks" +} diff --git a/src/main/resources/assets/botania/models/item/chiseled_metamorphic_plains_bricks.json b/src/main/resources/assets/botania/models/item/chiseled_metamorphic_plains_bricks.json new file mode 100644 index 000000000..96c0c0d3e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/chiseled_metamorphic_plains_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/chiseled_plains_bricks" +} diff --git a/src/main/resources/assets/botania/models/item/chiseled_metamorphic_swamp_bricks.json b/src/main/resources/assets/botania/models/item/chiseled_metamorphic_swamp_bricks.json new file mode 100644 index 000000000..2e3ee9da1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/chiseled_metamorphic_swamp_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/chiseled_swamp_bricks" +} diff --git a/src/main/resources/assets/botania/models/item/chiseled_metamorphic_taiga_bricks.json b/src/main/resources/assets/botania/models/item/chiseled_metamorphic_taiga_bricks.json new file mode 100644 index 000000000..4488c10f3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/chiseled_metamorphic_taiga_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/chiseled_taiga_bricks" +} diff --git a/src/main/resources/assets/botania/models/item/metamorphic_desert_bricks.json b/src/main/resources/assets/botania/models/item/metamorphic_desert_bricks.json new file mode 100644 index 000000000..026b9d433 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/metamorphic_desert_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/desert_bricks" +} diff --git a/src/main/resources/assets/botania/models/item/metamorphic_desert_cobblestone.json b/src/main/resources/assets/botania/models/item/metamorphic_desert_cobblestone.json new file mode 100644 index 000000000..af840d46f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/metamorphic_desert_cobblestone.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/desert_cobblestone" +} diff --git a/src/main/resources/assets/botania/models/item/metamorphic_desert_stone.json b/src/main/resources/assets/botania/models/item/metamorphic_desert_stone.json new file mode 100644 index 000000000..50c4e8af1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/metamorphic_desert_stone.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/desert_stone" +} diff --git a/src/main/resources/assets/botania/models/item/metamorphic_forest_bricks.json b/src/main/resources/assets/botania/models/item/metamorphic_forest_bricks.json new file mode 100644 index 000000000..f2b603dbb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/metamorphic_forest_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/forest_bricks" +} diff --git a/src/main/resources/assets/botania/models/item/metamorphic_forest_cobblestone.json b/src/main/resources/assets/botania/models/item/metamorphic_forest_cobblestone.json new file mode 100644 index 000000000..d8a06497e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/metamorphic_forest_cobblestone.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/forest_cobblestone" +} diff --git a/src/main/resources/assets/botania/models/item/metamorphic_forest_stone.json b/src/main/resources/assets/botania/models/item/metamorphic_forest_stone.json new file mode 100644 index 000000000..b00d16b8c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/metamorphic_forest_stone.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/forest_stone" +} diff --git a/src/main/resources/assets/botania/models/item/metamorphic_fungal_bricks.json b/src/main/resources/assets/botania/models/item/metamorphic_fungal_bricks.json new file mode 100644 index 000000000..17429c5b0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/metamorphic_fungal_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/fungal_bricks" +} diff --git a/src/main/resources/assets/botania/models/item/metamorphic_fungal_cobblestone.json b/src/main/resources/assets/botania/models/item/metamorphic_fungal_cobblestone.json new file mode 100644 index 000000000..e358c67f6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/metamorphic_fungal_cobblestone.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/fungal_cobblestone" +} diff --git a/src/main/resources/assets/botania/models/item/metamorphic_fungal_stone.json b/src/main/resources/assets/botania/models/item/metamorphic_fungal_stone.json new file mode 100644 index 000000000..829c16b83 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/metamorphic_fungal_stone.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/fungal_stone" +} diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mesa_bricks.json b/src/main/resources/assets/botania/models/item/metamorphic_mesa_bricks.json new file mode 100644 index 000000000..2a94cf7f4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/metamorphic_mesa_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/mesa_bricks" +} diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mesa_cobblestone.json b/src/main/resources/assets/botania/models/item/metamorphic_mesa_cobblestone.json new file mode 100644 index 000000000..bca93faab --- /dev/null +++ b/src/main/resources/assets/botania/models/item/metamorphic_mesa_cobblestone.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/mesa_cobblestone" +} diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mesa_stone.json b/src/main/resources/assets/botania/models/item/metamorphic_mesa_stone.json new file mode 100644 index 000000000..8c8126d2f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/metamorphic_mesa_stone.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/mesa_stone" +} diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mountain_bricks.json b/src/main/resources/assets/botania/models/item/metamorphic_mountain_bricks.json new file mode 100644 index 000000000..ae1708fd9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/metamorphic_mountain_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/mountain_bricks" +} diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mountain_cobblestone.json b/src/main/resources/assets/botania/models/item/metamorphic_mountain_cobblestone.json new file mode 100644 index 000000000..6361ddeb3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/metamorphic_mountain_cobblestone.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/mountain_cobblestone" +} diff --git a/src/main/resources/assets/botania/models/item/metamorphic_mountain_stone.json b/src/main/resources/assets/botania/models/item/metamorphic_mountain_stone.json new file mode 100644 index 000000000..7d342526c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/metamorphic_mountain_stone.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/mountain_stone" +} diff --git a/src/main/resources/assets/botania/models/item/metamorphic_plains_bricks.json b/src/main/resources/assets/botania/models/item/metamorphic_plains_bricks.json new file mode 100644 index 000000000..ca6eb43a7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/metamorphic_plains_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/plains_bricks" +} diff --git a/src/main/resources/assets/botania/models/item/metamorphic_plains_cobblestone.json b/src/main/resources/assets/botania/models/item/metamorphic_plains_cobblestone.json new file mode 100644 index 000000000..aa642ff93 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/metamorphic_plains_cobblestone.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/plains_cobblestone" +} diff --git a/src/main/resources/assets/botania/models/item/metamorphic_plains_stone.json b/src/main/resources/assets/botania/models/item/metamorphic_plains_stone.json new file mode 100644 index 000000000..0d0aba8be --- /dev/null +++ b/src/main/resources/assets/botania/models/item/metamorphic_plains_stone.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/plains_stone" +} diff --git a/src/main/resources/assets/botania/models/item/metamorphic_swamp_bricks.json b/src/main/resources/assets/botania/models/item/metamorphic_swamp_bricks.json new file mode 100644 index 000000000..91ea9f456 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/metamorphic_swamp_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/swamp_bricks" +} diff --git a/src/main/resources/assets/botania/models/item/metamorphic_swamp_cobblestone.json b/src/main/resources/assets/botania/models/item/metamorphic_swamp_cobblestone.json new file mode 100644 index 000000000..7feffd757 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/metamorphic_swamp_cobblestone.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/swamp_cobblestone" +} diff --git a/src/main/resources/assets/botania/models/item/metamorphic_swamp_stone.json b/src/main/resources/assets/botania/models/item/metamorphic_swamp_stone.json new file mode 100644 index 000000000..973b62abd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/metamorphic_swamp_stone.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/swamp_stone" +} diff --git a/src/main/resources/assets/botania/models/item/metamorphic_taiga_bricks.json b/src/main/resources/assets/botania/models/item/metamorphic_taiga_bricks.json new file mode 100644 index 000000000..8844bf684 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/metamorphic_taiga_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/taiga_bricks" +} diff --git a/src/main/resources/assets/botania/models/item/metamorphic_taiga_cobblestone.json b/src/main/resources/assets/botania/models/item/metamorphic_taiga_cobblestone.json new file mode 100644 index 000000000..ab555c9aa --- /dev/null +++ b/src/main/resources/assets/botania/models/item/metamorphic_taiga_cobblestone.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/taiga_cobblestone" +} diff --git a/src/main/resources/assets/botania/models/item/metamorphic_taiga_stone.json b/src/main/resources/assets/botania/models/item/metamorphic_taiga_stone.json new file mode 100644 index 000000000..1088581bd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/metamorphic_taiga_stone.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/metamorphic/taiga_stone" +} diff --git a/src/main/resources/data/botania/recipes/_constants.json b/src/main/resources/data/botania/recipes/_constants.json index efd2aff92..4855941d2 100644 --- a/src/main/resources/data/botania/recipes/_constants.json +++ b/src/main/resources/data/botania/recipes/_constants.json @@ -9,7 +9,7 @@ { "item": "botania:lime_dye" }, { "item": "botania:pink_dye" }, { "item": "botania:gray_dye" }, - { "item": "botania:silver_dye" }, + { "item": "botania:light_gray_dye" }, { "item": "botania:cyan_dye" }, { "item": "botania:purple_dye" }, { "item": "botania:blue_dye" }, @@ -20,6 +20,27 @@ ], "name": "all_dyes" }, + { + "items": [ + { "item": "botania:white_mushroom" }, + { "item": "botania:orange_mushroom" }, + { "item": "botania:magenta_mushroom" }, + { "item": "botania:light_blue_mushroom" }, + { "item": "botania:yellow_mushroom" }, + { "item": "botania:lime_mushroom" }, + { "item": "botania:pink_mushroom" }, + { "item": "botania:gray_mushroom" }, + { "item": "botania:light_gray_mushroom" }, + { "item": "botania:cyan_mushroom" }, + { "item": "botania:purple_mushroom" }, + { "item": "botania:blue_mushroom" }, + { "item": "botania:brown_mushroom" }, + { "item": "botania:green_mushroom" }, + { "item": "botania:red_mushroom" }, + { "item": "botania:black_mushroom" } + ], + "name": "all_mushrooms" + }, { "items": [ { "item": "minecraft:glass" }, @@ -31,7 +52,7 @@ { "item": "minecraft:lime_stained_glass" }, { "item": "minecraft:pink_stained_glass" }, { "item": "minecraft:gray_stained_glass" }, - { "item": "minecraft:silver_stained_glass" }, + { "item": "minecraft:light_gray_stained_glass" }, { "item": "minecraft:cyan_stained_glass" }, { "item": "minecraft:purple_stained_glass" }, { "item": "minecraft:blue_stained_glass" }, diff --git a/src/main/resources/data/botania/recipes/apothecary_default.json b/src/main/resources/data/botania/recipes/apothecary_default.json index 1de34c173..3e19d179b 100644 --- a/src/main/resources/data/botania/recipes/apothecary_default.json +++ b/src/main/resources/data/botania/recipes/apothecary_default.json @@ -20,7 +20,7 @@ "tag": "botania:petals/magenta" }, { - "tag": "botania:petals/lightblue" + "tag": "botania:petals/light_blue" }, { "tag": "botania:petals/yellow" diff --git a/src/main/resources/data/botania/recipes/bifrostpermpane.json b/src/main/resources/data/botania/recipes/bifrost_pane.json similarity index 66% rename from src/main/resources/data/botania/recipes/bifrostpermpane.json rename to src/main/resources/data/botania/recipes/bifrost_pane.json index b68b7d02c..c52b7407f 100644 --- a/src/main/resources/data/botania/recipes/bifrostpermpane.json +++ b/src/main/resources/data/botania/recipes/bifrost_pane.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:bifrostpermpane", + "item": "botania:bifrost_pane", "count": 16 }, "pattern": [ @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "B": { - "item": "botania:bifrostperm" + "item": "botania:bifrost_perm" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/bifrostperm.json b/src/main/resources/data/botania/recipes/bifrost_perm.json similarity index 68% rename from src/main/resources/data/botania/recipes/bifrostperm.json rename to src/main/resources/data/botania/recipes/bifrost_perm.json index f61e1aeab..e4416bc9c 100644 --- a/src/main/resources/data/botania/recipes/bifrostperm.json +++ b/src/main/resources/data/botania/recipes/bifrost_perm.json @@ -1,13 +1,13 @@ { "result": { - "item": "botania:bifrostperm" + "item": "botania:bifrost_perm" }, "ingredients": [ { "item": "botania:rainbowrod" }, { - "item": "botania:elfglass" + "item": "botania:elf_glass" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/blackholetalisman_0.json b/src/main/resources/data/botania/recipes/black_hole_talisman.json similarity index 84% rename from src/main/resources/data/botania/recipes/blackholetalisman_0.json rename to src/main/resources/data/botania/recipes/black_hole_talisman.json index 8495c9164..6cc9a8875 100644 --- a/src/main/resources/data/botania/recipes/blackholetalisman_0.json +++ b/src/main/resources/data/botania/recipes/black_hole_talisman.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:blackholetalisman", - "data": 0 + "item": "botania:black_hole_talisman" }, "pattern": [ " G ", diff --git a/src/main/resources/data/botania/recipes/shinyflower_15.json b/src/main/resources/data/botania/recipes/black_shiny_flower.json similarity index 84% rename from src/main/resources/data/botania/recipes/shinyflower_15.json rename to src/main/resources/data/botania/recipes/black_shiny_flower.json index 05c6ef25d..ce70dde3e 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_15.json +++ b/src/main/resources/data/botania/recipes/black_shiny_flower.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:shinyflower", - "data": 15 + "item": "botania:black_shiny_flower" }, "group": "botania:shinyflower", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/blazeblock.json b/src/main/resources/data/botania/recipes/blaze_block.json similarity index 90% rename from src/main/resources/data/botania/recipes/blazeblock.json rename to src/main/resources/data/botania/recipes/blaze_block.json index 1ded699ff..8fe3467cf 100644 --- a/src/main/resources/data/botania/recipes/blazeblock.json +++ b/src/main/resources/data/botania/recipes/blaze_block.json @@ -9,7 +9,7 @@ } ], "result": { - "item": "botania:blazeblock" + "item": "botania:blaze_block" }, "pattern": [ "BBB", diff --git a/src/main/resources/data/botania/recipes/shimmerwoodplanks0slab_0.json b/src/main/resources/data/botania/recipes/blaze_quartz_slab.json similarity index 57% rename from src/main/resources/data/botania/recipes/shimmerwoodplanks0slab_0.json rename to src/main/resources/data/botania/recipes/blaze_quartz_slab.json index 507f00c36..775708478 100644 --- a/src/main/resources/data/botania/recipes/shimmerwoodplanks0slab_0.json +++ b/src/main/resources/data/botania/recipes/blaze_quartz_slab.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:shimmerwoodplanks0slab", - "data": 0, + "item": "botania:blaze_quartz_slab", "count": 6 }, "pattern": [ @@ -10,7 +9,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:shimmerwoodplanks" + "item": "botania:blaze_quartz" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shimmerwoodplanks0stairs.json b/src/main/resources/data/botania/recipes/blaze_quartz_stairs.json similarity index 64% rename from src/main/resources/data/botania/recipes/shimmerwoodplanks0stairs.json rename to src/main/resources/data/botania/recipes/blaze_quartz_stairs.json index 3f5b11522..27579ba5b 100644 --- a/src/main/resources/data/botania/recipes/shimmerwoodplanks0stairs.json +++ b/src/main/resources/data/botania/recipes/blaze_quartz_stairs.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:shimmerwoodplanks0stairs", + "item": "botania:blaze_quartz_stairs", "count": 4 }, "pattern": [ @@ -11,7 +11,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:shimmerwoodplanks" + "item": "botania:blaze_quartz" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shinyflower_11.json b/src/main/resources/data/botania/recipes/blue_shiny_flower.json similarity index 84% rename from src/main/resources/data/botania/recipes/shinyflower_11.json rename to src/main/resources/data/botania/recipes/blue_shiny_flower.json index dd3f611b5..6e24e4d9c 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_11.json +++ b/src/main/resources/data/botania/recipes/blue_shiny_flower.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:shinyflower", - "data": 11 + "item": "botania:blue_shiny_flower" }, "group": "botania:shinyflower", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/shinyflower_12.json b/src/main/resources/data/botania/recipes/brown_shiny_flower.json similarity index 84% rename from src/main/resources/data/botania/recipes/shinyflower_12.json rename to src/main/resources/data/botania/recipes/brown_shiny_flower.json index b544e967e..03a437e67 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_12.json +++ b/src/main/resources/data/botania/recipes/brown_shiny_flower.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:shinyflower", - "data": 12 + "item": "botania:brown_shiny_flower" }, "group": "botania:shinyflower", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/shinyflower_9.json b/src/main/resources/data/botania/recipes/cyan_shiny_flower.json similarity index 84% rename from src/main/resources/data/botania/recipes/shinyflower_9.json rename to src/main/resources/data/botania/recipes/cyan_shiny_flower.json index f75acf83c..2892fdd55 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_9.json +++ b/src/main/resources/data/botania/recipes/cyan_shiny_flower.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:shinyflower", - "data": 9 + "item": "botania:cyan_shiny_flower" }, "group": "botania:shinyflower", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/quartzslabredhalf_0.json b/src/main/resources/data/botania/recipes/dark_quartz_slab.json similarity index 55% rename from src/main/resources/data/botania/recipes/quartzslabredhalf_0.json rename to src/main/resources/data/botania/recipes/dark_quartz_slab.json index b395bd1b0..c8c4764d8 100644 --- a/src/main/resources/data/botania/recipes/quartzslabredhalf_0.json +++ b/src/main/resources/data/botania/recipes/dark_quartz_slab.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:quartzslabredhalf", - "data": 0, + "item": "botania:dark_quartz_slab", "count": 6 }, "pattern": [ @@ -10,8 +9,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:quartztypered", - "data": 0 + "item": "botania:dark_quartz" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/quartzstairself.json b/src/main/resources/data/botania/recipes/dark_quartz_stairs.json similarity index 62% rename from src/main/resources/data/botania/recipes/quartzstairself.json rename to src/main/resources/data/botania/recipes/dark_quartz_stairs.json index 19b35b7b8..ba3bde572 100644 --- a/src/main/resources/data/botania/recipes/quartzstairself.json +++ b/src/main/resources/data/botania/recipes/dark_quartz_stairs.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:quartzstairself", + "item": "botania:dark_quartz_stairs", "count": 4 }, "pattern": [ @@ -11,8 +11,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:quartztypeelf", - "data": 0 + "item": "botania:dark_quartz" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/pool_diluted.json b/src/main/resources/data/botania/recipes/diluted_pool.json similarity index 59% rename from src/main/resources/data/botania/recipes/pool_diluted.json rename to src/main/resources/data/botania/recipes/diluted_pool.json index ed6dec0c4..17b19d825 100644 --- a/src/main/resources/data/botania/recipes/pool_diluted.json +++ b/src/main/resources/data/botania/recipes/diluted_pool.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:pool_diluted" + "item": "botania:diluted_pool" }, "pattern": [ "R R", @@ -9,8 +9,7 @@ "type": "minecraft:crafting_shaped", "key": { "R": { - "item": "botania:livingrock0slab", - "data": 0 + "item": "botania:livingrock_slab" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/seeds_dry.json b/src/main/resources/data/botania/recipes/dry_seeds.json similarity index 57% rename from src/main/resources/data/botania/recipes/seeds_dry.json rename to src/main/resources/data/botania/recipes/dry_seeds.json index 6eaff13c1..52f1eb1c8 100644 --- a/src/main/resources/data/botania/recipes/seeds_dry.json +++ b/src/main/resources/data/botania/recipes/dry_seeds.json @@ -1,14 +1,14 @@ { "result": { - "item": "botania:seeds_dry" + "item": "botania:dry_seeds" }, "group": "botania:seeds", "ingredients": [ { - "item": "botania:seeds_grass" + "item": "botania:grass_seeds" }, { - "item": "minecraft:deadbush" + "item": "minecraft:dead_bush" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/dye_light_blue.json b/src/main/resources/data/botania/recipes/dye_light_blue.json index 942695c4a..9e5f5d34d 100644 --- a/src/main/resources/data/botania/recipes/dye_light_blue.json +++ b/src/main/resources/data/botania/recipes/dye_light_blue.json @@ -10,7 +10,7 @@ "data": 1 }, { - "tag": "botania:petals/lightblue" + "tag": "botania:petals/light_blue" } ], { diff --git a/src/main/resources/data/botania/recipes/elfglasspane.json b/src/main/resources/data/botania/recipes/elf_glass_pane.json similarity index 67% rename from src/main/resources/data/botania/recipes/elfglasspane.json rename to src/main/resources/data/botania/recipes/elf_glass_pane.json index 0a9b8fa8f..d20292259 100644 --- a/src/main/resources/data/botania/recipes/elfglasspane.json +++ b/src/main/resources/data/botania/recipes/elf_glass_pane.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:elfglasspane", + "item": "botania:elf_glass_pane", "count": 16 }, "pattern": [ @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "B": { - "item": "botania:elfglass" + "item": "botania:elf_glass" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/quartzslabelfhalf_0.json b/src/main/resources/data/botania/recipes/elf_quartz_slab.json similarity index 55% rename from src/main/resources/data/botania/recipes/quartzslabelfhalf_0.json rename to src/main/resources/data/botania/recipes/elf_quartz_slab.json index fc2309cb6..7118e603c 100644 --- a/src/main/resources/data/botania/recipes/quartzslabelfhalf_0.json +++ b/src/main/resources/data/botania/recipes/elf_quartz_slab.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:quartzslabelfhalf", - "data": 0, + "item": "botania:elf_quartz_slab", "count": 6 }, "pattern": [ @@ -10,8 +9,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:quartztypeelf", - "data": 0 + "item": "botania:elf_quartz" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/quartzstairsred.json b/src/main/resources/data/botania/recipes/elf_quartz_stairs.json similarity index 62% rename from src/main/resources/data/botania/recipes/quartzstairsred.json rename to src/main/resources/data/botania/recipes/elf_quartz_stairs.json index 7af46f39e..f42dcc39c 100644 --- a/src/main/resources/data/botania/recipes/quartzstairsred.json +++ b/src/main/resources/data/botania/recipes/elf_quartz_stairs.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:quartzstairsred", + "item": "botania:elf_quartz_stairs", "count": 4 }, "pattern": [ @@ -11,8 +11,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:quartztypered", - "data": 0 + "item": "botania:elf_quartz" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/elven_spreader.json b/src/main/resources/data/botania/recipes/elven_spreader.json index 517719937..bb3d8d233 100644 --- a/src/main/resources/data/botania/recipes/elven_spreader.json +++ b/src/main/resources/data/botania/recipes/elven_spreader.json @@ -21,7 +21,7 @@ "tag": "botania:petals/magenta" }, { - "tag": "botania:petals/lightblue" + "tag": "botania:petals/light_blue" }, { "tag": "botania:petals/yellow" diff --git a/src/main/resources/data/botania/recipes/enderdagger.json b/src/main/resources/data/botania/recipes/ender_dagger.json similarity index 89% rename from src/main/resources/data/botania/recipes/enderdagger.json rename to src/main/resources/data/botania/recipes/ender_dagger.json index 19f331c57..9db476777 100644 --- a/src/main/resources/data/botania/recipes/enderdagger.json +++ b/src/main/resources/data/botania/recipes/ender_dagger.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:enderdagger" + "item": "botania:ender_dagger" }, "pattern": [ "P", diff --git a/src/main/resources/data/botania/recipes/endereyeblock.json b/src/main/resources/data/botania/recipes/ender_eye_block.json similarity index 88% rename from src/main/resources/data/botania/recipes/endereyeblock.json rename to src/main/resources/data/botania/recipes/ender_eye_block.json index e4bdf1f4f..433d44ab6 100644 --- a/src/main/resources/data/botania/recipes/endereyeblock.json +++ b/src/main/resources/data/botania/recipes/ender_eye_block.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:endereyeblock" + "item": "botania:ender_eye_block" }, "pattern": [ "RER", diff --git a/src/main/resources/data/botania/recipes/enderhand.json b/src/main/resources/data/botania/recipes/ender_hand.json similarity index 91% rename from src/main/resources/data/botania/recipes/enderhand.json rename to src/main/resources/data/botania/recipes/ender_hand.json index 22a976f04..8f83ab054 100644 --- a/src/main/resources/data/botania/recipes/enderhand.json +++ b/src/main/resources/data/botania/recipes/ender_hand.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:enderhand" + "item": "botania:ender_hand" }, "pattern": [ "PLO", diff --git a/src/main/resources/data/botania/recipes/exchangerod.json b/src/main/resources/data/botania/recipes/exchange_rod.json similarity index 88% rename from src/main/resources/data/botania/recipes/exchangerod.json rename to src/main/resources/data/botania/recipes/exchange_rod.json index 8b1e4c856..06cbbc66b 100644 --- a/src/main/resources/data/botania/recipes/exchangerod.json +++ b/src/main/resources/data/botania/recipes/exchange_rod.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:exchangerod" + "item": "botania:exchange_rod" }, "pattern": [ " SR", diff --git a/src/main/resources/data/botania/recipes/pool_fabulous.json b/src/main/resources/data/botania/recipes/fabulous_pool.json similarity index 82% rename from src/main/resources/data/botania/recipes/pool_fabulous.json rename to src/main/resources/data/botania/recipes/fabulous_pool.json index df51d5780..ec371f54c 100644 --- a/src/main/resources/data/botania/recipes/pool_fabulous.json +++ b/src/main/resources/data/botania/recipes/fabulous_pool.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:pool_fabulous" + "item": "botania:fabulous_pool" }, "pattern": [ "R R", diff --git a/src/main/resources/data/botania/recipes/felpumpkin.json b/src/main/resources/data/botania/recipes/fel_pumpkin.json similarity index 91% rename from src/main/resources/data/botania/recipes/felpumpkin.json rename to src/main/resources/data/botania/recipes/fel_pumpkin.json index 47f4fa900..b8d2d5b59 100644 --- a/src/main/resources/data/botania/recipes/felpumpkin.json +++ b/src/main/resources/data/botania/recipes/fel_pumpkin.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:felpumpkin" + "item": "botania:fel_pumpkin" }, "pattern": [ " S ", diff --git a/src/main/resources/data/botania/recipes/firerod.json b/src/main/resources/data/botania/recipes/fire_rod.json similarity index 90% rename from src/main/resources/data/botania/recipes/firerod.json rename to src/main/resources/data/botania/recipes/fire_rod.json index 396426312..7d9c28c08 100644 --- a/src/main/resources/data/botania/recipes/firerod.json +++ b/src/main/resources/data/botania/recipes/fire_rod.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:firerod" + "item": "botania:fire_rod" }, "pattern": [ " F", diff --git a/src/main/resources/data/botania/recipes/flowerbag.json b/src/main/resources/data/botania/recipes/flower_bag.json similarity index 87% rename from src/main/resources/data/botania/recipes/flowerbag.json rename to src/main/resources/data/botania/recipes/flower_bag.json index 6cf0e4949..d69fbff52 100644 --- a/src/main/resources/data/botania/recipes/flowerbag.json +++ b/src/main/resources/data/botania/recipes/flower_bag.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:flowerbag" + "item": "botania:flower_bag" }, "pattern": [ "WPW", diff --git a/src/main/resources/data/botania/recipes/foresteye.json b/src/main/resources/data/botania/recipes/forest_eye.json similarity index 89% rename from src/main/resources/data/botania/recipes/foresteye.json rename to src/main/resources/data/botania/recipes/forest_eye.json index f71bbc93c..c45e3a675 100644 --- a/src/main/resources/data/botania/recipes/foresteye.json +++ b/src/main/resources/data/botania/recipes/forest_eye.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:foresteye" + "item": "botania:forest_eye" }, "pattern": [ "MSM", diff --git a/src/main/resources/data/botania/recipes/pylon_gaia.json b/src/main/resources/data/botania/recipes/gaia_pylon.json similarity index 89% rename from src/main/resources/data/botania/recipes/pylon_gaia.json rename to src/main/resources/data/botania/recipes/gaia_pylon.json index 13eef91f5..48080751e 100644 --- a/src/main/resources/data/botania/recipes/pylon_gaia.json +++ b/src/main/resources/data/botania/recipes/gaia_pylon.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:pylon_gaia" + "item": "botania:gaia_pylon" }, "pattern": [ " D ", diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/mana_spreader.json b/src/main/resources/data/botania/recipes/garden_of_glass/mana_spreader.json index 2d4d9339a..b0eea535b 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/mana_spreader.json +++ b/src/main/resources/data/botania/recipes/garden_of_glass/mana_spreader.json @@ -27,7 +27,7 @@ "tag": "botania:petals/magenta" }, { - "tag": "botania:petals/lightblue" + "tag": "botania:petals/light_blue" }, { "tag": "botania:petals/yellow" diff --git a/src/main/resources/data/botania/recipes/ghostrail.json b/src/main/resources/data/botania/recipes/ghost_rail.json similarity index 84% rename from src/main/resources/data/botania/recipes/ghostrail.json rename to src/main/resources/data/botania/recipes/ghost_rail.json index 779a03a3c..aad10b27e 100644 --- a/src/main/resources/data/botania/recipes/ghostrail.json +++ b/src/main/resources/data/botania/recipes/ghost_rail.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:ghostrail" + "item": "botania:ghost_rail" }, "ingredients": [ { diff --git a/src/main/resources/data/botania/recipes/glasspick.json b/src/main/resources/data/botania/recipes/glass_pickaxe.json similarity index 88% rename from src/main/resources/data/botania/recipes/glasspick.json rename to src/main/resources/data/botania/recipes/glass_pickaxe.json index 3c3b5c084..5f799d4e6 100644 --- a/src/main/resources/data/botania/recipes/glasspick.json +++ b/src/main/resources/data/botania/recipes/glass_pickaxe.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:glasspick" + "item": "botania:glass_pickaxe" }, "pattern": [ "GIG", diff --git a/src/main/resources/data/botania/recipes/seeds_golden.json b/src/main/resources/data/botania/recipes/golden_seeds.json similarity index 70% rename from src/main/resources/data/botania/recipes/seeds_golden.json rename to src/main/resources/data/botania/recipes/golden_seeds.json index 7e0f2bafb..966be6ffe 100644 --- a/src/main/resources/data/botania/recipes/seeds_golden.json +++ b/src/main/resources/data/botania/recipes/golden_seeds.json @@ -1,11 +1,11 @@ { "result": { - "item": "botania:seeds_golden" + "item": "botania:golden_seeds" }, "group": "botania:seeds", "ingredients": [ { - "item": "botania:seeds_grass" + "item": "botania:grass_seeds" }, { "item": "minecraft:wheat" diff --git a/src/main/resources/data/botania/recipes/gravityrod.json b/src/main/resources/data/botania/recipes/gravity_rod.json similarity index 89% rename from src/main/resources/data/botania/recipes/gravityrod.json rename to src/main/resources/data/botania/recipes/gravity_rod.json index 92c31082a..7f190e5fd 100644 --- a/src/main/resources/data/botania/recipes/gravityrod.json +++ b/src/main/resources/data/botania/recipes/gravity_rod.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:gravityrod" + "item": "botania:gravity_rod" }, "pattern": [ " TD", diff --git a/src/main/resources/data/botania/recipes/shinyflower_7.json b/src/main/resources/data/botania/recipes/gray_shiny_flower.json similarity index 84% rename from src/main/resources/data/botania/recipes/shinyflower_7.json rename to src/main/resources/data/botania/recipes/gray_shiny_flower.json index 2e611e1bd..c8a1ee434 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_7.json +++ b/src/main/resources/data/botania/recipes/gray_shiny_flower.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:shinyflower", - "data": 7 + "item": "botania:gray_shiny_flower" }, "group": "botania:shinyflower", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/shinyflower_13.json b/src/main/resources/data/botania/recipes/green_shiny_flower.json similarity index 84% rename from src/main/resources/data/botania/recipes/shinyflower_13.json rename to src/main/resources/data/botania/recipes/green_shiny_flower.json index 72d3bbe72..83baa88ec 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_13.json +++ b/src/main/resources/data/botania/recipes/green_shiny_flower.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:shinyflower", - "data": 13 + "item": "botania:green_shiny_flower" }, "group": "botania:shinyflower", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/horn_grass.json b/src/main/resources/data/botania/recipes/horn_grass.json index 5214673d9..ab61cf0b4 100644 --- a/src/main/resources/data/botania/recipes/horn_grass.json +++ b/src/main/resources/data/botania/recipes/horn_grass.json @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "S": { - "item": "botania:seeds_grass" + "item": "botania:grass_seeds" }, "W": { "tag": "botania:livingwood" diff --git a/src/main/resources/data/botania/recipes/icependant.json b/src/main/resources/data/botania/recipes/ice_pendant.json similarity index 91% rename from src/main/resources/data/botania/recipes/icependant.json rename to src/main/resources/data/botania/recipes/ice_pendant.json index 6b44ab620..e2272aa69 100644 --- a/src/main/resources/data/botania/recipes/icependant.json +++ b/src/main/resources/data/botania/recipes/ice_pendant.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:icependant" + "item": "botania:ice_pendant" }, "pattern": [ "WS ", diff --git a/src/main/resources/data/botania/recipes/incenseplate.json b/src/main/resources/data/botania/recipes/incense_plate.json similarity index 65% rename from src/main/resources/data/botania/recipes/incenseplate.json rename to src/main/resources/data/botania/recipes/incense_plate.json index 574bb0652..07158da8d 100644 --- a/src/main/resources/data/botania/recipes/incenseplate.json +++ b/src/main/resources/data/botania/recipes/incense_plate.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:incenseplate" + "item": "botania:incense_plate" }, "pattern": [ "WSS" @@ -8,8 +8,7 @@ "type": "minecraft:crafting_shaped", "key": { "S": { - "item": "botania:livingwood0slab", - "data": 0 + "item": "botania:livingwood_slab" }, "W": { "tag": "botania:livingwood" diff --git a/src/main/resources/data/botania/recipes/incensestick.json b/src/main/resources/data/botania/recipes/incense_stick.json similarity index 89% rename from src/main/resources/data/botania/recipes/incensestick.json rename to src/main/resources/data/botania/recipes/incense_stick.json index ca6ea6a5c..20af09e2d 100644 --- a/src/main/resources/data/botania/recipes/incensestick.json +++ b/src/main/resources/data/botania/recipes/incense_stick.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:incensestick" + "item": "botania:incense_stick" }, "pattern": [ " G", diff --git a/src/main/resources/data/botania/recipes/seeds_infused.json b/src/main/resources/data/botania/recipes/infused_seeds.json similarity index 71% rename from src/main/resources/data/botania/recipes/seeds_infused.json rename to src/main/resources/data/botania/recipes/infused_seeds.json index 971f34fc1..e8faee013 100644 --- a/src/main/resources/data/botania/recipes/seeds_infused.json +++ b/src/main/resources/data/botania/recipes/infused_seeds.json @@ -1,11 +1,11 @@ { "result": { - "item": "botania:seeds_infused" + "item": "botania:infused_seeds" }, "group": "botania:seeds", "ingredients": [ { - "item": "botania:seeds_grass" + "item": "botania:grass_seeds" }, { "item": "minecraft:prismarine_shard" diff --git a/src/main/resources/data/botania/recipes/keepivy.json b/src/main/resources/data/botania/recipes/keep_ivy.json similarity index 88% rename from src/main/resources/data/botania/recipes/keepivy.json rename to src/main/resources/data/botania/recipes/keep_ivy.json index b800a865c..42c1709fb 100644 --- a/src/main/resources/data/botania/recipes/keepivy.json +++ b/src/main/resources/data/botania/recipes/keep_ivy.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:keepivy" + "item": "botania:keep_ivy" }, "ingredients": [ { diff --git a/src/main/resources/data/botania/recipes/lavapendant.json b/src/main/resources/data/botania/recipes/lava_pendant.json similarity index 90% rename from src/main/resources/data/botania/recipes/lavapendant.json rename to src/main/resources/data/botania/recipes/lava_pendant.json index ffd28644f..e890d0e40 100644 --- a/src/main/resources/data/botania/recipes/lavapendant.json +++ b/src/main/resources/data/botania/recipes/lava_pendant.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:lavapendant" + "item": "botania:lava_pendant" }, "pattern": [ "MS ", diff --git a/src/main/resources/data/botania/recipes/lavender_quartz_slab.json b/src/main/resources/data/botania/recipes/lavender_quartz_slab.json new file mode 100644 index 000000000..42f1be465 --- /dev/null +++ b/src/main/resources/data/botania/recipes/lavender_quartz_slab.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:lavender_quartz_slab", + "count": 6 + }, + "pattern": [ + "QQQ" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:lavender_quartz" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/lavender_quartz_stairs.json b/src/main/resources/data/botania/recipes/lavender_quartz_stairs.json new file mode 100644 index 000000000..38028fb00 --- /dev/null +++ b/src/main/resources/data/botania/recipes/lavender_quartz_stairs.json @@ -0,0 +1,16 @@ +{ + "result": { + "item": "botania:lavender_quartz_stairs" + }, + "pattern": [ + " Q", + " QQ", + "QQQ" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:lavender_quartz" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/lens_normal_glass_pane.json b/src/main/resources/data/botania/recipes/lens_normal.json similarity index 63% rename from src/main/resources/data/botania/recipes/lens_normal_glass_pane.json rename to src/main/resources/data/botania/recipes/lens_normal.json index 238eb7c08..67bcb3e7a 100644 --- a/src/main/resources/data/botania/recipes/lens_normal_glass_pane.json +++ b/src/main/resources/data/botania/recipes/lens_normal.json @@ -12,8 +12,13 @@ "S": { "tag": "forge:ingots/manasteel" }, - "G": { - "item": "minecraft:glass_pane" - } + "G": [ + { + "item": "minecraft:glass" + }, + { + "item": "minecraft:glass_pane" + } + ] } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/lens_normal_glass_block.json b/src/main/resources/data/botania/recipes/lens_normal_glass_block.json deleted file mode 100644 index 6dfa2bd25..000000000 --- a/src/main/resources/data/botania/recipes/lens_normal_glass_block.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "result": { - "item": "botania:lens_normal" - }, - "pattern": [ - " S ", - "SGS", - " S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "S": { - "tag": "forge:ingots/manasteel" - }, - "G": { - "item": "minecraft:glass" - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/light_blue_shiny_flower.json b/src/main/resources/data/botania/recipes/light_blue_shiny_flower.json new file mode 100644 index 000000000..8d3f23256 --- /dev/null +++ b/src/main/resources/data/botania/recipes/light_blue_shiny_flower.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "botania:light_blue_shiny_flower" + }, + "group": "botania:shinyflower", + "ingredients": [ + { + "tag": "forge:dusts/glowstone" + }, + { + "tag": "forge:dusts/glowstone" + }, + { + "tag": "botania:flowers/light_blue" + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shinyflower_8.json b/src/main/resources/data/botania/recipes/light_gray_shiny_flower.json similarity index 84% rename from src/main/resources/data/botania/recipes/shinyflower_8.json rename to src/main/resources/data/botania/recipes/light_gray_shiny_flower.json index 3f4cd0d52..f2f92b271 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_8.json +++ b/src/main/resources/data/botania/recipes/light_gray_shiny_flower.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:shinyflower", - "data": 8 + "item": "botania:light_gray_shiny_flower" }, "group": "botania:shinyflower", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/shinyflower_5.json b/src/main/resources/data/botania/recipes/lime_shiny_flower.json similarity index 84% rename from src/main/resources/data/botania/recipes/shinyflower_5.json rename to src/main/resources/data/botania/recipes/lime_shiny_flower.json index 83bfbba20..2f94fcadf 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_5.json +++ b/src/main/resources/data/botania/recipes/lime_shiny_flower.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:shinyflower", - "data": 5 + "item": "botania:lime_shiny_flower" }, "group": "botania:shinyflower", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/livingwoodbow.json b/src/main/resources/data/botania/recipes/livingwood_bow.json similarity index 86% rename from src/main/resources/data/botania/recipes/livingwoodbow.json rename to src/main/resources/data/botania/recipes/livingwood_bow.json index 3debd7b46..988524149 100644 --- a/src/main/resources/data/botania/recipes/livingwoodbow.json +++ b/src/main/resources/data/botania/recipes/livingwood_bow.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:livingwoodbow" + "item": "botania:livingwood_bow" }, "pattern": [ " TS", diff --git a/src/main/resources/data/botania/recipes/shinyflower_2.json b/src/main/resources/data/botania/recipes/magenta_shiny_flower.json similarity index 84% rename from src/main/resources/data/botania/recipes/shinyflower_2.json rename to src/main/resources/data/botania/recipes/magenta_shiny_flower.json index c6379aaee..92f1e2bbb 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_2.json +++ b/src/main/resources/data/botania/recipes/magenta_shiny_flower.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:shinyflower", - "data": 2 + "item": "botania:magenta_shiny_flower" }, "group": "botania:shinyflower", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/magnetring.json b/src/main/resources/data/botania/recipes/magnet_ring.json similarity index 87% rename from src/main/resources/data/botania/recipes/magnetring.json rename to src/main/resources/data/botania/recipes/magnet_ring.json index 9abec3795..6bd300b7b 100644 --- a/src/main/resources/data/botania/recipes/magnetring.json +++ b/src/main/resources/data/botania/recipes/magnet_ring.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:magnetring" + "item": "botania:magnet_ring" }, "pattern": [ "LM ", diff --git a/src/main/resources/data/botania/recipes/magnetringgreater.json b/src/main/resources/data/botania/recipes/magnet_ring_greater.json similarity index 81% rename from src/main/resources/data/botania/recipes/magnetringgreater.json rename to src/main/resources/data/botania/recipes/magnet_ring_greater.json index 35ee5eeef..b199fd012 100644 --- a/src/main/resources/data/botania/recipes/magnetringgreater.json +++ b/src/main/resources/data/botania/recipes/magnet_ring_greater.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:magnetringgreater" + "item": "botania:magnet_ring_greater" }, "ingredients": [ { diff --git a/src/main/resources/data/botania/recipes/managun.json b/src/main/resources/data/botania/recipes/mana_gun.json similarity index 92% rename from src/main/resources/data/botania/recipes/managun.json rename to src/main/resources/data/botania/recipes/mana_gun.json index 59e7906dd..8f5163080 100644 --- a/src/main/resources/data/botania/recipes/managun.json +++ b/src/main/resources/data/botania/recipes/mana_gun.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:managun" + "item": "botania:mana_gun" }, "pattern": [ "SMD", diff --git a/src/main/resources/data/botania/recipes/manamirror.json b/src/main/resources/data/botania/recipes/mana_mirror.json similarity index 80% rename from src/main/resources/data/botania/recipes/manamirror.json rename to src/main/resources/data/botania/recipes/mana_mirror.json index 0206fea91..518f072b0 100644 --- a/src/main/resources/data/botania/recipes/manamirror.json +++ b/src/main/resources/data/botania/recipes/mana_mirror.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:manamirror", - "data": 1000 + "item": "botania:mana_mirror" }, "pattern": [ " PR", @@ -20,7 +19,7 @@ "item": "botania:livingwood_twig" }, "T": { - "item": "botania:manatablet" + "item": "botania:mana_tablet" }, "I": { "tag": "forge:ingots/terrasteel" diff --git a/src/main/resources/data/botania/recipes/pool_default.json b/src/main/resources/data/botania/recipes/mana_pool.json similarity index 82% rename from src/main/resources/data/botania/recipes/pool_default.json rename to src/main/resources/data/botania/recipes/mana_pool.json index 8ef18c2a2..e1b9c3ebd 100644 --- a/src/main/resources/data/botania/recipes/pool_default.json +++ b/src/main/resources/data/botania/recipes/mana_pool.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:pool_default" + "item": "botania:mana_pool" }, "pattern": [ "R R", diff --git a/src/main/resources/data/botania/recipes/pylon_mana.json b/src/main/resources/data/botania/recipes/mana_pylon.json similarity index 89% rename from src/main/resources/data/botania/recipes/pylon_mana.json rename to src/main/resources/data/botania/recipes/mana_pylon.json index b70e018ac..5e73d9f49 100644 --- a/src/main/resources/data/botania/recipes/pylon_mana.json +++ b/src/main/resources/data/botania/recipes/mana_pylon.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:pylon_mana" + "item": "botania:mana_pylon" }, "pattern": [ " G ", diff --git a/src/main/resources/data/botania/recipes/mana_quartz_slab.json b/src/main/resources/data/botania/recipes/mana_quartz_slab.json new file mode 100644 index 000000000..aea38e309 --- /dev/null +++ b/src/main/resources/data/botania/recipes/mana_quartz_slab.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:mana_quartz_slab", + "count": 6 + }, + "pattern": [ + "QQQ" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:mana_quartz" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/mana_quartz_stairs.json b/src/main/resources/data/botania/recipes/mana_quartz_stairs.json new file mode 100644 index 000000000..b25f237be --- /dev/null +++ b/src/main/resources/data/botania/recipes/mana_quartz_stairs.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "botania:mana_quartz_stairs", + "count": 4 + }, + "pattern": [ + " Q", + " QQ", + "QQQ" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:mana_quartz" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/mana_spreader.json b/src/main/resources/data/botania/recipes/mana_spreader.json index 90a4ab187..e45d3b7f4 100644 --- a/src/main/resources/data/botania/recipes/mana_spreader.json +++ b/src/main/resources/data/botania/recipes/mana_spreader.json @@ -30,7 +30,7 @@ "tag": "botania:petals/magenta" }, { - "tag": "botania:petals/lightblue" + "tag": "botania:petals/light_blue" }, { "tag": "botania:petals/yellow" diff --git a/src/main/resources/data/botania/recipes/mushroom_stew.json b/src/main/resources/data/botania/recipes/mushroom_stew.json index 4c32bde8a..26a18d0ac 100644 --- a/src/main/resources/data/botania/recipes/mushroom_stew.json +++ b/src/main/resources/data/botania/recipes/mushroom_stew.json @@ -4,12 +4,10 @@ }, "ingredients": [ { - "item": "botania:mushroom", - "data": 32767 + "constant": "botania:all_mushrooms" }, { - "item": "botania:mushroom", - "data": 32767 + "constant": "botania:all_mushrooms" }, { "item": "minecraft:bowl" diff --git a/src/main/resources/data/botania/recipes/seeds_mutated.json b/src/main/resources/data/botania/recipes/mutated_seeds.json similarity index 71% rename from src/main/resources/data/botania/recipes/seeds_mutated.json rename to src/main/resources/data/botania/recipes/mutated_seeds.json index 0c0a71c02..eeb5a5abe 100644 --- a/src/main/resources/data/botania/recipes/seeds_mutated.json +++ b/src/main/resources/data/botania/recipes/mutated_seeds.json @@ -1,11 +1,11 @@ { "result": { - "item": "botania:seeds_mutated" + "item": "botania:mutated_seeds" }, "group": "botania:seeds", "ingredients": [ { - "item": "botania:seeds_grass" + "item": "botania:grass_seeds" }, { "item": "minecraft:spider_eye" diff --git a/src/main/resources/data/botania/recipes/pylon_natura.json b/src/main/resources/data/botania/recipes/natura_pylon.json similarity index 89% rename from src/main/resources/data/botania/recipes/pylon_natura.json rename to src/main/resources/data/botania/recipes/natura_pylon.json index 3fc0a0ee0..ebc69055d 100644 --- a/src/main/resources/data/botania/recipes/pylon_natura.json +++ b/src/main/resources/data/botania/recipes/natura_pylon.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:pylon_natura" + "item": "botania:natura_pylon" }, "pattern": [ " T ", diff --git a/src/main/resources/data/botania/recipes/shinyflower_1.json b/src/main/resources/data/botania/recipes/orange_shiny_flower.json similarity index 84% rename from src/main/resources/data/botania/recipes/shinyflower_1.json rename to src/main/resources/data/botania/recipes/orange_shiny_flower.json index c9a0647ad..04fa2b2c6 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_1.json +++ b/src/main/resources/data/botania/recipes/orange_shiny_flower.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:shinyflower", - "data": 1 + "item": "botania:orange_shiny_flower" }, "group": "botania:shinyflower", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/pattern_crafty_1_1.json b/src/main/resources/data/botania/recipes/pattern_1_1.json similarity index 86% rename from src/main/resources/data/botania/recipes/pattern_crafty_1_1.json rename to src/main/resources/data/botania/recipes/pattern_1_1.json index 7ae01530a..bdad20b0f 100644 --- a/src/main/resources/data/botania/recipes/pattern_crafty_1_1.json +++ b/src/main/resources/data/botania/recipes/pattern_1_1.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:pattern_crafty_1_1" + "item": "botania:pattern_1_1" }, "pattern": [ "RPP", diff --git a/src/main/resources/data/botania/recipes/pattern_crafty_1_2.json b/src/main/resources/data/botania/recipes/pattern_1_2.json similarity index 86% rename from src/main/resources/data/botania/recipes/pattern_crafty_1_2.json rename to src/main/resources/data/botania/recipes/pattern_1_2.json index acfbc43b8..157c01115 100644 --- a/src/main/resources/data/botania/recipes/pattern_crafty_1_2.json +++ b/src/main/resources/data/botania/recipes/pattern_1_2.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:pattern_crafty_1_2" + "item": "botania:pattern_1_2" }, "pattern": [ "RPP", diff --git a/src/main/resources/data/botania/recipes/pattern_crafty_1_3.json b/src/main/resources/data/botania/recipes/pattern_1_3.json similarity index 86% rename from src/main/resources/data/botania/recipes/pattern_crafty_1_3.json rename to src/main/resources/data/botania/recipes/pattern_1_3.json index 9b9d545cd..1db4a405b 100644 --- a/src/main/resources/data/botania/recipes/pattern_crafty_1_3.json +++ b/src/main/resources/data/botania/recipes/pattern_1_3.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:pattern_crafty_1_3" + "item": "botania:pattern_1_3" }, "pattern": [ "RPP", diff --git a/src/main/resources/data/botania/recipes/pattern_crafty_2_1.json b/src/main/resources/data/botania/recipes/pattern_2_1.json similarity index 86% rename from src/main/resources/data/botania/recipes/pattern_crafty_2_1.json rename to src/main/resources/data/botania/recipes/pattern_2_1.json index 78557ee62..57d4dfc0c 100644 --- a/src/main/resources/data/botania/recipes/pattern_crafty_2_1.json +++ b/src/main/resources/data/botania/recipes/pattern_2_1.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:pattern_crafty_2_1" + "item": "botania:pattern_2_1" }, "pattern": [ "RRP", diff --git a/src/main/resources/data/botania/recipes/pattern_crafty_2_2.json b/src/main/resources/data/botania/recipes/pattern_2_2.json similarity index 86% rename from src/main/resources/data/botania/recipes/pattern_crafty_2_2.json rename to src/main/resources/data/botania/recipes/pattern_2_2.json index 15687c00c..feeff1c38 100644 --- a/src/main/resources/data/botania/recipes/pattern_crafty_2_2.json +++ b/src/main/resources/data/botania/recipes/pattern_2_2.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:pattern_crafty_2_2" + "item": "botania:pattern_2_2" }, "pattern": [ "RRP", diff --git a/src/main/resources/data/botania/recipes/pattern_crafty_2_3.json b/src/main/resources/data/botania/recipes/pattern_2_3.json similarity index 86% rename from src/main/resources/data/botania/recipes/pattern_crafty_2_3.json rename to src/main/resources/data/botania/recipes/pattern_2_3.json index 86c63f6f8..fe1dc197c 100644 --- a/src/main/resources/data/botania/recipes/pattern_crafty_2_3.json +++ b/src/main/resources/data/botania/recipes/pattern_2_3.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:pattern_crafty_2_3" + "item": "botania:pattern_2_3" }, "pattern": [ "RRP", diff --git a/src/main/resources/data/botania/recipes/pattern_craft_3_1.json b/src/main/resources/data/botania/recipes/pattern_3_1.json similarity index 86% rename from src/main/resources/data/botania/recipes/pattern_craft_3_1.json rename to src/main/resources/data/botania/recipes/pattern_3_1.json index 8049b1b7b..6a8655198 100644 --- a/src/main/resources/data/botania/recipes/pattern_craft_3_1.json +++ b/src/main/resources/data/botania/recipes/pattern_3_1.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:pattern_crafty_3_1" + "item": "botania:pattern_3_1" }, "pattern": [ "RRR", diff --git a/src/main/resources/data/botania/recipes/pattern_crafty_3_2.json b/src/main/resources/data/botania/recipes/pattern_3_2.json similarity index 86% rename from src/main/resources/data/botania/recipes/pattern_crafty_3_2.json rename to src/main/resources/data/botania/recipes/pattern_3_2.json index aa6a5c4d3..cef9befb6 100644 --- a/src/main/resources/data/botania/recipes/pattern_crafty_3_2.json +++ b/src/main/resources/data/botania/recipes/pattern_3_2.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:pattern_crafty_3_2" + "item": "botania:pattern_3_2" }, "pattern": [ "RRR", diff --git a/src/main/resources/data/botania/recipes/pattern_crafty_donut.json b/src/main/resources/data/botania/recipes/pattern_donut.json similarity index 86% rename from src/main/resources/data/botania/recipes/pattern_crafty_donut.json rename to src/main/resources/data/botania/recipes/pattern_donut.json index cb5bc8e4f..f22f0d7ef 100644 --- a/src/main/resources/data/botania/recipes/pattern_crafty_donut.json +++ b/src/main/resources/data/botania/recipes/pattern_donut.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:pattern_crafty_donut" + "item": "botania:pattern_donut" }, "pattern": [ "RRR", diff --git a/src/main/resources/data/botania/recipes/petal_light_blue.json b/src/main/resources/data/botania/recipes/petal_light_blue.json index da645ea5e..9acbcaa66 100644 --- a/src/main/resources/data/botania/recipes/petal_light_blue.json +++ b/src/main/resources/data/botania/recipes/petal_light_blue.json @@ -6,7 +6,7 @@ "group": "botania:petal", "ingredients": [ { - "tag": "botania:flowers/lightblue" + "tag": "botania:flowers/light_blue" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_light_blue_double.json b/src/main/resources/data/botania/recipes/petal_light_blue_double.json index 772df22c9..6e782b826 100644 --- a/src/main/resources/data/botania/recipes/petal_light_blue_double.json +++ b/src/main/resources/data/botania/recipes/petal_light_blue_double.json @@ -6,7 +6,7 @@ "group": "botania:petal_double", "ingredients": [ { - "tag": "botania:double_flowers/lightblue" + "tag": "botania:double_flowers/light_blue" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/shinyflower_6.json b/src/main/resources/data/botania/recipes/pink_shiny_flower.json similarity index 84% rename from src/main/resources/data/botania/recipes/shinyflower_6.json rename to src/main/resources/data/botania/recipes/pink_shiny_flower.json index 848421466..d2227d85f 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_6.json +++ b/src/main/resources/data/botania/recipes/pink_shiny_flower.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:shinyflower", - "data": 6 + "item": "botania:pink_shiny_flower" }, "group": "botania:shinyflower", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/pixiering.json b/src/main/resources/data/botania/recipes/pixie_ring.json similarity index 87% rename from src/main/resources/data/botania/recipes/pixiering.json rename to src/main/resources/data/botania/recipes/pixie_ring.json index e87858bf0..2995be010 100644 --- a/src/main/resources/data/botania/recipes/pixiering.json +++ b/src/main/resources/data/botania/recipes/pixie_ring.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:pixiering" + "item": "botania:pixie_ring" }, "pattern": [ "DE ", diff --git a/src/main/resources/data/botania/recipes/poolminecart.json b/src/main/resources/data/botania/recipes/pool_minecart.json similarity index 67% rename from src/main/resources/data/botania/recipes/poolminecart.json rename to src/main/resources/data/botania/recipes/pool_minecart.json index 291e29994..9f1214cc4 100644 --- a/src/main/resources/data/botania/recipes/poolminecart.json +++ b/src/main/resources/data/botania/recipes/pool_minecart.json @@ -1,13 +1,13 @@ { "result": { - "item": "botania:poolminecart" + "item": "botania:pool_minecart" }, "ingredients": [ { "item": "minecraft:minecart" }, { - "item": "botania:pool_default" + "item": "botania:mana_pool" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/shinyflower_10.json b/src/main/resources/data/botania/recipes/purple_shiny_flower.json similarity index 84% rename from src/main/resources/data/botania/recipes/shinyflower_10.json rename to src/main/resources/data/botania/recipes/purple_shiny_flower.json index 6434a6ccd..db1ed57e6 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_10.json +++ b/src/main/resources/data/botania/recipes/purple_shiny_flower.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:shinyflower", - "data": 10 + "item": "botania:purple_shiny_flower" }, "group": "botania:shinyflower", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/quartzslabblazehalf_0.json b/src/main/resources/data/botania/recipes/quartzslabblazehalf_0.json deleted file mode 100644 index 38ca78d46..000000000 --- a/src/main/resources/data/botania/recipes/quartzslabblazehalf_0.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:quartzslabblazehalf", - "data": 0, - "count": 6 - }, - "pattern": [ - "QQQ" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:quartztypeblaze", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/quartzslabdarkhalf_0.json b/src/main/resources/data/botania/recipes/quartzslabdarkhalf_0.json deleted file mode 100644 index 6e84a3acb..000000000 --- a/src/main/resources/data/botania/recipes/quartzslabdarkhalf_0.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:quartzslabdarkhalf", - "data": 0, - "count": 6 - }, - "pattern": [ - "QQQ" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:quartztypedark", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/quartzslablavenderhalf_0.json b/src/main/resources/data/botania/recipes/quartzslablavenderhalf_0.json deleted file mode 100644 index 0423c05e4..000000000 --- a/src/main/resources/data/botania/recipes/quartzslablavenderhalf_0.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:quartzslablavenderhalf", - "data": 0, - "count": 6 - }, - "pattern": [ - "QQQ" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:quartztypelavender", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/quartzslabmanahalf_0.json b/src/main/resources/data/botania/recipes/quartzslabmanahalf_0.json deleted file mode 100644 index a27434257..000000000 --- a/src/main/resources/data/botania/recipes/quartzslabmanahalf_0.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:quartzslabmanahalf", - "data": 0, - "count": 6 - }, - "pattern": [ - "QQQ" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:quartztypemana", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/quartzslabsunnyhalf_0.json b/src/main/resources/data/botania/recipes/quartzslabsunnyhalf_0.json deleted file mode 100644 index 5d7747e9d..000000000 --- a/src/main/resources/data/botania/recipes/quartzslabsunnyhalf_0.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:quartzslabsunnyhalf", - "data": 0, - "count": 6 - }, - "pattern": [ - "QQQ" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:quartztypesunny", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/quartzstairsblaze.json b/src/main/resources/data/botania/recipes/quartzstairsblaze.json deleted file mode 100644 index cfc8dfdc2..000000000 --- a/src/main/resources/data/botania/recipes/quartzstairsblaze.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "botania:quartzstairsblaze", - "count": 4 - }, - "pattern": [ - " Q", - " QQ", - "QQQ" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:quartztypeblaze", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/quartzstairsdark.json b/src/main/resources/data/botania/recipes/quartzstairsdark.json deleted file mode 100644 index 72afb9456..000000000 --- a/src/main/resources/data/botania/recipes/quartzstairsdark.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "botania:quartzstairsdark", - "count": 4 - }, - "pattern": [ - " Q", - " QQ", - "QQQ" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:quartztypedark", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/quartzstairslavender.json b/src/main/resources/data/botania/recipes/quartzstairslavender.json deleted file mode 100644 index 5ce055037..000000000 --- a/src/main/resources/data/botania/recipes/quartzstairslavender.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "botania:quartzstairslavender", - "count": 4 - }, - "pattern": [ - " Q", - " QQ", - "QQQ" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:quartztypelavender", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/quartzstairsmana.json b/src/main/resources/data/botania/recipes/quartzstairsmana.json deleted file mode 100644 index 4b14403e3..000000000 --- a/src/main/resources/data/botania/recipes/quartzstairsmana.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "botania:quartzstairsmana", - "count": 4 - }, - "pattern": [ - " Q", - " QQ", - "QQQ" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:quartztypemana", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/quartzstairssunny.json b/src/main/resources/data/botania/recipes/quartzstairssunny.json deleted file mode 100644 index cf865d046..000000000 --- a/src/main/resources/data/botania/recipes/quartzstairssunny.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "botania:quartzstairssunny", - "count": 4 - }, - "pattern": [ - " Q", - " QQ", - "QQQ" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:quartztypesunny", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/rainbowrod.json b/src/main/resources/data/botania/recipes/rainbow_rod.json similarity index 89% rename from src/main/resources/data/botania/recipes/rainbowrod.json rename to src/main/resources/data/botania/recipes/rainbow_rod.json index 7a2a84f7f..d42a67494 100644 --- a/src/main/resources/data/botania/recipes/rainbowrod.json +++ b/src/main/resources/data/botania/recipes/rainbow_rod.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:rainbowrod" + "item": "botania:rainbow_rod" }, "pattern": [ " PD", diff --git a/src/main/resources/data/botania/recipes/reachring.json b/src/main/resources/data/botania/recipes/reach_ring.json similarity index 87% rename from src/main/resources/data/botania/recipes/reachring.json rename to src/main/resources/data/botania/recipes/reach_ring.json index 446b47f74..52bab48e3 100644 --- a/src/main/resources/data/botania/recipes/reachring.json +++ b/src/main/resources/data/botania/recipes/reach_ring.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:reachring" + "item": "botania:reach_ring" }, "pattern": [ "RE ", diff --git a/src/main/resources/data/botania/recipes/red_quartz_slab.json b/src/main/resources/data/botania/recipes/red_quartz_slab.json new file mode 100644 index 000000000..5387dffe6 --- /dev/null +++ b/src/main/resources/data/botania/recipes/red_quartz_slab.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:red_quartz_slab", + "count": 6 + }, + "pattern": [ + "QQQ" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:red_quartz" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/red_quartz_stairs.json b/src/main/resources/data/botania/recipes/red_quartz_stairs.json new file mode 100644 index 000000000..d2d125f51 --- /dev/null +++ b/src/main/resources/data/botania/recipes/red_quartz_stairs.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "botania:red_quartz_stairs", + "count": 4 + }, + "pattern": [ + " Q", + " QQ", + "QQQ" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:red_quartz" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shinyflower_14.json b/src/main/resources/data/botania/recipes/red_shiny_flower.json similarity index 84% rename from src/main/resources/data/botania/recipes/shinyflower_14.json rename to src/main/resources/data/botania/recipes/red_shiny_flower.json index 977474406..86fce9c96 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_14.json +++ b/src/main/resources/data/botania/recipes/red_shiny_flower.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:shinyflower", - "data": 14 + "item": "botania:red_shiny_flower" }, "group": "botania:shinyflower", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/redstringcomparator.json b/src/main/resources/data/botania/recipes/red_string_comparator.json similarity index 86% rename from src/main/resources/data/botania/recipes/redstringcomparator.json rename to src/main/resources/data/botania/recipes/red_string_comparator.json index c74f1a973..5d87ad8cf 100644 --- a/src/main/resources/data/botania/recipes/redstringcomparator.json +++ b/src/main/resources/data/botania/recipes/red_string_comparator.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:redstringcomparator" + "item": "botania:red_string_comparator" }, "pattern": [ "RRR", diff --git a/src/main/resources/data/botania/recipes/redstringcontainer.json b/src/main/resources/data/botania/recipes/red_string_container.json similarity index 86% rename from src/main/resources/data/botania/recipes/redstringcontainer.json rename to src/main/resources/data/botania/recipes/red_string_container.json index f32c3b921..74faf5066 100644 --- a/src/main/resources/data/botania/recipes/redstringcontainer.json +++ b/src/main/resources/data/botania/recipes/red_string_container.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:redstringcontainer" + "item": "botania:red_string_container" }, "pattern": [ "RRR", diff --git a/src/main/resources/data/botania/recipes/redstringdispenser.json b/src/main/resources/data/botania/recipes/red_string_dispenser.json similarity index 86% rename from src/main/resources/data/botania/recipes/redstringdispenser.json rename to src/main/resources/data/botania/recipes/red_string_dispenser.json index eafb81b52..9b6f5c6ce 100644 --- a/src/main/resources/data/botania/recipes/redstringdispenser.json +++ b/src/main/resources/data/botania/recipes/red_string_dispenser.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:redstringdispenser" + "item": "botania:red_string_dispenser" }, "pattern": [ "RRR", diff --git a/src/main/resources/data/botania/recipes/redstringfertilizer.json b/src/main/resources/data/botania/recipes/red_string_fertilizer.json similarity index 86% rename from src/main/resources/data/botania/recipes/redstringfertilizer.json rename to src/main/resources/data/botania/recipes/red_string_fertilizer.json index 862796482..31baf81d2 100644 --- a/src/main/resources/data/botania/recipes/redstringfertilizer.json +++ b/src/main/resources/data/botania/recipes/red_string_fertilizer.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:redstringfertilizer" + "item": "botania:red_string_fertilizer" }, "pattern": [ "RRR", diff --git a/src/main/resources/data/botania/recipes/redstringinterceptor.json b/src/main/resources/data/botania/recipes/red_string_interceptor.json similarity index 86% rename from src/main/resources/data/botania/recipes/redstringinterceptor.json rename to src/main/resources/data/botania/recipes/red_string_interceptor.json index b5e70992b..8534adff6 100644 --- a/src/main/resources/data/botania/recipes/redstringinterceptor.json +++ b/src/main/resources/data/botania/recipes/red_string_interceptor.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:redstringinterceptor" + "item": "botania:red_string_interceptor" }, "pattern": [ "RRR", diff --git a/src/main/resources/data/botania/recipes/redstringrelay.json b/src/main/resources/data/botania/recipes/red_string_relay.json similarity index 88% rename from src/main/resources/data/botania/recipes/redstringrelay.json rename to src/main/resources/data/botania/recipes/red_string_relay.json index 964323399..dcde66948 100644 --- a/src/main/resources/data/botania/recipes/redstringrelay.json +++ b/src/main/resources/data/botania/recipes/red_string_relay.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:redstringrelay" + "item": "botania:red_string_relay" }, "pattern": [ "RRR", diff --git a/src/main/resources/data/botania/recipes/rfgenerator.json b/src/main/resources/data/botania/recipes/rf_generator.json similarity index 91% rename from src/main/resources/data/botania/recipes/rfgenerator.json rename to src/main/resources/data/botania/recipes/rf_generator.json index 87b8d1392..fad5d4f7d 100644 --- a/src/main/resources/data/botania/recipes/rfgenerator.json +++ b/src/main/resources/data/botania/recipes/rf_generator.json @@ -6,7 +6,7 @@ } ], "result": { - "item": "botania:rfgenerator" + "item": "botania:rf_generator" }, "pattern": [ "SRS", diff --git a/src/main/resources/data/botania/recipes/runealtar.json b/src/main/resources/data/botania/recipes/runic_altar.json similarity index 89% rename from src/main/resources/data/botania/recipes/runealtar.json rename to src/main/resources/data/botania/recipes/runic_altar.json index 36080327e..af06bd986 100644 --- a/src/main/resources/data/botania/recipes/runealtar.json +++ b/src/main/resources/data/botania/recipes/runic_altar.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:runealtar" + "item": "botania:runic_altar" }, "pattern": [ "SSS", diff --git a/src/main/resources/data/botania/recipes/seeds_scorched.json b/src/main/resources/data/botania/recipes/scorched_seeds.json similarity index 71% rename from src/main/resources/data/botania/recipes/seeds_scorched.json rename to src/main/resources/data/botania/recipes/scorched_seeds.json index c866d644b..a8f093454 100644 --- a/src/main/resources/data/botania/recipes/seeds_scorched.json +++ b/src/main/resources/data/botania/recipes/scorched_seeds.json @@ -1,11 +1,11 @@ { "result": { - "item": "botania:seeds_scorched" + "item": "botania:scorched_seeds" }, "group": "botania:seeds", "ingredients": [ { - "item": "botania:seeds_grass" + "item": "botania:grass_seeds" }, { "item": "minecraft:blaze_powder" diff --git a/src/main/resources/data/botania/recipes/seeds_vivid.json b/src/main/resources/data/botania/recipes/seeds_vivid.json deleted file mode 100644 index e7674c372..000000000 --- a/src/main/resources/data/botania/recipes/seeds_vivid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:seeds_vivid" - }, - "group": "botania:seeds", - "ingredients": [ - { - "item": "botania:seeds_grass" - }, - { - "item": "minecraft:dye", - "data": 2 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shimmerrock.json b/src/main/resources/data/botania/recipes/shimmerrock.json index d966789a0..81a161880 100644 --- a/src/main/resources/data/botania/recipes/shimmerrock.json +++ b/src/main/resources/data/botania/recipes/shimmerrock.json @@ -7,7 +7,7 @@ "tag": "botania:livingrock" }, { - "item": "botania:bifrostperm" + "item": "botania:bifrost_perm" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/shimmerrock0slab_0.json b/src/main/resources/data/botania/recipes/shimmerrock_slab.json similarity index 75% rename from src/main/resources/data/botania/recipes/shimmerrock0slab_0.json rename to src/main/resources/data/botania/recipes/shimmerrock_slab.json index 0488e9942..59d9530bb 100644 --- a/src/main/resources/data/botania/recipes/shimmerrock0slab_0.json +++ b/src/main/resources/data/botania/recipes/shimmerrock_slab.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:shimmerrock0slab", - "data": 0, + "item": "botania:shimmerrock_slab", "count": 6 }, "pattern": [ diff --git a/src/main/resources/data/botania/recipes/shimmerrock0stairs.json b/src/main/resources/data/botania/recipes/shimmerrock_stairs.json similarity index 82% rename from src/main/resources/data/botania/recipes/shimmerrock0stairs.json rename to src/main/resources/data/botania/recipes/shimmerrock_stairs.json index 7fcdeb382..2a86085cb 100644 --- a/src/main/resources/data/botania/recipes/shimmerrock0stairs.json +++ b/src/main/resources/data/botania/recipes/shimmerrock_stairs.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:shimmerrock0stairs", + "item": "botania:shimmerrock_stairs", "count": 4 }, "pattern": [ diff --git a/src/main/resources/data/botania/recipes/shimmerwood_planks.json b/src/main/resources/data/botania/recipes/shimmerwood_planks.json new file mode 100644 index 000000000..3bcd3702f --- /dev/null +++ b/src/main/resources/data/botania/recipes/shimmerwood_planks.json @@ -0,0 +1,14 @@ +{ + "result": { + "item": "botania:shimmerwood_planks" + }, + "ingredients": [ + { + "item": "botania:dreamwood_planks" + }, + { + "item": "botania:bifrost_perm" + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shimmerwood_planks_slab.json b/src/main/resources/data/botania/recipes/shimmerwood_planks_slab.json new file mode 100644 index 000000000..bfe7ee27f --- /dev/null +++ b/src/main/resources/data/botania/recipes/shimmerwood_planks_slab.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:shimmerwood_planks_slab", + "count": 6 + }, + "pattern": [ + "QQQ" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:shimmerwood_planks" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shimmerwood_planks_stairs.json b/src/main/resources/data/botania/recipes/shimmerwood_planks_stairs.json new file mode 100644 index 000000000..2c5382c11 --- /dev/null +++ b/src/main/resources/data/botania/recipes/shimmerwood_planks_stairs.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "botania:shimmerwood_planks_stairs", + "count": 4 + }, + "pattern": [ + " Q", + " QQ", + "QQQ" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:shimmerwood_planks" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shimmerwoodplanks.json b/src/main/resources/data/botania/recipes/shimmerwoodplanks.json deleted file mode 100644 index 1e0c9e938..000000000 --- a/src/main/resources/data/botania/recipes/shimmerwoodplanks.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "result": { - "item": "botania:shimmerwoodplanks" - }, - "ingredients": [ - { - "item": "botania:dreamwood", - "data": 1 - }, - { - "item": "botania:bifrostperm" - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shinyflower_3.json b/src/main/resources/data/botania/recipes/shinyflower_3.json deleted file mode 100644 index bebdbcac3..000000000 --- a/src/main/resources/data/botania/recipes/shinyflower_3.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "result": { - "item": "botania:shinyflower", - "data": 3 - }, - "group": "botania:shinyflower", - "ingredients": [ - { - "tag": "forge:dusts/glowstone" - }, - { - "tag": "forge:dusts/glowstone" - }, - { - "tag": "botania:flowers/lightblue" - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/skydirtrod.json b/src/main/resources/data/botania/recipes/skydirt_rod.json similarity index 74% rename from src/main/resources/data/botania/recipes/skydirtrod.json rename to src/main/resources/data/botania/recipes/skydirt_rod.json index 4d4633b6e..c24259e52 100644 --- a/src/main/resources/data/botania/recipes/skydirtrod.json +++ b/src/main/resources/data/botania/recipes/skydirt_rod.json @@ -1,10 +1,10 @@ { "result": { - "item": "botania:skydirtrod" + "item": "botania:skydirt_rod" }, "ingredients": [ { - "item": "botania:dirtrod" + "item": "botania:dirt_rod" }, { "item": "botania:pixie_dust" diff --git a/src/main/resources/data/botania/recipes/slab_recombine/livingrock_brick.json b/src/main/resources/data/botania/recipes/slab_recombine/livingrock_bricks.json similarity index 59% rename from src/main/resources/data/botania/recipes/slab_recombine/livingrock_brick.json rename to src/main/resources/data/botania/recipes/slab_recombine/livingrock_bricks.json index 30a1dd16a..cfe3af4af 100644 --- a/src/main/resources/data/botania/recipes/slab_recombine/livingrock_brick.json +++ b/src/main/resources/data/botania/recipes/slab_recombine/livingrock_bricks.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:livingrock_brick" + "item": "botania:livingrock_bricks" }, "pattern": [ "Q", @@ -9,7 +9,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:livingrock_brick_slab" + "item": "botania:livingrock_bricks_slab" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slimebottle.json b/src/main/resources/data/botania/recipes/slime_bottle.json similarity index 75% rename from src/main/resources/data/botania/recipes/slimebottle.json rename to src/main/resources/data/botania/recipes/slime_bottle.json index 1b2db3f44..bf02e2133 100644 --- a/src/main/resources/data/botania/recipes/slimebottle.json +++ b/src/main/resources/data/botania/recipes/slime_bottle.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:slimebottle", - "data": 0 + "item": "botania:slime_bottle" }, "pattern": [ "EGE", @@ -17,7 +16,7 @@ "tag": "forge:ingots/elementium" }, "G": { - "item": "botania:elfglass" + "item": "botania:elf_glass" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/smeltrod.json b/src/main/resources/data/botania/recipes/smelt_rod.json similarity index 90% rename from src/main/resources/data/botania/recipes/smeltrod.json rename to src/main/resources/data/botania/recipes/smelt_rod.json index 55f581f3d..f48f89c03 100644 --- a/src/main/resources/data/botania/recipes/smeltrod.json +++ b/src/main/resources/data/botania/recipes/smelt_rod.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:smeltrod" + "item": "botania:smelt_rod" }, "pattern": [ " BF", diff --git a/src/main/resources/data/botania/recipes/spark.json b/src/main/resources/data/botania/recipes/spark.json index 55fc90dfe..59a58eb4e 100644 --- a/src/main/resources/data/botania/recipes/spark.json +++ b/src/main/resources/data/botania/recipes/spark.json @@ -20,7 +20,7 @@ "tag": "botania:petals/magenta" }, { - "tag": "botania:petals/lightblue" + "tag": "botania:petals/light_blue" }, { "tag": "botania:petals/yellow" diff --git a/src/main/resources/data/botania/recipes/sparkchanger.json b/src/main/resources/data/botania/recipes/spark_changer.json similarity index 88% rename from src/main/resources/data/botania/recipes/sparkchanger.json rename to src/main/resources/data/botania/recipes/spark_changer.json index efe9eae9f..215d36094 100644 --- a/src/main/resources/data/botania/recipes/sparkchanger.json +++ b/src/main/resources/data/botania/recipes/spark_changer.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:sparkchanger" + "item": "botania:spark_changer" }, "pattern": [ "ESE", diff --git a/src/main/resources/data/botania/recipes/spawnerclaw.json b/src/main/resources/data/botania/recipes/spawner_claw.json similarity index 80% rename from src/main/resources/data/botania/recipes/spawnerclaw.json rename to src/main/resources/data/botania/recipes/spawner_claw.json index f32a1dbbc..2f4af2f75 100644 --- a/src/main/resources/data/botania/recipes/spawnerclaw.json +++ b/src/main/resources/data/botania/recipes/spawner_claw.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:spawnerclaw" + "item": "botania:spawner_claw" }, "pattern": [ "BSB", @@ -10,8 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "minecraft:prismarine", - "data": 2 + "item": "minecraft:prismarine_bricks" }, "B": { "item": "minecraft:blaze_rod" diff --git a/src/main/resources/data/botania/recipes/spawnermover.json b/src/main/resources/data/botania/recipes/spawner_mover.json similarity index 90% rename from src/main/resources/data/botania/recipes/spawnermover.json rename to src/main/resources/data/botania/recipes/spawner_mover.json index bd8ca7869..43735a874 100644 --- a/src/main/resources/data/botania/recipes/spawnermover.json +++ b/src/main/resources/data/botania/recipes/spawner_mover.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:spawnermover" + "item": "botania:spawner_mover" }, "pattern": [ "EIE", diff --git a/src/main/resources/data/botania/recipes/speed_up_belt.json b/src/main/resources/data/botania/recipes/speed_up_belt.json new file mode 100644 index 000000000..4fa1215f2 --- /dev/null +++ b/src/main/resources/data/botania/recipes/speed_up_belt.json @@ -0,0 +1,25 @@ +{ + "result": { + "item": "botania:speed_up_belt" + }, + "pattern": [ + " M ", + "PBP", + " S " + ], + "type": "minecraft:crafting_shaped", + "key": { + "P": { + "item": "botania:grass_seeds" + }, + "B": { + "item": "botania:travel_belt" + }, + "S": { + "item": "minecraft:sugar" + }, + "M": { + "item": "minecraft:filled_map" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/speedupbelt.json b/src/main/resources/data/botania/recipes/speedupbelt.json deleted file mode 100644 index 96d67b5dc..000000000 --- a/src/main/resources/data/botania/recipes/speedupbelt.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "result": { - "item": "botania:speedupbelt" - }, - "pattern": [ - " M ", - "PBP", - " S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "P": { - "item": "botania:seeds_grass" - }, - "B": { - "item": "botania:travelbelt" - }, - "S": { - "item": "minecraft:sugar" - }, - "M": [ - { - "item": "minecraft:filled_map", - "data": 0 - }, - { - "item": "minecraft:filled_map", - "data": 32767 - } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/spellcloth.json b/src/main/resources/data/botania/recipes/spell_cloth.json similarity index 87% rename from src/main/resources/data/botania/recipes/spellcloth.json rename to src/main/resources/data/botania/recipes/spell_cloth.json index 021d2532c..2c3557734 100644 --- a/src/main/resources/data/botania/recipes/spellcloth.json +++ b/src/main/resources/data/botania/recipes/spell_cloth.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:spellcloth" + "item": "botania:spell_cloth" }, "pattern": [ " C ", diff --git a/src/main/resources/data/botania/recipes/starsword.json b/src/main/resources/data/botania/recipes/star_sword.json similarity index 82% rename from src/main/resources/data/botania/recipes/starsword.json rename to src/main/resources/data/botania/recipes/star_sword.json index 0d5d93858..a6957e3d0 100644 --- a/src/main/resources/data/botania/recipes/starsword.json +++ b/src/main/resources/data/botania/recipes/star_sword.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:starsword" + "item": "botania:star_sword" }, "pattern": [ " I", @@ -16,7 +16,7 @@ "tag": "forge:gems/dragonstone" }, "T": { - "item": "botania:terrasword" + "item": "botania:terra_sword" }, "I": { "tag": "forge:ingots/elementium" diff --git a/src/main/resources/data/botania/recipes/sunny_quartz_slab.json b/src/main/resources/data/botania/recipes/sunny_quartz_slab.json new file mode 100644 index 000000000..ba1c400a8 --- /dev/null +++ b/src/main/resources/data/botania/recipes/sunny_quartz_slab.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:sunny_quartz_slab", + "count": 6 + }, + "pattern": [ + "QQQ" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:sunny_quartz" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/sunny_quartz_stairs.json b/src/main/resources/data/botania/recipes/sunny_quartz_stairs.json new file mode 100644 index 000000000..c0d0ecd08 --- /dev/null +++ b/src/main/resources/data/botania/recipes/sunny_quartz_stairs.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "botania:sunny_quartz_stairs", + "count": 4 + }, + "pattern": [ + " Q", + " QQ", + "QQQ" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:sunny_quartz" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/supercloudpendant.json b/src/main/resources/data/botania/recipes/super_cloud_pendant.json similarity index 72% rename from src/main/resources/data/botania/recipes/supercloudpendant.json rename to src/main/resources/data/botania/recipes/super_cloud_pendant.json index 34367a827..e50d1039b 100644 --- a/src/main/resources/data/botania/recipes/supercloudpendant.json +++ b/src/main/resources/data/botania/recipes/super_cloud_pendant.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:supercloudpendant" + "item": "botania:super_cloud_pendant" }, "pattern": [ "BEB", @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:cloudpendant" + "item": "botania:cloud_pendant" }, "B": { "item": "minecraft:ghast_tear" @@ -22,8 +22,7 @@ "item": "botania:life_essence" }, "N": { - "item": "minecraft:wool", - "data": 0 + "item": "minecraft:white_wool" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/superlavapendant.json b/src/main/resources/data/botania/recipes/super_lava_pendant.json similarity index 79% rename from src/main/resources/data/botania/recipes/superlavapendant.json rename to src/main/resources/data/botania/recipes/super_lava_pendant.json index 274a2748d..ad643ec16 100644 --- a/src/main/resources/data/botania/recipes/superlavapendant.json +++ b/src/main/resources/data/botania/recipes/super_lava_pendant.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:superlavapendant" + "item": "botania:super_lava_pendant" }, "pattern": [ "BBB", @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:lavapendant" + "item": "botania:lava_pendant" }, "B": { "item": "minecraft:blaze_rod" diff --git a/src/main/resources/data/botania/recipes/supertravelbelt.json b/src/main/resources/data/botania/recipes/super_travel_belt.json similarity index 77% rename from src/main/resources/data/botania/recipes/supertravelbelt.json rename to src/main/resources/data/botania/recipes/super_travel_belt.json index bca6419a4..1a0402a92 100644 --- a/src/main/resources/data/botania/recipes/supertravelbelt.json +++ b/src/main/resources/data/botania/recipes/super_travel_belt.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:supertravelbelt" + "item": "botania:super_travel_belt" }, "pattern": [ "E ", @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "S": { - "item": "botania:travelbelt" + "item": "botania:travel_belt" }, "E": { "tag": "forge:ingots/elementium" diff --git a/src/main/resources/data/botania/recipes/terraform_rod.json b/src/main/resources/data/botania/recipes/terraform_rod.json index 6f33f58af..591f65eff 100644 --- a/src/main/resources/data/botania/recipes/terraform_rod.json +++ b/src/main/resources/data/botania/recipes/terraform_rod.json @@ -22,7 +22,7 @@ "tag": "forge:ingots/terrasteel" }, "G": { - "item": "botania:seeds_grass" + "item": "botania:grass_seeds" }, "W": { "tag": "botania:runes/winter" diff --git a/src/main/resources/data/botania/recipes/terrasteel_boots.json b/src/main/resources/data/botania/recipes/terrasteel_boots.json index 386744b38..b6a9aef99 100644 --- a/src/main/resources/data/botania/recipes/terrasteel_boots.json +++ b/src/main/resources/data/botania/recipes/terrasteel_boots.json @@ -8,8 +8,8 @@ "SAS", " S " ], + "todo": "todo tags", "key": { - "todo": "todo tags", "T": { "item": "botania:livingwood_twig" }, diff --git a/src/main/resources/data/botania/recipes/terrasteel_chestplate.json b/src/main/resources/data/botania/recipes/terrasteel_chestplate.json index aa32d1773..1dd135627 100644 --- a/src/main/resources/data/botania/recipes/terrasteel_chestplate.json +++ b/src/main/resources/data/botania/recipes/terrasteel_chestplate.json @@ -8,8 +8,8 @@ "SAS", " S " ], + "todo": "todo tags", "key": { - "todo": "todo tags", "T": { "item": "botania:livingwood_twig" }, diff --git a/src/main/resources/data/botania/recipes/terrasteel_helmet.json b/src/main/resources/data/botania/recipes/terrasteel_helmet.json index 2620c0d6e..0d32c499f 100644 --- a/src/main/resources/data/botania/recipes/terrasteel_helmet.json +++ b/src/main/resources/data/botania/recipes/terrasteel_helmet.json @@ -8,8 +8,8 @@ "SAS", " S " ], + "__comment": "todo tags", "key": { - "__comment": "todo tags", "T": { "item": "botania:livingwood_twig" }, diff --git a/src/main/resources/data/botania/recipes/terrasteel_helmet_revealing.json b/src/main/resources/data/botania/recipes/terrasteel_helmet_revealing.json index fb78ec6e0..e4c8f98af 100644 --- a/src/main/resources/data/botania/recipes/terrasteel_helmet_revealing.json +++ b/src/main/resources/data/botania/recipes/terrasteel_helmet_revealing.json @@ -8,8 +8,8 @@ "SAS", " S " ], + "__comment": "todo tags", "key": { - "__comment": "todo tags", "T": { "item": "botania:livingwood_twig" }, diff --git a/src/main/resources/data/botania/recipes/terrasteel_leggings.json b/src/main/resources/data/botania/recipes/terrasteel_leggings.json index 0078f833a..22d007ed7 100644 --- a/src/main/resources/data/botania/recipes/terrasteel_leggings.json +++ b/src/main/resources/data/botania/recipes/terrasteel_leggings.json @@ -8,8 +8,8 @@ "SAS", " S " ], + "todo": "todo tags", "key": { - "todo": "todo tags", "T": { "item": "botania:livingwood_twig" }, diff --git a/src/main/resources/data/botania/recipes/teru_teru_bozu.json b/src/main/resources/data/botania/recipes/teru_teru_bozu.json index 512af1a2d..4bd368a6f 100644 --- a/src/main/resources/data/botania/recipes/teru_teru_bozu.json +++ b/src/main/resources/data/botania/recipes/teru_teru_bozu.json @@ -13,8 +13,7 @@ "item": "botania:manaweave_cloth" }, "S": { - "item": "minecraft:double_plant", - "data": 0 + "item": "minecraft:sunflower" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/unholy_cloak.json b/src/main/resources/data/botania/recipes/unholy_cloak.json index a638c6f74..d42055897 100644 --- a/src/main/resources/data/botania/recipes/unholy_cloak.json +++ b/src/main/resources/data/botania/recipes/unholy_cloak.json @@ -16,8 +16,7 @@ "item": "botania:life_essence" }, "W": { - "item": "minecraft:wool", - "data": 15 + "item": "minecraft:black_wool" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/virus_necrodermal.json b/src/main/resources/data/botania/recipes/virus_necrodermal.json index 9142aef56..047e13e22 100644 --- a/src/main/resources/data/botania/recipes/virus_necrodermal.json +++ b/src/main/resources/data/botania/recipes/virus_necrodermal.json @@ -19,8 +19,7 @@ "item": "minecraft:ender_eye" }, { - "item": "minecraft:skull", - "data": 2 + "item": "minecraft:zombie_head" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/virus_nullodermal.json b/src/main/resources/data/botania/recipes/virus_nullodermal.json index 418fc14ab..01988d59e 100644 --- a/src/main/resources/data/botania/recipes/virus_nullodermal.json +++ b/src/main/resources/data/botania/recipes/virus_nullodermal.json @@ -19,8 +19,7 @@ "item": "minecraft:ender_eye" }, { - "item": "minecraft:skull", - "data": 0 + "item": "minecraft:skeleton_skull" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/vivid_seeds.json b/src/main/resources/data/botania/recipes/vivid_seeds.json new file mode 100644 index 000000000..43c3444f4 --- /dev/null +++ b/src/main/resources/data/botania/recipes/vivid_seeds.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:vivid_seeds" + }, + "group": "botania:seeds", + "ingredients": [ + { + "item": "botania:grass_seeds" + }, + { + "item": "minecraft:cactus_green" + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shinyflower_0.json b/src/main/resources/data/botania/recipes/white_shiny_flower.json similarity index 84% rename from src/main/resources/data/botania/recipes/shinyflower_0.json rename to src/main/resources/data/botania/recipes/white_shiny_flower.json index 0e6a57034..c6911fa5f 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_0.json +++ b/src/main/resources/data/botania/recipes/white_shiny_flower.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:shinyflower", - "data": 0 + "item": "botania:white_shiny_flower" }, "group": "botania:shinyflower", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/shinyflower_4.json b/src/main/resources/data/botania/recipes/yellow_shiny_flower.json similarity index 84% rename from src/main/resources/data/botania/recipes/shinyflower_4.json rename to src/main/resources/data/botania/recipes/yellow_shiny_flower.json index 17fcd6b21..05637ec44 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_4.json +++ b/src/main/resources/data/botania/recipes/yellow_shiny_flower.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:shinyflower", - "data": 4 + "item": "botania:yellow_shiny_flower" }, "group": "botania:shinyflower", "ingredients": [