From 2925f0814d4bc47c589108ec97083ff243ca4f70 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sat, 18 Jul 2015 22:58:10 +0100 Subject: [PATCH] Added Walls to some botania blocks. About time! --- .../botania/common/block/ModFluffBlocks.java | 39 +++++++--- .../block/decor/walls/Block18StoneWall.java | 34 +++++++++ .../decor/walls/BlockBiomeStoneWall.java | 42 +++++++++++ .../block/decor/walls/BlockModWall.java | 72 +++++++++++++++++++ .../decor/walls/BlockPrismarineWall.java | 35 +++++++++ .../block/decor/walls/BlockReedWall.java | 24 +++++++ .../block/decor/walls/BlockVariantWall.java | 58 +++++++++++++++ .../walls/living/BlockDreamwoodWall.java | 25 +++++++ .../walls/living/BlockLivingrockWall.java | 26 +++++++ .../walls/living/BlockLivingwoodWall.java | 25 +++++++ .../common/core/BotaniaCreativeTab.java | 9 ++- .../common/crafting/ModCraftingRecipes.java | 17 +++++ .../resources/assets/botania/lang/en_US.lang | 17 +++++ 13 files changed, 413 insertions(+), 10 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java create mode 100644 src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java create mode 100644 src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java create mode 100644 src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java create mode 100644 src/main/java/vazkii/botania/common/block/decor/walls/BlockReedWall.java create mode 100644 src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java create mode 100644 src/main/java/vazkii/botania/common/block/decor/walls/living/BlockDreamwoodWall.java create mode 100644 src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingrockWall.java create mode 100644 src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingwoodWall.java diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 3bcea555a..8981c5303 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -57,6 +57,13 @@ 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.block.decor.walls.Block18StoneWall; +import vazkii.botania.common.block.decor.walls.BlockBiomeStoneWall; +import vazkii.botania.common.block.decor.walls.BlockPrismarineWall; +import vazkii.botania.common.block.decor.walls.BlockReedWall; +import vazkii.botania.common.block.decor.walls.living.BlockDreamwoodWall; +import vazkii.botania.common.block.decor.walls.living.BlockLivingrockWall; +import vazkii.botania.common.block.decor.walls.living.BlockLivingwoodWall; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibBlockNames; @@ -65,18 +72,21 @@ public final class ModFluffBlocks { public static Block livingwoodStairs; public static Block livingwoodSlab; public static Block livingwoodSlabFull; + public static Block livingwoodWall; 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 livingrockWall; 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 dreamwoodWall; public static Block dreamwoodPlankStairs; public static Block dreamwoodPlankSlab; public static Block dreamwoodPlankSlabFull; @@ -84,6 +94,7 @@ public final class ModFluffBlocks { public static Block prismarineStairs; public static Block prismarineSlab; public static Block prismarineSlabFull; + public static Block prismarineWall; public static Block prismarineBrickStairs; public static Block prismarineBrickSlab; public static Block prismarineBrickSlabFull; @@ -94,6 +105,7 @@ public final class ModFluffBlocks { public static Block reedStairs; public static Block reedSlab; public static Block reedSlabFull; + public static Block reedWall; public static Block thatchStairs; public static Block thatchSlab; public static Block thatchSlabFull; @@ -150,11 +162,13 @@ public final class ModFluffBlocks { public static Block[] biomeStoneStairs = new Block[24]; public static Block[] biomeStoneSlabs = new Block[24]; public static Block[] biomeStoneFullSlabs = new Block[24]; - + public static Block biomeStoneWall; + public static Block[] stoneStairs = new Block[8]; public static Block[] stoneSlabs = new Block[8]; public static Block[] stoneFullSlabs = new Block[8]; - + public static Block stoneWall; + public static Block endStoneSlab; public static Block endStoneSlabFull; public static Block endStoneStairs; @@ -166,32 +180,29 @@ public final class ModFluffBlocks { livingwoodStairs = new BlockLivingwoodStairs(); livingwoodSlab = new BlockLivingwoodSlab(false); livingwoodSlabFull = new BlockLivingwoodSlab(true); + livingwoodWall = new BlockLivingwoodWall(); livingwoodPlankStairs = new BlockLivingwoodPlankStairs(); livingwoodPlankSlab = new BlockLivingwoodPlankSlab(false); livingwoodPlankSlabFull = new BlockLivingwoodPlankSlab(true); livingrockStairs = new BlockLivingrockStairs(); livingrockSlab = new BlockLivingrockSlab(false); livingrockSlabFull = new BlockLivingrockSlab(true); + livingrockWall = new BlockLivingrockWall(); livingrockBrickStairs = new BlockLivingrockBrickStairs(); livingrockBrickSlab = new BlockLivingrockBrickSlab(false); livingrockBrickSlabFull = new BlockLivingrockBrickSlab(true); dreamwoodStairs = new BlockDreamwoodStairs(); dreamwoodSlab = new BlockDreamwoodSlab(false); dreamwoodSlabFull = new BlockDreamwoodSlab(true); + dreamwoodWall = new BlockDreamwoodWall(); 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); + prismarineWall = new BlockPrismarineWall(); prismarineBrickStairs = new BlockPrismarineBrickStairs(); prismarineBrickSlab = new BlockPrismarineBrickSlab(false); prismarineBrickSlabFull = new BlockPrismarineBrickSlab(true); @@ -199,6 +210,14 @@ public final class ModFluffBlocks { darkPrismarineSlab = new BlockDarkPrismarineSlab(false); darkPrismarineSlabFull = new BlockDarkPrismarineSlab(true); + reedStairs = new BlockReedStairs(); + reedSlab = new BlockReedSlab(false); + reedSlabFull = new BlockReedSlab(true); + reedWall = new BlockReedWall(); + thatchStairs = new BlockThatchStairs(); + thatchSlab = new BlockThatchSlab(false); + thatchSlabFull = new BlockThatchSlab(true); + netherBrickStairs = new BlockCustomBrickStairs(); netherBrickSlab = new BlockCustomBrickSlab(false); netherBrickSlabFull = new BlockCustomBrickSlab(true); @@ -258,6 +277,7 @@ public final class ModFluffBlocks { biomeStoneSlabs[i] = new BlockBiomeStoneSlab(false, block, meta, i); biomeStoneFullSlabs[i] = new BlockBiomeStoneSlab(true, block, meta, i); } + biomeStoneWall = new BlockBiomeStoneWall(); for(int i = 0; i < 8; i++) { int meta = i > 3 ? i + 4 : i; @@ -265,6 +285,7 @@ public final class ModFluffBlocks { stoneSlabs[i] = new Block18StoneSlab(false, meta, i); stoneFullSlabs[i] = new Block18StoneSlab(true, meta, i); } + stoneWall = new Block18StoneWall(); endStoneSlab = new BlockEndStoneSlab(false); endStoneSlabFull = new BlockEndStoneSlab(true); diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java new file mode 100644 index 000000000..30153948c --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java @@ -0,0 +1,34 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Jul 18, 2015, 8:41:10 PM (GMT)] + */ +package vazkii.botania.common.block.decor.walls; + +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.block.ModFluffBlocks; +import vazkii.botania.common.lexicon.LexiconData; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class Block18StoneWall extends BlockVariantWall { + + public Block18StoneWall() { + super(ModFluffBlocks.stone, 4); + setHardness(1.5F); + setResistance(10F); + } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.stoneAlchemy; + } + +} diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java new file mode 100644 index 000000000..561e5b7f7 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -0,0 +1,42 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Jul 18, 2015, 8:31:47 PM (GMT)] + */ +package vazkii.botania.common.block.decor.walls; + +import java.util.List; + +import cpw.mods.fml.common.registry.GameRegistry; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.block.ModFluffBlocks; +import vazkii.botania.common.item.block.ItemBlockMod; +import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; +import vazkii.botania.common.lexicon.LexiconData; +import net.minecraft.block.Block; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +public class BlockBiomeStoneWall extends BlockVariantWall { + + public BlockBiomeStoneWall() { + super(ModFluffBlocks.biomeStoneA, 8, 8); + setHardness(1.5F); + setResistance(10F); + } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.marimorphosis; + } + +} diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java new file mode 100644 index 000000000..e0666b652 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -0,0 +1,72 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Jul 18, 2015, 8:15:36 PM (GMT)] + */ +package vazkii.botania.common.block.decor.walls; + +import java.util.List; + +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.item.block.ItemBlockMod; +import vazkii.botania.common.lexicon.LexiconData; +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.block.Block; +import net.minecraft.block.BlockWall; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +public class BlockModWall extends BlockWall implements ILexiconable { + + Block block; + int meta; + + public BlockModWall(Block block, int meta) { + super(block); + this.block = block; + this.meta = meta; + setBlockName(block.getUnlocalizedName().replaceAll("tile.", "") + meta + "Wall"); + } + + @Override + public Block setBlockName(String par1Str) { + register(par1Str); + return super.setBlockName(par1Str); + } + + public void register(String name) { + GameRegistry.registerBlock(this, ItemBlockMod.class, name); + } + + @Override + public void getSubBlocks(Item item, CreativeTabs tabs, List list) { + list.add(new ItemStack(item)); + } + + @Override + public IIcon getIcon(int side, int meta) { + return block.getIcon(side, this.meta); + } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.decorativeBlocks; + } + + @Override + public void registerBlockIcons(IIconRegister p_149651_1_) { + // NO-OP + } + +} diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java new file mode 100644 index 000000000..65ee2b993 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java @@ -0,0 +1,35 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Jul 18, 2015, 8:30:00 PM (GMT)] + */ +package vazkii.botania.common.block.decor.walls; + +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.lexicon.LexiconData; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class BlockPrismarineWall extends BlockModWall { + + public BlockPrismarineWall() { + super(ModBlocks.prismarine, 0); + setHardness(2.0F); + setResistance(10.0F); + setStepSound(soundTypeStone); + } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.prismarine; + } + +} diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockReedWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockReedWall.java new file mode 100644 index 000000000..5ac4891a1 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockReedWall.java @@ -0,0 +1,24 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Jul 18, 2015, 8:31:04 PM (GMT)] + */ +package vazkii.botania.common.block.decor.walls; + +import vazkii.botania.common.block.ModBlocks; +import net.minecraft.block.Block; + +public class BlockReedWall extends BlockModWall { + + public BlockReedWall() { + super(ModBlocks.reedBlock, 0); + setHardness(1.0F); + setStepSound(soundTypeWood); + } + +} diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java new file mode 100644 index 000000000..45bc2f59e --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java @@ -0,0 +1,58 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Jul 18, 2015, 8:42:16 PM (GMT)] + */ +package vazkii.botania.common.block.decor.walls; + +import java.util.List; + +import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; + +public class BlockVariantWall extends BlockModWall { + + int metaStates; + int metaShift; + + public BlockVariantWall(Block block, int metaStates, int metaShift) { + super(block, 0); + this.metaStates = metaStates; + this.metaShift = metaShift; + } + + public BlockVariantWall(Block block, int metaStates) { + this(block, metaStates, 0); + } + + @Override + public void register(String name) { + GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); + } + + @Override + public void getSubBlocks(Item item, CreativeTabs tabs, List list) { + for(int i = 0; i < metaStates; i++) + list.add(new ItemStack(item, 1, i)); + } + + @Override + public IIcon getIcon(int side, int meta) { + return block.getIcon(side, meta + metaShift); + } + + +} diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockDreamwoodWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockDreamwoodWall.java new file mode 100644 index 000000000..4827c48a3 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockDreamwoodWall.java @@ -0,0 +1,25 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Jul 18, 2015, 8:29:16 PM (GMT)] + */ +package vazkii.botania.common.block.decor.walls.living; + +import net.minecraft.block.Block; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.decor.walls.BlockModWall; + +public class BlockDreamwoodWall extends BlockModWall { + + public BlockDreamwoodWall() { + super(ModBlocks.dreamwood, 0); + setHardness(2.0F); + setStepSound(soundTypeWood); + } + +} diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingrockWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingrockWall.java new file mode 100644 index 000000000..85f1fa230 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingrockWall.java @@ -0,0 +1,26 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Jul 18, 2015, 8:25:54 PM (GMT)] + */ +package vazkii.botania.common.block.decor.walls.living; + +import net.minecraft.block.Block; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.decor.walls.BlockModWall; + +public class BlockLivingrockWall extends BlockModWall { + + public BlockLivingrockWall() { + super(ModBlocks.livingrock, 0); + setHardness(2.0F); + setResistance(10.0F); + setStepSound(soundTypeStone); + } + +} diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingwoodWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingwoodWall.java new file mode 100644 index 000000000..bcf52cfe7 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingwoodWall.java @@ -0,0 +1,25 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Jul 18, 2015, 8:28:06 PM (GMT)] + */ +package vazkii.botania.common.block.decor.walls.living; + +import net.minecraft.block.Block; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.decor.walls.BlockModWall; + +public class BlockLivingwoodWall extends BlockModWall { + + public BlockLivingwoodWall() { + super(ModBlocks.livingwood, 0); + setHardness(2.0F); + setStepSound(soundTypeWood); + } + +} diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 8768af5b0..c96971083 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -276,6 +276,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.seaLamp); addBlock(ModFluffBlocks.prismarineStairs); addBlock(ModFluffBlocks.prismarineSlab); + addBlock(ModFluffBlocks.prismarineWall); addBlock(ModFluffBlocks.prismarineBrickStairs); addBlock(ModFluffBlocks.prismarineBrickSlab); addBlock(ModFluffBlocks.darkPrismarineStairs); @@ -286,6 +287,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.reedBlock); addBlock(ModFluffBlocks.reedStairs); addBlock(ModFluffBlocks.reedSlab); + addBlock(ModFluffBlocks.reedWall); addBlock(ModBlocks.thatch); addBlock(ModFluffBlocks.thatchStairs); addBlock(ModFluffBlocks.thatchSlab); @@ -302,14 +304,17 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModFluffBlocks.livingwoodStairs); addBlock(ModFluffBlocks.livingwoodSlab); + addBlock(ModFluffBlocks.livingwoodWall); addBlock(ModFluffBlocks.livingwoodPlankStairs); addBlock(ModFluffBlocks.livingwoodPlankSlab); addBlock(ModFluffBlocks.livingrockStairs); addBlock(ModFluffBlocks.livingrockSlab); + addBlock(ModFluffBlocks.livingrockWall); addBlock(ModFluffBlocks.livingrockBrickStairs); addBlock(ModFluffBlocks.livingrockBrickSlab); addBlock(ModFluffBlocks.dreamwoodStairs); addBlock(ModFluffBlocks.dreamwoodSlab); + addBlock(ModFluffBlocks.dreamwoodWall); addBlock(ModFluffBlocks.dreamwoodPlankStairs); addBlock(ModFluffBlocks.dreamwoodPlankSlab); @@ -346,6 +351,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { for(int i= 0; i < 8; i++) addBlock(ModFluffBlocks.stoneSlabs[i]); } + addBlock(ModFluffBlocks.stoneWall); addBlock(ModFluffBlocks.biomeStoneA); addBlock(ModFluffBlocks.biomeStoneB); @@ -353,7 +359,8 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModFluffBlocks.biomeStoneStairs[i]); for(int i = 0; i < 24; i++) addBlock(ModFluffBlocks.biomeStoneSlabs[i]); - + addBlock(ModFluffBlocks.biomeStoneWall); + addBlock(ModBlocks.endStoneBrick); addBlock(ModFluffBlocks.endStoneSlab); addBlock(ModFluffBlocks.endStoneStairs); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 6d5877c42..b7d5d89f2 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -1890,6 +1890,17 @@ public final class ModCraftingRecipes { addStairsAndSlabs(ModBlocks.customBrick, 3, ModFluffBlocks.tileStairs, ModFluffBlocks.tileSlab); addStairsAndSlabs(ModBlocks.endStoneBrick, 0, ModFluffBlocks.endStoneStairs, ModFluffBlocks.endStoneSlab); + // Wall Recipes + addWall(ModBlocks.livingrock, 0, ModFluffBlocks.livingrockWall, 0); + addWall(ModBlocks.livingwood, 0, ModFluffBlocks.livingwoodWall, 0); + addWall(ModBlocks.dreamwood, 0, ModFluffBlocks.dreamwoodWall, 0); + addWall(ModBlocks.prismarine, 0, ModFluffBlocks.prismarineWall, 0); + addWall(ModBlocks.reedBlock, 0, ModFluffBlocks.reedWall, 0); + for(int i = 0; i < 8; i++) + addWall(ModFluffBlocks.biomeStoneA, i + 8, ModFluffBlocks.biomeStoneWall, i); + for(int i = 0; i < 4; i++) + addWall(ModFluffBlocks.stone, i, ModFluffBlocks.stoneWall, i); + // Biome Stone Recipes for(int i = 0; i < 8; i++) { GameRegistry.addSmelting(new ItemStack(ModFluffBlocks.biomeStoneA, 1, i + 8), new ItemStack(ModFluffBlocks.biomeStoneA, 1, i), 0.1F); @@ -1960,6 +1971,12 @@ public final class ModCraftingRecipes { "Q ", "QQ ", "QQQ", 'Q', new ItemStack(block, 1, meta)); } + + private static void addWall(Block block, int blockMeta, Block wall, int wallMeta) { + GameRegistry.addRecipe(new ItemStack(wall, 6, wallMeta), + "BBB", "BBB", + 'B', new ItemStack(block, 1, blockMeta)); + } private static IRecipe addQuartzRecipes(int meta, Item req, Block block, Block stairs, Block slab) { GameRegistry.addRecipe(new ItemStack(block), diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index f8596c864..36e951371 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1001,6 +1001,23 @@ tile.botania:cocoon.name=Cocoon of Caprice tile.botania:lightRelay0.name=Luminizer tile.botania:lightRelay1.name=Detector Luminizer tile.botania:lightLauncher.name=Luminizer Launcher +tile.botania:livingrock0Wall.name=Livingrock Wall +tile.botania:livingwood0Wall.name=Livingwood Wall +tile.botania:dreamwood0Wall.name=Dreamwood Wall +tile.botania:prismarine0Wall.name=Prismarine Wall +tile.botania:reedBlock0Wall.name=Reed Block Wall +tile.botania:biomeStoneA0Wall0.name=Metamorphic Forest Cobblestone Wall +tile.botania:biomeStoneA0Wall1.name=Metamorphic Plains Cobblestone Wall +tile.botania:biomeStoneA0Wall2.name=Metamorphic Mountain Cobblestone Wall +tile.botania:biomeStoneA0Wall3.name=Metamorphic Fungal Cobblestone Wall +tile.botania:biomeStoneA0Wall4.name=Metamorphic Swamp Cobblestone Wall +tile.botania:biomeStoneA0Wall5.name=Metamorphic Desert Cobblestone Wall +tile.botania:biomeStoneA0Wall6.name=Metamorphic Taiga Cobblestone Wall +tile.botania:biomeStoneA0Wall7.name=Metamorphic Mesa Cobblestone Wall +tile.botania:stone0Wall0.name=Andesite Wall +tile.botania:stone0Wall1.name=Basalt Wall +tile.botania:stone0Wall2.name=Diorite Wall +tile.botania:stone0Wall3.name=Granite Wall # FLOWER NAMES tile.botania:flower..name=Botania Flower