From 780228199c0a4e4910e476223e4cca7578683c2a Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sat, 24 Jan 2015 14:42:22 +0000 Subject: [PATCH] Moved Slabs, Stairs and other fluff to ModFluffBlocks. --- .../botania/common/block/ModBlocks.java | 202 +------------- .../botania/common/block/ModFluffBlocks.java | 256 ++++++++++++++++++ .../decor/quartz/BlockSpecialQuartz.java | 4 +- .../decor/quartz/BlockSpecialQuartzSlab.java | 52 ++-- .../quartz/BlockSpecialQuartzStairs.java | 4 +- .../block/decor/slabs/BlockReedSlab.java | 5 +- .../block/decor/slabs/BlockThatchSlab.java | 5 +- .../slabs/bricks/BlockCustomBrickSlab.java | 5 +- .../slabs/bricks/BlockSnowBrickSlab.java | 6 +- .../slabs/bricks/BlockSoulBrickSlab.java | 6 +- .../decor/slabs/bricks/BlockTileSlab.java | 6 +- .../slabs/living/BlockDreamwoodPlankSlab.java | 5 +- .../slabs/living/BlockDreamwoodSlab.java | 5 +- .../living/BlockLivingrockBrickSlab.java | 5 +- .../slabs/living/BlockLivingrockSlab.java | 5 +- .../living/BlockLivingwoodPlankSlab.java | 5 +- .../slabs/living/BlockLivingwoodSlab.java | 5 +- .../prismarine/BlockDarkPrismarineSlab.java | 6 +- .../prismarine/BlockPrismarineBrickSlab.java | 6 +- .../slabs/prismarine/BlockPrismarineSlab.java | 5 +- .../common/core/BotaniaCreativeTab.java | 97 +++---- .../common/crafting/ModCraftingRecipes.java | 44 +-- .../crafting/ModManaAlchemyRecipes.java | 14 +- 23 files changed, 411 insertions(+), 342 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/block/ModFluffBlocks.java diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 539361c68..d1c6b3cd7 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -223,80 +223,6 @@ public final class ModBlocks { public static Block prism; public static Block dirtPath; - public static Block livingwoodStairs; - public static Block livingwoodSlab; - public static Block livingwoodSlabFull; - public static Block livingwoodPlankStairs; - public static Block livingwoodPlankSlab; - public static Block livingwoodPlankSlabFull; - public static Block livingrockStairs; - public static Block livingrockSlab; - public static Block livingrockSlabFull; - public static Block livingrockBrickStairs; - public static Block livingrockBrickSlab; - public static Block livingrockBrickSlabFull; - public static Block dreamwoodStairs; - public static Block dreamwoodSlab; - public static Block dreamwoodSlabFull; - public static Block dreamwoodPlankStairs; - public static Block dreamwoodPlankSlab; - public static Block dreamwoodPlankSlabFull; - - public static Block prismarineStairs; - public static Block prismarineSlab; - public static Block prismarineSlabFull; - public static Block prismarineBrickStairs; - public static Block prismarineBrickSlab; - public static Block prismarineBrickSlabFull; - public static Block darkPrismarineStairs; - public static Block darkPrismarineSlab; - public static Block darkPrismarineSlabFull; - - public static Block reedStairs; - public static Block reedSlab; - public static Block reedSlabFull; - public static Block thatchStairs; - public static Block thatchSlab; - public static Block thatchSlabFull; - - public static Block netherBrickStairs; - public static Block netherBrickSlab; - public static Block netherBrickSlabFull; - public static Block soulBrickStairs; - public static Block soulBrickSlab; - public static Block soulBrickSlabFull; - public static Block snowBrickStairs; - public static Block snowBrickSlab; - public static Block snowBrickSlabFull; - public static Block tileStairs; - public static Block tileSlab; - public static Block tileSlabFull; - - public static Block darkQuartz; - public static Block darkQuartzSlab; - public static Block darkQuartzSlabFull; - public static Block darkQuartzStairs; - public static Block manaQuartz; - public static Block manaQuartzSlab; - public static Block manaQuartzSlabFull; - public static Block manaQuartzStairs; - public static Block blazeQuartz; - public static Block blazeQuartzSlab; - public static Block blazeQuartzSlabFull; - public static Block blazeQuartzStairs; - public static Block lavenderQuartz; - public static Block lavenderQuartzSlab; - public static Block lavenderQuartzSlabFull; - public static Block lavenderQuartzStairs; - public static Block redQuartz; - public static Block redQuartzSlab; - public static Block redQuartzSlabFull; - public static Block redQuartzStairs; - public static Block elfQuartz; - public static Block elfQuartzSlab; - public static Block elfQuartzSlabFull; - public static Block elfQuartzStairs; - public static void init() { flower = new BlockModFlower(); altar = new BlockAltar(); @@ -354,132 +280,8 @@ public final class ModBlocks { prism = new BlockPrism(); dirtPath = new BlockDirtPath(); - livingwoodStairs = new BlockLivingwoodStairs(); - livingwoodSlab = new BlockLivingwoodSlab(false); - livingwoodSlabFull = new BlockLivingwoodSlab(true); - livingwoodPlankStairs = new BlockLivingwoodPlankStairs(); - livingwoodPlankSlab = new BlockLivingwoodPlankSlab(false); - livingwoodPlankSlabFull = new BlockLivingwoodPlankSlab(true); - livingrockStairs = new BlockLivingrockStairs(); - livingrockSlab = new BlockLivingrockSlab(false); - livingrockSlabFull = new BlockLivingrockSlab(true); - livingrockBrickStairs = new BlockLivingrockBrickStairs(); - livingrockBrickSlab = new BlockLivingrockBrickSlab(false); - livingrockBrickSlabFull = new BlockLivingrockBrickSlab(true); - dreamwoodStairs = new BlockDreamwoodStairs(); - dreamwoodSlab = new BlockDreamwoodSlab(false); - dreamwoodSlabFull = new BlockDreamwoodSlab(true); - dreamwoodPlankStairs = new BlockDreamwoodPlankStairs(); - dreamwoodPlankSlab = new BlockDreamwoodPlankSlab(false); - dreamwoodPlankSlabFull = new BlockDreamwoodPlankSlab(true); - - reedStairs = new BlockReedStairs(); - reedSlab = new BlockReedSlab(false); - reedSlabFull = new BlockReedSlab(true); - thatchStairs = new BlockThatchStairs(); - thatchSlab = new BlockThatchSlab(false); - thatchSlabFull = new BlockThatchSlab(true); - - prismarineStairs = new BlockPrismarineStairs(); - prismarineSlab = new BlockPrismarineSlab(false); - prismarineSlabFull = new BlockPrismarineSlab(true); - prismarineBrickStairs = new BlockPrismarineBrickStairs(); - prismarineBrickSlab = new BlockPrismarineBrickSlab(false); - prismarineBrickSlabFull = new BlockPrismarineBrickSlab(true); - darkPrismarineStairs = new BlockDarkPrismarineStairs(); - darkPrismarineSlab = new BlockDarkPrismarineSlab(false); - darkPrismarineSlabFull = new BlockDarkPrismarineSlab(true); - - netherBrickStairs = new BlockCustomBrickStairs(); - netherBrickSlab = new BlockCustomBrickSlab(false); - netherBrickSlabFull = new BlockCustomBrickSlab(true); - soulBrickStairs = new BlockSoulBrickStairs(); - soulBrickSlab = new BlockSoulBrickSlab(false); - soulBrickSlabFull = new BlockSoulBrickSlab(true); - snowBrickStairs = new BlockSnowBrickStairs(); - snowBrickSlab = new BlockSnowBrickSlab(false); - snowBrickSlabFull = new BlockSnowBrickSlab(true); - tileStairs = new BlockTileStairs(); - tileSlab = new BlockTileSlab(false); - tileSlabFull = new BlockTileSlab(true); - - if(ConfigHandler.darkQuartzEnabled) { - darkQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_DARK); - darkQuartzSlab = new BlockSpecialQuartzSlab(darkQuartz, false); - darkQuartzSlabFull = new BlockSpecialQuartzSlab(darkQuartz, true); - darkQuartzStairs = new BlockSpecialQuartzStairs(darkQuartz); - } - - manaQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_MANA); - manaQuartzSlab = new BlockSpecialQuartzSlab(manaQuartz, false); - manaQuartzSlabFull = new BlockSpecialQuartzSlab(manaQuartz, true); - manaQuartzStairs = new BlockSpecialQuartzStairs(manaQuartz); - blazeQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_BLAZE); - blazeQuartzSlab = new BlockSpecialQuartzSlab(blazeQuartz, false); - blazeQuartzSlabFull = new BlockSpecialQuartzSlab(blazeQuartz, true); - blazeQuartzStairs = new BlockSpecialQuartzStairs(blazeQuartz); - lavenderQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_LAVENDER); - lavenderQuartzSlab = new BlockSpecialQuartzSlab(lavenderQuartz, false); - lavenderQuartzSlabFull = new BlockSpecialQuartzSlab(lavenderQuartz, true); - lavenderQuartzStairs = new BlockSpecialQuartzStairs(lavenderQuartz); - redQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_RED); - redQuartzSlab = new BlockSpecialQuartzSlab(redQuartz, false); - redQuartzSlabFull = new BlockSpecialQuartzSlab(redQuartz, true); - redQuartzStairs = new BlockSpecialQuartzStairs(redQuartz); - elfQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_ELF); - elfQuartzSlab = new BlockSpecialQuartzSlab(elfQuartz, false); - elfQuartzSlabFull = new BlockSpecialQuartzSlab(elfQuartz, true); - elfQuartzStairs = new BlockSpecialQuartzStairs(elfQuartz); - - if(ConfigHandler.darkQuartzEnabled) { - ((BlockModSlab) darkQuartzSlab).register(); - ((BlockModSlab) darkQuartzSlabFull).register(); - } - ((BlockModSlab) manaQuartzSlab).register(); - ((BlockModSlab) manaQuartzSlabFull).register(); - ((BlockModSlab) blazeQuartzSlab).register(); - ((BlockModSlab) blazeQuartzSlabFull).register(); - ((BlockModSlab) lavenderQuartzSlab).register(); - ((BlockModSlab) lavenderQuartzSlabFull).register(); - ((BlockModSlab) redQuartzSlab).register(); - ((BlockModSlab) redQuartzSlabFull).register(); - ((BlockModSlab) elfQuartzSlab).register(); - ((BlockModSlab) elfQuartzSlabFull).register(); - - ((BlockModSlab) livingwoodSlab).register(); - ((BlockModSlab) livingwoodSlabFull).register(); - ((BlockModSlab) livingwoodPlankSlab).register(); - ((BlockModSlab) livingwoodPlankSlabFull).register(); - ((BlockModSlab) livingrockSlab).register(); - ((BlockModSlab) livingrockSlabFull).register(); - ((BlockModSlab) livingrockBrickSlab).register(); - ((BlockModSlab) livingrockBrickSlabFull).register(); - ((BlockModSlab) dreamwoodSlab).register(); - ((BlockModSlab) dreamwoodSlabFull).register(); - ((BlockModSlab) dreamwoodPlankSlab).register(); - ((BlockModSlab) dreamwoodPlankSlabFull).register(); - - ((BlockModSlab) reedSlab).register(); - ((BlockModSlab) reedSlabFull).register(); - ((BlockModSlab) thatchSlab).register(); - ((BlockModSlab) thatchSlabFull).register(); - - ((BlockModSlab) prismarineSlab).register(); - ((BlockModSlab) prismarineSlabFull).register(); - ((BlockModSlab) prismarineBrickSlab).register(); - ((BlockModSlab) prismarineBrickSlabFull).register(); - ((BlockModSlab) darkPrismarineSlab).register(); - ((BlockModSlab) darkPrismarineSlabFull).register(); - - ((BlockModSlab) netherBrickSlab).register(); - ((BlockModSlab) netherBrickSlabFull).register(); - ((BlockModSlab) soulBrickSlab).register(); - ((BlockModSlab) soulBrickSlabFull).register(); - ((BlockModSlab) snowBrickSlab).register(); - ((BlockModSlab) snowBrickSlabFull).register(); - ((BlockModSlab) tileSlab).register(); - ((BlockModSlab) tileSlabFull).register(); - + ModFluffBlocks.init(); + for(int i = 0; i < 16; i++) OreDictionary.registerOre(LibOreDict.FLOWER[i], new ItemStack(flower, 1, i)); diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java new file mode 100644 index 000000000..e49556592 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -0,0 +1,256 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Jan 24, 2015, 2:35:08 PM (GMT)] + */ +package vazkii.botania.common.block; + +import net.minecraft.block.Block; +import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartz; +import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartzSlab; +import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartzStairs; +import vazkii.botania.common.block.decor.slabs.BlockModSlab; +import vazkii.botania.common.block.decor.slabs.BlockReedSlab; +import vazkii.botania.common.block.decor.slabs.BlockThatchSlab; +import vazkii.botania.common.block.decor.slabs.bricks.BlockCustomBrickSlab; +import vazkii.botania.common.block.decor.slabs.bricks.BlockSnowBrickSlab; +import vazkii.botania.common.block.decor.slabs.bricks.BlockSoulBrickSlab; +import vazkii.botania.common.block.decor.slabs.bricks.BlockTileSlab; +import vazkii.botania.common.block.decor.slabs.living.BlockDreamwoodPlankSlab; +import vazkii.botania.common.block.decor.slabs.living.BlockDreamwoodSlab; +import vazkii.botania.common.block.decor.slabs.living.BlockLivingrockBrickSlab; +import vazkii.botania.common.block.decor.slabs.living.BlockLivingrockSlab; +import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodPlankSlab; +import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodSlab; +import vazkii.botania.common.block.decor.slabs.prismarine.BlockDarkPrismarineSlab; +import vazkii.botania.common.block.decor.slabs.prismarine.BlockPrismarineBrickSlab; +import vazkii.botania.common.block.decor.slabs.prismarine.BlockPrismarineSlab; +import vazkii.botania.common.block.decor.stairs.BlockReedStairs; +import vazkii.botania.common.block.decor.stairs.BlockThatchStairs; +import vazkii.botania.common.block.decor.stairs.bricks.BlockCustomBrickStairs; +import vazkii.botania.common.block.decor.stairs.bricks.BlockSnowBrickStairs; +import vazkii.botania.common.block.decor.stairs.bricks.BlockSoulBrickStairs; +import vazkii.botania.common.block.decor.stairs.bricks.BlockTileStairs; +import vazkii.botania.common.block.decor.stairs.living.BlockDreamwoodPlankStairs; +import vazkii.botania.common.block.decor.stairs.living.BlockDreamwoodStairs; +import vazkii.botania.common.block.decor.stairs.living.BlockLivingrockBrickStairs; +import vazkii.botania.common.block.decor.stairs.living.BlockLivingrockStairs; +import vazkii.botania.common.block.decor.stairs.living.BlockLivingwoodPlankStairs; +import vazkii.botania.common.block.decor.stairs.living.BlockLivingwoodStairs; +import vazkii.botania.common.block.decor.stairs.prismarine.BlockDarkPrismarineStairs; +import vazkii.botania.common.block.decor.stairs.prismarine.BlockPrismarineBrickStairs; +import vazkii.botania.common.block.decor.stairs.prismarine.BlockPrismarineStairs; +import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.lib.LibBlockNames; + +public final class ModFluffBlocks { + + public static Block livingwoodStairs; + public static Block livingwoodSlab; + public static Block livingwoodSlabFull; + public static Block livingwoodPlankStairs; + public static Block livingwoodPlankSlab; + public static Block livingwoodPlankSlabFull; + public static Block livingrockStairs; + public static Block livingrockSlab; + public static Block livingrockSlabFull; + public static Block livingrockBrickStairs; + public static Block livingrockBrickSlab; + public static Block livingrockBrickSlabFull; + public static Block dreamwoodStairs; + public static Block dreamwoodSlab; + public static Block dreamwoodSlabFull; + public static Block dreamwoodPlankStairs; + public static Block dreamwoodPlankSlab; + public static Block dreamwoodPlankSlabFull; + + public static Block prismarineStairs; + public static Block prismarineSlab; + public static Block prismarineSlabFull; + public static Block prismarineBrickStairs; + public static Block prismarineBrickSlab; + public static Block prismarineBrickSlabFull; + public static Block darkPrismarineStairs; + public static Block darkPrismarineSlab; + public static Block darkPrismarineSlabFull; + + public static Block reedStairs; + public static Block reedSlab; + public static Block reedSlabFull; + public static Block thatchStairs; + public static Block thatchSlab; + public static Block thatchSlabFull; + + public static Block netherBrickStairs; + public static Block netherBrickSlab; + public static Block netherBrickSlabFull; + public static Block soulBrickStairs; + public static Block soulBrickSlab; + public static Block soulBrickSlabFull; + public static Block snowBrickStairs; + public static Block snowBrickSlab; + public static Block snowBrickSlabFull; + public static Block tileStairs; + public static Block tileSlab; + public static Block tileSlabFull; + + public static Block darkQuartz; + public static Block darkQuartzSlab; + public static Block darkQuartzSlabFull; + public static Block darkQuartzStairs; + public static Block manaQuartz; + public static Block manaQuartzSlab; + public static Block manaQuartzSlabFull; + public static Block manaQuartzStairs; + public static Block blazeQuartz; + public static Block blazeQuartzSlab; + public static Block blazeQuartzSlabFull; + public static Block blazeQuartzStairs; + public static Block lavenderQuartz; + public static Block lavenderQuartzSlab; + public static Block lavenderQuartzSlabFull; + public static Block lavenderQuartzStairs; + public static Block redQuartz; + public static Block redQuartzSlab; + public static Block redQuartzSlabFull; + public static Block redQuartzStairs; + public static Block elfQuartz; + public static Block elfQuartzSlab; + public static Block elfQuartzSlabFull; + public static Block elfQuartzStairs; + + public static void init() { + livingwoodStairs = new BlockLivingwoodStairs(); + livingwoodSlab = new BlockLivingwoodSlab(false); + livingwoodSlabFull = new BlockLivingwoodSlab(true); + livingwoodPlankStairs = new BlockLivingwoodPlankStairs(); + livingwoodPlankSlab = new BlockLivingwoodPlankSlab(false); + livingwoodPlankSlabFull = new BlockLivingwoodPlankSlab(true); + livingrockStairs = new BlockLivingrockStairs(); + livingrockSlab = new BlockLivingrockSlab(false); + livingrockSlabFull = new BlockLivingrockSlab(true); + livingrockBrickStairs = new BlockLivingrockBrickStairs(); + livingrockBrickSlab = new BlockLivingrockBrickSlab(false); + livingrockBrickSlabFull = new BlockLivingrockBrickSlab(true); + dreamwoodStairs = new BlockDreamwoodStairs(); + dreamwoodSlab = new BlockDreamwoodSlab(false); + dreamwoodSlabFull = new BlockDreamwoodSlab(true); + dreamwoodPlankStairs = new BlockDreamwoodPlankStairs(); + dreamwoodPlankSlab = new BlockDreamwoodPlankSlab(false); + dreamwoodPlankSlabFull = new BlockDreamwoodPlankSlab(true); + + reedStairs = new BlockReedStairs(); + reedSlab = new BlockReedSlab(false); + reedSlabFull = new BlockReedSlab(true); + thatchStairs = new BlockThatchStairs(); + thatchSlab = new BlockThatchSlab(false); + thatchSlabFull = new BlockThatchSlab(true); + + prismarineStairs = new BlockPrismarineStairs(); + prismarineSlab = new BlockPrismarineSlab(false); + prismarineSlabFull = new BlockPrismarineSlab(true); + prismarineBrickStairs = new BlockPrismarineBrickStairs(); + prismarineBrickSlab = new BlockPrismarineBrickSlab(false); + prismarineBrickSlabFull = new BlockPrismarineBrickSlab(true); + darkPrismarineStairs = new BlockDarkPrismarineStairs(); + darkPrismarineSlab = new BlockDarkPrismarineSlab(false); + darkPrismarineSlabFull = new BlockDarkPrismarineSlab(true); + + netherBrickStairs = new BlockCustomBrickStairs(); + netherBrickSlab = new BlockCustomBrickSlab(false); + netherBrickSlabFull = new BlockCustomBrickSlab(true); + soulBrickStairs = new BlockSoulBrickStairs(); + soulBrickSlab = new BlockSoulBrickSlab(false); + soulBrickSlabFull = new BlockSoulBrickSlab(true); + snowBrickStairs = new BlockSnowBrickStairs(); + snowBrickSlab = new BlockSnowBrickSlab(false); + snowBrickSlabFull = new BlockSnowBrickSlab(true); + tileStairs = new BlockTileStairs(); + tileSlab = new BlockTileSlab(false); + tileSlabFull = new BlockTileSlab(true); + + if(ConfigHandler.darkQuartzEnabled) { + darkQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_DARK); + darkQuartzSlab = new BlockSpecialQuartzSlab(darkQuartz, false); + darkQuartzSlabFull = new BlockSpecialQuartzSlab(darkQuartz, true); + darkQuartzStairs = new BlockSpecialQuartzStairs(darkQuartz); + } + + manaQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_MANA); + manaQuartzSlab = new BlockSpecialQuartzSlab(manaQuartz, false); + manaQuartzSlabFull = new BlockSpecialQuartzSlab(manaQuartz, true); + manaQuartzStairs = new BlockSpecialQuartzStairs(manaQuartz); + blazeQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_BLAZE); + blazeQuartzSlab = new BlockSpecialQuartzSlab(blazeQuartz, false); + blazeQuartzSlabFull = new BlockSpecialQuartzSlab(blazeQuartz, true); + blazeQuartzStairs = new BlockSpecialQuartzStairs(blazeQuartz); + lavenderQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_LAVENDER); + lavenderQuartzSlab = new BlockSpecialQuartzSlab(lavenderQuartz, false); + lavenderQuartzSlabFull = new BlockSpecialQuartzSlab(lavenderQuartz, true); + lavenderQuartzStairs = new BlockSpecialQuartzStairs(lavenderQuartz); + redQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_RED); + redQuartzSlab = new BlockSpecialQuartzSlab(redQuartz, false); + redQuartzSlabFull = new BlockSpecialQuartzSlab(redQuartz, true); + redQuartzStairs = new BlockSpecialQuartzStairs(redQuartz); + elfQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_ELF); + elfQuartzSlab = new BlockSpecialQuartzSlab(elfQuartz, false); + elfQuartzSlabFull = new BlockSpecialQuartzSlab(elfQuartz, true); + elfQuartzStairs = new BlockSpecialQuartzStairs(elfQuartz); + + if(ConfigHandler.darkQuartzEnabled) { + ((BlockModSlab) darkQuartzSlab).register(); + ((BlockModSlab) darkQuartzSlabFull).register(); + } + ((BlockModSlab) manaQuartzSlab).register(); + ((BlockModSlab) manaQuartzSlabFull).register(); + ((BlockModSlab) blazeQuartzSlab).register(); + ((BlockModSlab) blazeQuartzSlabFull).register(); + ((BlockModSlab) lavenderQuartzSlab).register(); + ((BlockModSlab) lavenderQuartzSlabFull).register(); + ((BlockModSlab) redQuartzSlab).register(); + ((BlockModSlab) redQuartzSlabFull).register(); + ((BlockModSlab) elfQuartzSlab).register(); + ((BlockModSlab) elfQuartzSlabFull).register(); + + ((BlockModSlab) livingwoodSlab).register(); + ((BlockModSlab) livingwoodSlabFull).register(); + ((BlockModSlab) livingwoodPlankSlab).register(); + ((BlockModSlab) livingwoodPlankSlabFull).register(); + ((BlockModSlab) livingrockSlab).register(); + ((BlockModSlab) livingrockSlabFull).register(); + ((BlockModSlab) livingrockBrickSlab).register(); + ((BlockModSlab) livingrockBrickSlabFull).register(); + ((BlockModSlab) dreamwoodSlab).register(); + ((BlockModSlab) dreamwoodSlabFull).register(); + ((BlockModSlab) dreamwoodPlankSlab).register(); + ((BlockModSlab) dreamwoodPlankSlabFull).register(); + + ((BlockModSlab) reedSlab).register(); + ((BlockModSlab) reedSlabFull).register(); + ((BlockModSlab) thatchSlab).register(); + ((BlockModSlab) thatchSlabFull).register(); + + ((BlockModSlab) prismarineSlab).register(); + ((BlockModSlab) prismarineSlabFull).register(); + ((BlockModSlab) prismarineBrickSlab).register(); + ((BlockModSlab) prismarineBrickSlabFull).register(); + ((BlockModSlab) darkPrismarineSlab).register(); + ((BlockModSlab) darkPrismarineSlabFull).register(); + + ((BlockModSlab) netherBrickSlab).register(); + ((BlockModSlab) netherBrickSlabFull).register(); + ((BlockModSlab) soulBrickSlab).register(); + ((BlockModSlab) soulBrickSlabFull).register(); + ((BlockModSlab) snowBrickSlab).register(); + ((BlockModSlab) snowBrickSlabFull).register(); + ((BlockModSlab) tileSlab).register(); + ((BlockModSlab) tileSlabFull).register(); + } + +} diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java index 61e26082f..63f6b630f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java @@ -26,7 +26,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialQuartz; import vazkii.botania.common.lexicon.LexiconData; import cpw.mods.fml.common.registry.GameRegistry; @@ -150,6 +150,6 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { @Override public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { - return this == ModBlocks.elfQuartz ? LexiconData.elvenResources : LexiconData.decorativeBlocks; + return this == ModFluffBlocks.elfQuartz ? LexiconData.elvenResources : LexiconData.decorativeBlocks; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java index 77f3c6852..0f6012d7e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java @@ -24,7 +24,7 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockModSlab; import vazkii.botania.common.lexicon.LexiconData; import cpw.mods.fml.relauncher.Side; @@ -43,36 +43,36 @@ public class BlockSpecialQuartzSlab extends BlockModSlab { @Override public BlockSlab getFullBlock() { - if(source == ModBlocks.darkQuartz) - return (BlockSlab) ModBlocks.darkQuartzSlabFull; - if(source == ModBlocks.manaQuartz) - return (BlockSlab) ModBlocks.manaQuartzSlabFull; - if(source == ModBlocks.blazeQuartz) - return (BlockSlab) ModBlocks.blazeQuartzSlabFull; - if(source == ModBlocks.lavenderQuartz) - return (BlockSlab) ModBlocks.lavenderQuartzSlabFull; - if(source == ModBlocks.redQuartz) - return (BlockSlab) ModBlocks.redQuartzSlabFull; - if(source == ModBlocks.elfQuartz) - return (BlockSlab) ModBlocks.elfQuartzSlabFull; + if(source == ModFluffBlocks.darkQuartz) + return (BlockSlab) ModFluffBlocks.darkQuartzSlabFull; + if(source == ModFluffBlocks.manaQuartz) + return (BlockSlab) ModFluffBlocks.manaQuartzSlabFull; + if(source == ModFluffBlocks.blazeQuartz) + return (BlockSlab) ModFluffBlocks.blazeQuartzSlabFull; + if(source == ModFluffBlocks.lavenderQuartz) + return (BlockSlab) ModFluffBlocks.lavenderQuartzSlabFull; + if(source == ModFluffBlocks.redQuartz) + return (BlockSlab) ModFluffBlocks.redQuartzSlabFull; + if(source == ModFluffBlocks.elfQuartz) + return (BlockSlab) ModFluffBlocks.elfQuartzSlabFull; return this; } @Override public BlockSlab getSingleBlock() { - if(source == ModBlocks.darkQuartz) - return (BlockSlab) ModBlocks.darkQuartzSlab; - if(source == ModBlocks.manaQuartz) - return (BlockSlab) ModBlocks.manaQuartzSlab; - if(source == ModBlocks.blazeQuartz) - return (BlockSlab) ModBlocks.blazeQuartzSlab; - if(source == ModBlocks.lavenderQuartz) - return (BlockSlab) ModBlocks.lavenderQuartzSlab; - if(source == ModBlocks.redQuartz) - return (BlockSlab) ModBlocks.redQuartzSlab; - if(source == ModBlocks.elfQuartz) - return (BlockSlab) ModBlocks.elfQuartzSlab; + if(source == ModFluffBlocks.darkQuartz) + return (BlockSlab) ModFluffBlocks.darkQuartzSlab; + if(source == ModFluffBlocks.manaQuartz) + return (BlockSlab) ModFluffBlocks.manaQuartzSlab; + if(source == ModFluffBlocks.blazeQuartz) + return (BlockSlab) ModFluffBlocks.blazeQuartzSlab; + if(source == ModFluffBlocks.lavenderQuartz) + return (BlockSlab) ModFluffBlocks.lavenderQuartzSlab; + if(source == ModFluffBlocks.redQuartz) + return (BlockSlab) ModFluffBlocks.redQuartzSlab; + if(source == ModFluffBlocks.elfQuartz) + return (BlockSlab) ModFluffBlocks.elfQuartzSlab; return this; } @@ -106,7 +106,7 @@ public class BlockSpecialQuartzSlab extends BlockModSlab { @Override public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { - return this == ModBlocks.elfQuartzSlab ? LexiconData.elvenResources : LexiconData.decorativeBlocks; + return this == ModFluffBlocks.elfQuartzSlab ? LexiconData.elvenResources : LexiconData.decorativeBlocks; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzStairs.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzStairs.java index a96b20bc3..4b8c37777 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzStairs.java @@ -16,7 +16,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.stairs.BlockModStairs; import vazkii.botania.common.lexicon.LexiconData; @@ -28,7 +28,7 @@ public class BlockSpecialQuartzStairs extends BlockModStairs { @Override public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { - return this == ModBlocks.elfQuartzStairs ? LexiconData.elvenResources : super.getEntry(world, x, y, z, player, lexicon); + return this == ModFluffBlocks.elfQuartzStairs ? LexiconData.elvenResources : super.getEntry(world, x, y, z, player, lexicon); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java index 4ec4bce71..31aac2fbc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java @@ -17,6 +17,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.lexicon.LexiconData; public class BlockReedSlab extends BlockLivingSlab { @@ -29,12 +30,12 @@ public class BlockReedSlab extends BlockLivingSlab { @Override public BlockSlab getFullBlock() { - return (BlockSlab) ModBlocks.reedSlabFull; + return (BlockSlab) ModFluffBlocks.reedSlabFull; } @Override public BlockSlab getSingleBlock() { - return (BlockSlab) ModBlocks.reedSlab; + return (BlockSlab) ModFluffBlocks.reedSlab; } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java index 46223a0d7..33389428e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java @@ -17,6 +17,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.lexicon.LexiconData; public class BlockThatchSlab extends BlockLivingSlab { @@ -29,12 +30,12 @@ public class BlockThatchSlab extends BlockLivingSlab { @Override public BlockSlab getFullBlock() { - return (BlockSlab) ModBlocks.thatchSlabFull; + return (BlockSlab) ModFluffBlocks.thatchSlabFull; } @Override public BlockSlab getSingleBlock() { - return (BlockSlab) ModBlocks.thatchSlab; + return (BlockSlab) ModFluffBlocks.thatchSlab; } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java index dd8f0c4b3..6973a1605 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java @@ -17,6 +17,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; import vazkii.botania.common.lexicon.LexiconData; @@ -35,12 +36,12 @@ public class BlockCustomBrickSlab extends BlockLivingSlab { @Override public BlockSlab getFullBlock() { - return (BlockSlab) ModBlocks.netherBrickSlabFull; + return (BlockSlab) ModFluffBlocks.netherBrickSlabFull; } @Override public BlockSlab getSingleBlock() { - return (BlockSlab) ModBlocks.netherBrickSlab; + return (BlockSlab) ModFluffBlocks.netherBrickSlab; } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockSnowBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockSnowBrickSlab.java index a5df2b9a3..7ab72d70a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockSnowBrickSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockSnowBrickSlab.java @@ -12,7 +12,7 @@ package vazkii.botania.common.block.decor.slabs.bricks; import net.minecraft.block.BlockSlab; -import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; public class BlockSnowBrickSlab extends BlockCustomBrickSlab { @@ -22,12 +22,12 @@ public class BlockSnowBrickSlab extends BlockCustomBrickSlab { @Override public BlockSlab getFullBlock() { - return (BlockSlab) ModBlocks.snowBrickSlabFull; + return (BlockSlab) ModFluffBlocks.snowBrickSlabFull; } @Override public BlockSlab getSingleBlock() { - return (BlockSlab) ModBlocks.snowBrickSlab; + return (BlockSlab) ModFluffBlocks.snowBrickSlab; } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockSoulBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockSoulBrickSlab.java index 3cee1acaf..e605b24d1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockSoulBrickSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockSoulBrickSlab.java @@ -12,7 +12,7 @@ package vazkii.botania.common.block.decor.slabs.bricks; import net.minecraft.block.BlockSlab; -import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; public class BlockSoulBrickSlab extends BlockCustomBrickSlab { @@ -22,12 +22,12 @@ public class BlockSoulBrickSlab extends BlockCustomBrickSlab { @Override public BlockSlab getFullBlock() { - return (BlockSlab) ModBlocks.soulBrickSlabFull; + return (BlockSlab) ModFluffBlocks.soulBrickSlabFull; } @Override public BlockSlab getSingleBlock() { - return (BlockSlab) ModBlocks.soulBrickSlab; + return (BlockSlab) ModFluffBlocks.soulBrickSlab; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockTileSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockTileSlab.java index 21162e01b..5ea13c5a2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockTileSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockTileSlab.java @@ -12,7 +12,7 @@ package vazkii.botania.common.block.decor.slabs.bricks; import net.minecraft.block.BlockSlab; -import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; public class BlockTileSlab extends BlockCustomBrickSlab { @@ -22,12 +22,12 @@ public class BlockTileSlab extends BlockCustomBrickSlab { @Override public BlockSlab getFullBlock() { - return (BlockSlab) ModBlocks.tileSlabFull; + return (BlockSlab) ModFluffBlocks.tileSlabFull; } @Override public BlockSlab getSingleBlock() { - return (BlockSlab) ModBlocks.tileSlab; + return (BlockSlab) ModFluffBlocks.tileSlab; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockDreamwoodPlankSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockDreamwoodPlankSlab.java index 3d9fa855d..d080a13a5 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockDreamwoodPlankSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockDreamwoodPlankSlab.java @@ -2,6 +2,7 @@ package vazkii.botania.common.block.decor.slabs.living; import net.minecraft.block.BlockSlab; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; public class BlockDreamwoodPlankSlab extends BlockLivingSlab { @@ -13,12 +14,12 @@ public class BlockDreamwoodPlankSlab extends BlockLivingSlab { @Override public BlockSlab getFullBlock() { - return (BlockSlab) ModBlocks.dreamwoodSlabFull; + return (BlockSlab) ModFluffBlocks.dreamwoodSlabFull; } @Override public BlockSlab getSingleBlock() { - return (BlockSlab) ModBlocks.dreamwoodSlab; + return (BlockSlab) ModFluffBlocks.dreamwoodSlab; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockDreamwoodSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockDreamwoodSlab.java index a172fc947..f6dfb6996 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockDreamwoodSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockDreamwoodSlab.java @@ -2,6 +2,7 @@ package vazkii.botania.common.block.decor.slabs.living; import net.minecraft.block.BlockSlab; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; public class BlockDreamwoodSlab extends BlockLivingSlab { @@ -13,12 +14,12 @@ public class BlockDreamwoodSlab extends BlockLivingSlab { @Override public BlockSlab getFullBlock() { - return (BlockSlab) ModBlocks.dreamwoodPlankSlabFull; + return (BlockSlab) ModFluffBlocks.dreamwoodPlankSlabFull; } @Override public BlockSlab getSingleBlock() { - return (BlockSlab) ModBlocks.dreamwoodPlankSlab; + return (BlockSlab) ModFluffBlocks.dreamwoodPlankSlab; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockBrickSlab.java index fe422490b..f4cc7b46b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockBrickSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockBrickSlab.java @@ -2,6 +2,7 @@ package vazkii.botania.common.block.decor.slabs.living; import net.minecraft.block.BlockSlab; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; public class BlockLivingrockBrickSlab extends BlockLivingSlab { @@ -15,12 +16,12 @@ public class BlockLivingrockBrickSlab extends BlockLivingSlab { @Override public BlockSlab getFullBlock() { - return (BlockSlab) ModBlocks.livingrockBrickSlabFull; + return (BlockSlab) ModFluffBlocks.livingrockBrickSlabFull; } @Override public BlockSlab getSingleBlock() { - return (BlockSlab) ModBlocks.livingrockBrickSlab; + return (BlockSlab) ModFluffBlocks.livingrockBrickSlab; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockSlab.java index 0b6504be8..4866a6712 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockSlab.java @@ -2,6 +2,7 @@ package vazkii.botania.common.block.decor.slabs.living; import net.minecraft.block.BlockSlab; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; public class BlockLivingrockSlab extends BlockLivingSlab { @@ -15,12 +16,12 @@ public class BlockLivingrockSlab extends BlockLivingSlab { @Override public BlockSlab getFullBlock() { - return (BlockSlab) ModBlocks.livingrockSlabFull; + return (BlockSlab) ModFluffBlocks.livingrockSlabFull; } @Override public BlockSlab getSingleBlock() { - return (BlockSlab) ModBlocks.livingrockSlab; + return (BlockSlab) ModFluffBlocks.livingrockSlab; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingwoodPlankSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingwoodPlankSlab.java index d7a9ca6d8..4ecc38374 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingwoodPlankSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingwoodPlankSlab.java @@ -2,6 +2,7 @@ package vazkii.botania.common.block.decor.slabs.living; import net.minecraft.block.BlockSlab; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; public class BlockLivingwoodPlankSlab extends BlockLivingSlab { @@ -13,12 +14,12 @@ public class BlockLivingwoodPlankSlab extends BlockLivingSlab { @Override public BlockSlab getFullBlock() { - return (BlockSlab) ModBlocks.livingwoodPlankSlabFull; + return (BlockSlab) ModFluffBlocks.livingwoodPlankSlabFull; } @Override public BlockSlab getSingleBlock() { - return (BlockSlab) ModBlocks.livingwoodPlankSlab; + return (BlockSlab) ModFluffBlocks.livingwoodPlankSlab; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingwoodSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingwoodSlab.java index 8ef145935..53ea9e745 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingwoodSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingwoodSlab.java @@ -2,6 +2,7 @@ package vazkii.botania.common.block.decor.slabs.living; import net.minecraft.block.BlockSlab; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; public class BlockLivingwoodSlab extends BlockLivingSlab { @@ -13,12 +14,12 @@ public class BlockLivingwoodSlab extends BlockLivingSlab { @Override public BlockSlab getFullBlock() { - return (BlockSlab) ModBlocks.livingwoodSlabFull; + return (BlockSlab) ModFluffBlocks.livingwoodSlabFull; } @Override public BlockSlab getSingleBlock() { - return (BlockSlab) ModBlocks.livingwoodSlab; + return (BlockSlab) ModFluffBlocks.livingwoodSlab; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java index 4507c082b..4d11d827e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java @@ -1,7 +1,7 @@ package vazkii.botania.common.block.decor.slabs.prismarine; import net.minecraft.block.BlockSlab; -import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; public class BlockDarkPrismarineSlab extends BlockPrismarineSlab { @@ -11,12 +11,12 @@ public class BlockDarkPrismarineSlab extends BlockPrismarineSlab { @Override public BlockSlab getFullBlock() { - return (BlockSlab) ModBlocks.darkPrismarineSlabFull; + return (BlockSlab) ModFluffBlocks.darkPrismarineSlabFull; } @Override public BlockSlab getSingleBlock() { - return (BlockSlab) ModBlocks.darkPrismarineSlab; + return (BlockSlab) ModFluffBlocks.darkPrismarineSlab; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineBrickSlab.java index fbc2989cb..9b7f5fa7a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineBrickSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineBrickSlab.java @@ -1,7 +1,7 @@ package vazkii.botania.common.block.decor.slabs.prismarine; import net.minecraft.block.BlockSlab; -import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; public class BlockPrismarineBrickSlab extends BlockPrismarineSlab { @@ -11,12 +11,12 @@ public class BlockPrismarineBrickSlab extends BlockPrismarineSlab { @Override public BlockSlab getFullBlock() { - return (BlockSlab) ModBlocks.prismarineBrickSlabFull; + return (BlockSlab) ModFluffBlocks.prismarineBrickSlabFull; } @Override public BlockSlab getSingleBlock() { - return (BlockSlab) ModBlocks.prismarineBrickSlab; + return (BlockSlab) ModFluffBlocks.prismarineBrickSlab; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java index 72832c488..b9e385f03 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; import vazkii.botania.common.lexicon.LexiconData; @@ -24,12 +25,12 @@ public class BlockPrismarineSlab extends BlockLivingSlab { @Override public BlockSlab getFullBlock() { - return (BlockSlab) ModBlocks.prismarineSlabFull; + return (BlockSlab) ModFluffBlocks.prismarineSlabFull; } @Override public BlockSlab getSingleBlock() { - return (BlockSlab) ModBlocks.prismarineSlab; + return (BlockSlab) ModFluffBlocks.prismarineSlab; } @Override diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index f4fd467bd..51ba055b8 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -20,6 +20,7 @@ import net.minecraft.item.ItemStack; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; @@ -137,65 +138,65 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.prismarine); addBlock(ModBlocks.seaLamp); - addBlock(ModBlocks.prismarineStairs); - addBlock(ModBlocks.prismarineSlab); - addBlock(ModBlocks.prismarineBrickStairs); - addBlock(ModBlocks.prismarineBrickSlab); - addBlock(ModBlocks.darkPrismarineStairs); - addBlock(ModBlocks.darkPrismarineSlab); + addBlock(ModFluffBlocks.prismarineStairs); + addBlock(ModFluffBlocks.prismarineSlab); + addBlock(ModFluffBlocks.prismarineBrickStairs); + addBlock(ModFluffBlocks.prismarineBrickSlab); + addBlock(ModFluffBlocks.darkPrismarineStairs); + addBlock(ModFluffBlocks.darkPrismarineSlab); addBlock(ModBlocks.reedBlock); - addBlock(ModBlocks.reedStairs); - addBlock(ModBlocks.reedSlab); + addBlock(ModFluffBlocks.reedStairs); + addBlock(ModFluffBlocks.reedSlab); addBlock(ModBlocks.thatch); - addBlock(ModBlocks.thatchStairs); - addBlock(ModBlocks.thatchSlab); + addBlock(ModFluffBlocks.thatchStairs); + addBlock(ModFluffBlocks.thatchSlab); addBlock(ModBlocks.customBrick); - addBlock(ModBlocks.netherBrickStairs); - addBlock(ModBlocks.netherBrickSlab); - addBlock(ModBlocks.soulBrickStairs); - addBlock(ModBlocks.soulBrickSlab); - addBlock(ModBlocks.snowBrickStairs); - addBlock(ModBlocks.snowBrickSlab); - addBlock(ModBlocks.tileStairs); - addBlock(ModBlocks.tileSlab); + addBlock(ModFluffBlocks.netherBrickStairs); + addBlock(ModFluffBlocks.netherBrickSlab); + addBlock(ModFluffBlocks.soulBrickStairs); + addBlock(ModFluffBlocks.soulBrickSlab); + addBlock(ModFluffBlocks.snowBrickStairs); + addBlock(ModFluffBlocks.snowBrickSlab); + addBlock(ModFluffBlocks.tileStairs); + addBlock(ModFluffBlocks.tileSlab); - addBlock(ModBlocks.livingwoodStairs); - addBlock(ModBlocks.livingwoodSlab); - addBlock(ModBlocks.livingwoodPlankStairs); - addBlock(ModBlocks.livingwoodPlankSlab); - addBlock(ModBlocks.livingrockStairs); - addBlock(ModBlocks.livingrockSlab); - addBlock(ModBlocks.livingrockBrickStairs); - addBlock(ModBlocks.livingrockBrickSlab); - addBlock(ModBlocks.dreamwoodStairs); - addBlock(ModBlocks.dreamwoodSlab); - addBlock(ModBlocks.dreamwoodPlankStairs); - addBlock(ModBlocks.dreamwoodPlankSlab); + addBlock(ModFluffBlocks.livingwoodStairs); + addBlock(ModFluffBlocks.livingwoodSlab); + addBlock(ModFluffBlocks.livingwoodPlankStairs); + addBlock(ModFluffBlocks.livingwoodPlankSlab); + addBlock(ModFluffBlocks.livingrockStairs); + addBlock(ModFluffBlocks.livingrockSlab); + addBlock(ModFluffBlocks.livingrockBrickStairs); + addBlock(ModFluffBlocks.livingrockBrickSlab); + addBlock(ModFluffBlocks.dreamwoodStairs); + addBlock(ModFluffBlocks.dreamwoodSlab); + addBlock(ModFluffBlocks.dreamwoodPlankStairs); + addBlock(ModFluffBlocks.dreamwoodPlankSlab); addItem(ModItems.quartz); if(ConfigHandler.darkQuartzEnabled) { - addBlock(ModBlocks.darkQuartz); - addBlock(ModBlocks.darkQuartzSlab); - addBlock(ModBlocks.darkQuartzStairs); + addBlock(ModFluffBlocks.darkQuartz); + addBlock(ModFluffBlocks.darkQuartzSlab); + addBlock(ModFluffBlocks.darkQuartzStairs); } - addBlock(ModBlocks.manaQuartz); - addBlock(ModBlocks.manaQuartzSlab); - addBlock(ModBlocks.manaQuartzStairs); - addBlock(ModBlocks.blazeQuartz); - addBlock(ModBlocks.blazeQuartzSlab); - addBlock(ModBlocks.blazeQuartzStairs); - addBlock(ModBlocks.lavenderQuartz); - addBlock(ModBlocks.lavenderQuartzSlab); - addBlock(ModBlocks.lavenderQuartzStairs); - addBlock(ModBlocks.redQuartz); - addBlock(ModBlocks.redQuartzSlab); - addBlock(ModBlocks.redQuartzStairs); - addBlock(ModBlocks.elfQuartz); - addBlock(ModBlocks.elfQuartzSlab); - addBlock(ModBlocks.elfQuartzStairs); + addBlock(ModFluffBlocks.manaQuartz); + addBlock(ModFluffBlocks.manaQuartzSlab); + addBlock(ModFluffBlocks.manaQuartzStairs); + addBlock(ModFluffBlocks.blazeQuartz); + addBlock(ModFluffBlocks.blazeQuartzSlab); + addBlock(ModFluffBlocks.blazeQuartzStairs); + addBlock(ModFluffBlocks.lavenderQuartz); + addBlock(ModFluffBlocks.lavenderQuartzSlab); + addBlock(ModFluffBlocks.lavenderQuartzStairs); + addBlock(ModFluffBlocks.redQuartz); + addBlock(ModFluffBlocks.redQuartzSlab); + addBlock(ModFluffBlocks.redQuartzStairs); + addBlock(ModFluffBlocks.elfQuartz); + addBlock(ModFluffBlocks.elfQuartzSlab); + addBlock(ModFluffBlocks.elfQuartzStairs); addItem(ModItems.glassPick); addItem(ModItems.manasteelPick); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index edd5b8e18..5173a2976 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -25,8 +25,8 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.item.ItemLens; import vazkii.botania.common.item.ItemSignalFlare; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; @@ -765,9 +765,9 @@ public final class ModCraftingRecipes { // Quartz Recipes if(ConfigHandler.darkQuartzEnabled) - recipeDarkQuartz = addQuartzRecipes(0, Items.coal, ModBlocks.darkQuartz, ModBlocks.darkQuartzStairs, ModBlocks.darkQuartzSlab); - addQuartzRecipes(1, null, ModBlocks.manaQuartz, ModBlocks.manaQuartzStairs, ModBlocks.manaQuartzSlab); - recipeBlazeQuartz = addQuartzRecipes(2, Items.blaze_powder, ModBlocks.blazeQuartz, ModBlocks.blazeQuartzStairs, ModBlocks.blazeQuartzSlab); + recipeDarkQuartz = addQuartzRecipes(0, Items.coal, ModFluffBlocks.darkQuartz, ModFluffBlocks.darkQuartzStairs, ModFluffBlocks.darkQuartzSlab); + addQuartzRecipes(1, null, ModFluffBlocks.manaQuartz, ModFluffBlocks.manaQuartzStairs, ModFluffBlocks.manaQuartzSlab); + recipeBlazeQuartz = addQuartzRecipes(2, Items.blaze_powder, ModFluffBlocks.blazeQuartz, ModFluffBlocks.blazeQuartzStairs, ModFluffBlocks.blazeQuartzSlab); GameRegistry.addRecipe(new ItemStack(ModItems.quartz, 8, 3), "QQQ", "QCQ", "QQQ", @@ -786,10 +786,10 @@ public final class ModCraftingRecipes { 'Q', Items.quartz, 'C', new ItemStack(Blocks.double_plant, 1, 5)); recipesLavenderQuartz = BotaniaAPI.getLatestAddedRecipes(4); - addQuartzRecipes(3, null, ModBlocks.lavenderQuartz, ModBlocks.lavenderQuartzStairs, ModBlocks.lavenderQuartzSlab); + addQuartzRecipes(3, null, ModFluffBlocks.lavenderQuartz, ModFluffBlocks.lavenderQuartzStairs, ModFluffBlocks.lavenderQuartzSlab); - recipeRedQuartz = addQuartzRecipes(4, Items.redstone, ModBlocks.redQuartz, ModBlocks.redQuartzStairs, ModBlocks.redQuartzSlab); - addQuartzRecipes(5, null, ModBlocks.elfQuartz, ModBlocks.elfQuartzStairs, ModBlocks.elfQuartzSlab); + recipeRedQuartz = addQuartzRecipes(4, Items.redstone, ModFluffBlocks.redQuartz, ModFluffBlocks.redQuartzStairs, ModFluffBlocks.redQuartzSlab); + addQuartzRecipes(5, null, ModFluffBlocks.elfQuartz, ModFluffBlocks.elfQuartzStairs, ModFluffBlocks.elfQuartzSlab); // Alfheim Portal Recipe addOreDictRecipe(new ItemStack(ModBlocks.alfPortal), @@ -1417,21 +1417,21 @@ public final class ModCraftingRecipes { } // Slab & Stair Recipes - addStairsAndSlabs(ModBlocks.livingwood, 0, ModBlocks.livingwoodStairs, ModBlocks.livingwoodSlab); - addStairsAndSlabs(ModBlocks.livingwood, 1, ModBlocks.livingwoodPlankStairs, ModBlocks.livingwoodPlankSlab); - addStairsAndSlabs(ModBlocks.livingrock, 0, ModBlocks.livingrockStairs, ModBlocks.livingrockSlab); - addStairsAndSlabs(ModBlocks.livingrock, 1, ModBlocks.livingrockBrickStairs, ModBlocks.livingrockBrickSlab); - addStairsAndSlabs(ModBlocks.dreamwood, 0, ModBlocks.dreamwoodStairs, ModBlocks.dreamwoodSlab); - addStairsAndSlabs(ModBlocks.dreamwood, 1, ModBlocks.dreamwoodPlankStairs, ModBlocks.dreamwoodPlankSlab); - addStairsAndSlabs(ModBlocks.prismarine, 0, ModBlocks.prismarineStairs, ModBlocks.prismarineSlab); - addStairsAndSlabs(ModBlocks.prismarine, 1, ModBlocks.prismarineBrickStairs, ModBlocks.prismarineBrickSlab); - addStairsAndSlabs(ModBlocks.prismarine, 2, ModBlocks.darkPrismarineStairs, ModBlocks.darkPrismarineSlab); - addStairsAndSlabs(ModBlocks.reedBlock, 0, ModBlocks.reedStairs, ModBlocks.reedSlab); - addStairsAndSlabs(ModBlocks.thatch, 0, ModBlocks.thatchStairs, ModBlocks.thatchSlab); - addStairsAndSlabs(ModBlocks.customBrick, 0, ModBlocks.netherBrickStairs, ModBlocks.netherBrickSlab); - addStairsAndSlabs(ModBlocks.customBrick, 1, ModBlocks.soulBrickStairs, ModBlocks.soulBrickSlab); - addStairsAndSlabs(ModBlocks.customBrick, 2, ModBlocks.snowBrickStairs, ModBlocks.snowBrickSlab); - addStairsAndSlabs(ModBlocks.customBrick, 3, ModBlocks.tileStairs, ModBlocks.tileSlab); + addStairsAndSlabs(ModBlocks.livingwood, 0, ModFluffBlocks.livingwoodStairs, ModFluffBlocks.livingwoodSlab); + addStairsAndSlabs(ModBlocks.livingwood, 1, ModFluffBlocks.livingwoodPlankStairs, ModFluffBlocks.livingwoodPlankSlab); + addStairsAndSlabs(ModBlocks.livingrock, 0, ModFluffBlocks.livingrockStairs, ModFluffBlocks.livingrockSlab); + addStairsAndSlabs(ModBlocks.livingrock, 1, ModFluffBlocks.livingrockBrickStairs, ModFluffBlocks.livingrockBrickSlab); + addStairsAndSlabs(ModBlocks.dreamwood, 0, ModFluffBlocks.dreamwoodStairs, ModFluffBlocks.dreamwoodSlab); + addStairsAndSlabs(ModBlocks.dreamwood, 1, ModFluffBlocks.dreamwoodPlankStairs, ModFluffBlocks.dreamwoodPlankSlab); + addStairsAndSlabs(ModBlocks.prismarine, 0, ModFluffBlocks.prismarineStairs, ModFluffBlocks.prismarineSlab); + addStairsAndSlabs(ModBlocks.prismarine, 1, ModFluffBlocks.prismarineBrickStairs, ModFluffBlocks.prismarineBrickSlab); + addStairsAndSlabs(ModBlocks.prismarine, 2, ModFluffBlocks.darkPrismarineStairs, ModFluffBlocks.darkPrismarineSlab); + addStairsAndSlabs(ModBlocks.reedBlock, 0, ModFluffBlocks.reedStairs, ModFluffBlocks.reedSlab); + addStairsAndSlabs(ModBlocks.thatch, 0, ModFluffBlocks.thatchStairs, ModFluffBlocks.thatchSlab); + addStairsAndSlabs(ModBlocks.customBrick, 0, ModFluffBlocks.netherBrickStairs, ModFluffBlocks.netherBrickSlab); + addStairsAndSlabs(ModBlocks.customBrick, 1, ModFluffBlocks.soulBrickStairs, ModFluffBlocks.soulBrickSlab); + addStairsAndSlabs(ModBlocks.customBrick, 2, ModFluffBlocks.snowBrickStairs, ModFluffBlocks.snowBrickSlab); + addStairsAndSlabs(ModBlocks.customBrick, 3, ModFluffBlocks.tileStairs, ModFluffBlocks.tileSlab); // Misc Recipes GameRegistry.addShapelessRecipe(new ItemStack(Items.reeds, 9, 0), new ItemStack(ModBlocks.reedBlock)); diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java index 6c522ed7a..fb3392e91 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -20,7 +20,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeManaInfusion; -import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; @@ -69,12 +69,12 @@ public final class ModManaAlchemyRecipes { quartzRecipes = new ArrayList(); quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.quartz, 4), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE), 25)); if(ConfigHandler.darkQuartzEnabled) - quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 0), new ItemStack(ModBlocks.darkQuartz, 1, Short.MAX_VALUE), 25)); - quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 1), new ItemStack(ModBlocks.manaQuartz, 1, Short.MAX_VALUE), 25)); - quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 2), new ItemStack(ModBlocks.blazeQuartz, 1, Short.MAX_VALUE), 25)); - quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 3), new ItemStack(ModBlocks.lavenderQuartz, 1, Short.MAX_VALUE), 25)); - quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 4), new ItemStack(ModBlocks.redQuartz, 1, Short.MAX_VALUE), 25)); - quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 5), new ItemStack(ModBlocks.elfQuartz, 1, Short.MAX_VALUE), 25)); + quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 0), new ItemStack(ModFluffBlocks.darkQuartz, 1, Short.MAX_VALUE), 25)); + quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 1), new ItemStack(ModFluffBlocks.manaQuartz, 1, Short.MAX_VALUE), 25)); + quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 2), new ItemStack(ModFluffBlocks.blazeQuartz, 1, Short.MAX_VALUE), 25)); + quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 3), new ItemStack(ModFluffBlocks.lavenderQuartz, 1, Short.MAX_VALUE), 25)); + quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 4), new ItemStack(ModFluffBlocks.redQuartz, 1, Short.MAX_VALUE), 25)); + quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 5), new ItemStack(ModFluffBlocks.elfQuartz, 1, Short.MAX_VALUE), 25)); chiseledBrickRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.stonebrick, 1, 3), new ItemStack(Blocks.stonebrick), 150); iceRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.ice), new ItemStack(Blocks.snow), 2250);