diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index 6af2131f8..c167a1c8e 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -20,17 +20,26 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.block.decor.BlockCustomBrick; import vazkii.botania.common.block.decor.BlockManaBeacon; import vazkii.botania.common.block.decor.BlockMiniIsland; import vazkii.botania.common.block.decor.BlockPrismarine; +import vazkii.botania.common.block.decor.BlockReeds; import vazkii.botania.common.block.decor.BlockSeaLamp; import vazkii.botania.common.block.decor.BlockShinyFlower; +import vazkii.botania.common.block.decor.BlockThatch; import vazkii.botania.common.block.decor.BlockTinyPotato; import vazkii.botania.common.block.decor.BlockUnstable; 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; @@ -40,6 +49,12 @@ 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; @@ -148,6 +163,9 @@ public final class ModBlocks { public static Block miniIsland; public static Block tinyPotato; public static Block spawnerClaw; + public static Block reedBlock; + public static Block thatch; + public static Block customBrick; public static Block livingwoodStairs; public static Block livingwoodSlab; @@ -178,6 +196,26 @@ public final class ModBlocks { 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; @@ -240,7 +278,10 @@ public final class ModBlocks { miniIsland = new BlockMiniIsland(); tinyPotato = new BlockTinyPotato(); spawnerClaw = new BlockSpawnerClaw(); - + reedBlock = new BlockReeds(); + thatch = new BlockThatch(); + customBrick = new BlockCustomBrick(); + livingwoodStairs = new BlockLivingwoodStairs(); livingwoodSlab = new BlockLivingwoodSlab(false); livingwoodSlabFull = new BlockLivingwoodSlab(true); @@ -260,6 +301,13 @@ public final class ModBlocks { 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); @@ -270,6 +318,19 @@ public final class ModBlocks { 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); @@ -325,6 +386,12 @@ public final class ModBlocks { ((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(); @@ -332,6 +399,15 @@ public final class ModBlocks { ((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(); + for(int i = 0; i < 16; i++) OreDictionary.registerOre(LibOreDict.FLOWER[i], new ItemStack(flower, 1, i)); diff --git a/MODSRC/vazkii/botania/common/block/decor/BlockCustomBrick.java b/MODSRC/vazkii/botania/common/block/decor/BlockCustomBrick.java new file mode 100644 index 000000000..03f463ba0 --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -0,0 +1,93 @@ +/** + * 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 @ [Jul 28, 2014, 9:51:48 PM (GMT)] + */ +package vazkii.botania.common.block.decor; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +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.util.MovingObjectPosition; +import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +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.item.block.ItemBlockWithMetadataAndName; +import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibBlockNames; + +public class BlockCustomBrick extends BlockMod implements ILexiconable { + + private static final int TYPES = 16; + IIcon[] icons; + + public BlockCustomBrick() { + super(Material.rock); + setHardness(2.0F); + setResistance(5.0F); + setStepSound(soundTypeStone); + setBlockName(LibBlockNames.CUSTOM_BRICK); + } + + @Override + protected boolean shouldRegisterInNameSet() { + return false; + } + + @Override + public int damageDropped(int par1) { + return par1; + } + + @Override + public Block setBlockName(String par1Str) { + GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + return super.setBlockName(par1Str); + } + + @Override + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for(int i = 0; i < TYPES; i++) + par3List.add(new ItemStack(par1, 1, i)); + } + + @Override + public void registerBlockIcons(IIconRegister par1IconRegister) { + icons = new IIcon[TYPES]; + for(int i = 0; i < TYPES; i++) + icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + } + + @Override + public IIcon getIcon(int par1, int par2) { + return icons[Math.min(TYPES - 1, par2)]; + } + + @Override + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { + int meta = world.getBlockMetadata(x, y, z); + return new ItemStack(this, 1, meta); + } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.decorativeBlocks; + } + +} diff --git a/MODSRC/vazkii/botania/common/block/decor/BlockReeds.java b/MODSRC/vazkii/botania/common/block/decor/BlockReeds.java new file mode 100644 index 000000000..e95d3c8af --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/decor/BlockReeds.java @@ -0,0 +1,75 @@ +/** + * 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 @ [Jul 28, 2014, 8:02:49 PM (GMT)] + */ +package vazkii.botania.common.block.decor; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.block.BlockRotatedPillar; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +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.core.BotaniaCreativeTab; +import vazkii.botania.common.item.block.ItemBlockMod; +import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibBlockNames; + +public class BlockReeds extends BlockRotatedPillar implements ILexiconable { + + IIcon topIcon; + + public BlockReeds() { + super(Material.wood); + setHardness(1.0F); + setStepSound(soundTypeWood); + setBlockName(LibBlockNames.REED_BLOCK); + setCreativeTab(BotaniaCreativeTab.INSTANCE); + } + + + @Override + public Block setBlockName(String par1Str) { + GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); + return super.setBlockName(par1Str); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister par1IconRegister) { + blockIcon = IconHelper.forBlock(par1IconRegister, this, 0); + topIcon = IconHelper.forBlock(par1IconRegister, this, 1); + } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.decorativeBlocks; + } + + @Override + protected IIcon getSideIcon(int p_150163_1_) { + return blockIcon; + } + + @Override + protected IIcon getTopIcon(int p_150161_1_) { + return topIcon; + } + +} diff --git a/MODSRC/vazkii/botania/common/block/decor/BlockThatch.java b/MODSRC/vazkii/botania/common/block/decor/BlockThatch.java new file mode 100644 index 000000000..9aa50687a --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/decor/BlockThatch.java @@ -0,0 +1,38 @@ +/** + * 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 @ [Jul 28, 2014, 9:07:00 PM (GMT)] + */ +package vazkii.botania.common.block.decor; + +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.block.BlockMod; +import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibBlockNames; + +public class BlockThatch extends BlockMod implements ILexiconable { + + public BlockThatch() { + super(Material.grass); + setHardness(1.0F); + setStepSound(soundTypeGrass); + setBlockName(LibBlockNames.THATCH); + } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.decorativeBlocks; + } + +} diff --git a/MODSRC/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java b/MODSRC/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java new file mode 100644 index 000000000..87f29a03e --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java @@ -0,0 +1,48 @@ +/** + * 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 @ [Jul 28, 2014, 8:49:59 PM (GMT)] + */ +package vazkii.botania.common.block.decor.slabs; + +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibBlockNames; +import net.minecraft.block.Block; +import net.minecraft.block.BlockSlab; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class BlockReedSlab extends BlockLivingSlab { + + public BlockReedSlab(boolean full) { + super(full, ModBlocks.reedBlock, 0); + setHardness(1.0F); + setStepSound(soundTypeWood); + } + + @Override + public BlockSlab getFullBlock() { + return (BlockSlab) ModBlocks.reedSlabFull; + } + + @Override + public BlockSlab getSingleBlock() { + return (BlockSlab) ModBlocks.reedSlab; + } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.decorativeBlocks; + } + + +} diff --git a/MODSRC/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java b/MODSRC/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java new file mode 100644 index 000000000..6a9243b6a --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java @@ -0,0 +1,48 @@ +/** + * 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 @ [Jul 28, 2014, 8:49:59 PM (GMT)] + */ +package vazkii.botania.common.block.decor.slabs; + +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibBlockNames; +import net.minecraft.block.Block; +import net.minecraft.block.BlockSlab; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class BlockThatchSlab extends BlockLivingSlab { + + public BlockThatchSlab(boolean full) { + super(full, ModBlocks.thatch, 0); + setHardness(1.0F); + setStepSound(soundTypeGrass); + } + + @Override + public BlockSlab getFullBlock() { + return (BlockSlab) ModBlocks.thatchSlabFull; + } + + @Override + public BlockSlab getSingleBlock() { + return (BlockSlab) ModBlocks.thatchSlab; + } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.decorativeBlocks; + } + + +} diff --git a/MODSRC/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java b/MODSRC/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java new file mode 100644 index 000000000..dd8f0c4b3 --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java @@ -0,0 +1,51 @@ +/** + * 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 @ [Jul 28, 2014, 10:15:41 PM (GMT)] + */ +package vazkii.botania.common.block.decor.slabs.bricks; + +import net.minecraft.block.BlockSlab; +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.decor.slabs.BlockLivingSlab; +import vazkii.botania.common.lexicon.LexiconData; + +public class BlockCustomBrickSlab extends BlockLivingSlab { + + public BlockCustomBrickSlab(boolean full) { + this(full, 0); + } + + public BlockCustomBrickSlab(boolean full, int meta) { + super(full, ModBlocks.customBrick, meta); + setHardness(2.0F); + setResistance(5.0F); + setStepSound(soundTypeStone); + } + + @Override + public BlockSlab getFullBlock() { + return (BlockSlab) ModBlocks.netherBrickSlabFull; + } + + @Override + public BlockSlab getSingleBlock() { + return (BlockSlab) ModBlocks.netherBrickSlab; + } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.decorativeBlocks; + } + +} \ No newline at end of file diff --git a/MODSRC/vazkii/botania/common/block/decor/slabs/bricks/BlockSnowBrickSlab.java b/MODSRC/vazkii/botania/common/block/decor/slabs/bricks/BlockSnowBrickSlab.java new file mode 100644 index 000000000..a5df2b9a3 --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/decor/slabs/bricks/BlockSnowBrickSlab.java @@ -0,0 +1,33 @@ +/** + * 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 @ [Jul 28, 2014, 11:32:45 PM (GMT)] + */ +package vazkii.botania.common.block.decor.slabs.bricks; + +import net.minecraft.block.BlockSlab; +import vazkii.botania.common.block.ModBlocks; + +public class BlockSnowBrickSlab extends BlockCustomBrickSlab { + + public BlockSnowBrickSlab(boolean full) { + super(full, 2); + } + + @Override + public BlockSlab getFullBlock() { + return (BlockSlab) ModBlocks.snowBrickSlabFull; + } + + @Override + public BlockSlab getSingleBlock() { + return (BlockSlab) ModBlocks.snowBrickSlab; + } + +} \ No newline at end of file diff --git a/MODSRC/vazkii/botania/common/block/decor/slabs/bricks/BlockSoulBrickSlab.java b/MODSRC/vazkii/botania/common/block/decor/slabs/bricks/BlockSoulBrickSlab.java new file mode 100644 index 000000000..84a5539dd --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/decor/slabs/bricks/BlockSoulBrickSlab.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 a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Jul 28, 2014, 10:19:46 PM (GMT)] + */ +package vazkii.botania.common.block.decor.slabs.bricks; + +import net.minecraft.block.BlockSlab; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.decor.slabs.prismarine.BlockPrismarineSlab; + +public class BlockSoulBrickSlab extends BlockCustomBrickSlab { + + public BlockSoulBrickSlab(boolean full) { + super(full, 1); + } + + @Override + public BlockSlab getFullBlock() { + return (BlockSlab) ModBlocks.soulBrickSlabFull; + } + + @Override + public BlockSlab getSingleBlock() { + return (BlockSlab) ModBlocks.soulBrickSlab; + } + +} diff --git a/MODSRC/vazkii/botania/common/block/decor/slabs/bricks/BlockTileSlab.java b/MODSRC/vazkii/botania/common/block/decor/slabs/bricks/BlockTileSlab.java new file mode 100644 index 000000000..0f7e15476 --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/decor/slabs/bricks/BlockTileSlab.java @@ -0,0 +1,33 @@ +/** + * 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 @ [Jul 28, 2014, 11:49:42 PM (GMT)] + */ +package vazkii.botania.common.block.decor.slabs.bricks; + +import net.minecraft.block.BlockSlab; +import vazkii.botania.common.block.ModBlocks; + +public class BlockTileSlab extends BlockCustomBrickSlab { + + public BlockTileSlab(boolean full) { + super(full, 3); + } + + @Override + public BlockSlab getFullBlock() { + return (BlockSlab) ModBlocks.tileSlabFull; + } + + @Override + public BlockSlab getSingleBlock() { + return (BlockSlab) ModBlocks.tileSlab; + } + +} diff --git a/MODSRC/vazkii/botania/common/block/decor/stairs/BlockReedStairs.java b/MODSRC/vazkii/botania/common/block/decor/stairs/BlockReedStairs.java new file mode 100644 index 000000000..a97809ceb --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/decor/stairs/BlockReedStairs.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 a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Jul 28, 2014, 8:47:52 PM (GMT)] + */ +package vazkii.botania.common.block.decor.stairs; + +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 BlockReedStairs extends BlockLivingStairs { + + public BlockReedStairs() { + super(ModBlocks.reedBlock, 0); + } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.decorativeBlocks; + } + + +} diff --git a/MODSRC/vazkii/botania/common/block/decor/stairs/BlockThatchStairs.java b/MODSRC/vazkii/botania/common/block/decor/stairs/BlockThatchStairs.java new file mode 100644 index 000000000..7135a1322 --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/decor/stairs/BlockThatchStairs.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 a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Jul 28, 2014, 8:47:52 PM (GMT)] + */ +package vazkii.botania.common.block.decor.stairs; + +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 BlockThatchStairs extends BlockLivingStairs { + + public BlockThatchStairs() { + super(ModBlocks.thatch, 0); + } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.decorativeBlocks; + } + + +} diff --git a/MODSRC/vazkii/botania/common/block/decor/stairs/bricks/BlockCustomBrickStairs.java b/MODSRC/vazkii/botania/common/block/decor/stairs/bricks/BlockCustomBrickStairs.java new file mode 100644 index 000000000..e49976d2a --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/decor/stairs/bricks/BlockCustomBrickStairs.java @@ -0,0 +1,26 @@ +package vazkii.botania.common.block.decor.stairs.bricks; + +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.decor.stairs.BlockLivingStairs; +import vazkii.botania.common.lexicon.LexiconData; + +public class BlockCustomBrickStairs extends BlockLivingStairs { + + public BlockCustomBrickStairs() { + this(0); + } + + public BlockCustomBrickStairs(int meta) { + super(ModBlocks.customBrick, meta); + } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.decorativeBlocks; + } + +} diff --git a/MODSRC/vazkii/botania/common/block/decor/stairs/bricks/BlockSnowBrickStairs.java b/MODSRC/vazkii/botania/common/block/decor/stairs/bricks/BlockSnowBrickStairs.java new file mode 100644 index 000000000..d6b4d2719 --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/decor/stairs/bricks/BlockSnowBrickStairs.java @@ -0,0 +1,20 @@ +/** + * 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 @ [Jul 28, 2014, 11:28:47 PM (GMT)] + */ +package vazkii.botania.common.block.decor.stairs.bricks; + +public class BlockSnowBrickStairs extends BlockCustomBrickStairs { + + public BlockSnowBrickStairs() { + super(2); + } + +} diff --git a/MODSRC/vazkii/botania/common/block/decor/stairs/bricks/BlockSoulBrickStairs.java b/MODSRC/vazkii/botania/common/block/decor/stairs/bricks/BlockSoulBrickStairs.java new file mode 100644 index 000000000..51b5b378f --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/decor/stairs/bricks/BlockSoulBrickStairs.java @@ -0,0 +1,20 @@ +/** + * 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 @ [Jul 28, 2014, 10:10:00 PM (GMT)] + */ +package vazkii.botania.common.block.decor.stairs.bricks; + +public class BlockSoulBrickStairs extends BlockCustomBrickStairs { + + public BlockSoulBrickStairs() { + super(1); + } + +} diff --git a/MODSRC/vazkii/botania/common/block/decor/stairs/bricks/BlockTileStairs.java b/MODSRC/vazkii/botania/common/block/decor/stairs/bricks/BlockTileStairs.java new file mode 100644 index 000000000..e91659ca4 --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/decor/stairs/bricks/BlockTileStairs.java @@ -0,0 +1,20 @@ +/** + * 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 @ [Jul 28, 2014, 10:10:00 PM (GMT)] + */ +package vazkii.botania.common.block.decor.stairs.bricks; + +public class BlockTileStairs extends BlockCustomBrickStairs { + + public BlockTileStairs() { + super(3); + } + +} diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index b2ef31be0..9f321622b 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -106,7 +106,24 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.prismarineBrickSlab); addBlock(ModBlocks.darkPrismarineStairs); addBlock(ModBlocks.darkPrismarineSlab); - + + addBlock(ModBlocks.reedBlock); + addBlock(ModBlocks.reedStairs); + addBlock(ModBlocks.reedSlab); + addBlock(ModBlocks.thatch); + addBlock(ModBlocks.thatchStairs); + addBlock(ModBlocks.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(ModBlocks.livingwoodStairs); addBlock(ModBlocks.livingwoodSlab); addBlock(ModBlocks.livingwoodPlankStairs); diff --git a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java index c97f00a33..aa2a4a2ec 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java @@ -51,6 +51,9 @@ public final class LibBlockNames { public static final String MINI_ISLAND = "miniIsland"; public static final String TINY_POTATO = "tinyPotato"; public static final String SPAWNER_CLAW = "spawnerClaw"; + public static final String REED_BLOCK = "reedBlock"; + public static final String THATCH = "thatch"; + public static final String CUSTOM_BRICK = "customBrick"; public static final String SPECIAL_FLOWER_PREFIX = FLOWER + "."; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index aa0eeb5a8..9475e45c0 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -353,6 +353,36 @@ tile.botania:miniIsland14.name=Floating Red Flower tile.botania:miniIsland15.name=Floating Black Flower tile.botania:tinyPotato.name=Tiny Potato tile.botania:spawnerClaw.name=Life Imbuer +tile.botania:reedBlock.name=Reed Block +tile.botania:reedBlock0Stairs.name=Reed Stairs +tile.botania:reedBlock0Slab.name=Reed Slab +tile.botania:thatch.name=Thatch +tile.botania:thatch0Stairs.name=Thatch Stairs +tile.botania:thatch0Slab.name=Thatch Slab +tile.botania:customBrick0.name=Hellish Brick +tile.botania:customBrick1.name=Soul Brick +tile.botania:customBrick2.name=Frosty Brick +tile.botania:customBrick3.name=Roof Tile +tile.botania:customBrick0Stairs.name=Hellish Brick Stairs +tile.botania:customBrick1Stairs.name=Soul Brick Stairs +tile.botania:customBrick2Stairs.name=Frosty Brick Stairs +tile.botania:customBrick3Stairs.name=Roof Tile Stairs +tile.botania:customBrick0Slab.name=Hellish Brick Slab +tile.botania:customBrick1Slab.name=Soul Brick Slab +tile.botania:customBrick2Slab.name=Frosty Brick Slab +tile.botania:customBrick3Slab.name=Roof Tile Slab +tile.botania:customBrick4.name=Azulejo +tile.botania:customBrick5.name=Azulejo +tile.botania:customBrick6.name=Azulejo +tile.botania:customBrick7.name=Azulejo +tile.botania:customBrick8.name=Azulejo +tile.botania:customBrick9.name=Azulejo +tile.botania:customBrick10.name=Azulejo +tile.botania:customBrick11.name=Azulejo +tile.botania:customBrick12.name=Azulejo +tile.botania:customBrick13.name=Azulejo +tile.botania:customBrick14.name=Azulejo +tile.botania:customBrick15.name=Azulejo # FLOWER NAMES tile.botania:flower..name=Botania Flower diff --git a/resources/assets/botania/textures/blocks/customBrick0.png b/resources/assets/botania/textures/blocks/customBrick0.png new file mode 100644 index 000000000..4dacb2665 Binary files /dev/null and b/resources/assets/botania/textures/blocks/customBrick0.png differ diff --git a/resources/assets/botania/textures/blocks/customBrick1.png b/resources/assets/botania/textures/blocks/customBrick1.png new file mode 100644 index 000000000..8a0848a0e Binary files /dev/null and b/resources/assets/botania/textures/blocks/customBrick1.png differ diff --git a/resources/assets/botania/textures/blocks/customBrick10.png b/resources/assets/botania/textures/blocks/customBrick10.png new file mode 100644 index 000000000..13ebca94e Binary files /dev/null and b/resources/assets/botania/textures/blocks/customBrick10.png differ diff --git a/resources/assets/botania/textures/blocks/customBrick11.png b/resources/assets/botania/textures/blocks/customBrick11.png new file mode 100644 index 000000000..0fd701429 Binary files /dev/null and b/resources/assets/botania/textures/blocks/customBrick11.png differ diff --git a/resources/assets/botania/textures/blocks/customBrick12.png b/resources/assets/botania/textures/blocks/customBrick12.png new file mode 100644 index 000000000..cfc72d78a Binary files /dev/null and b/resources/assets/botania/textures/blocks/customBrick12.png differ diff --git a/resources/assets/botania/textures/blocks/customBrick13.png b/resources/assets/botania/textures/blocks/customBrick13.png new file mode 100644 index 000000000..dfec9daab Binary files /dev/null and b/resources/assets/botania/textures/blocks/customBrick13.png differ diff --git a/resources/assets/botania/textures/blocks/customBrick14.png b/resources/assets/botania/textures/blocks/customBrick14.png new file mode 100644 index 000000000..ee15dd149 Binary files /dev/null and b/resources/assets/botania/textures/blocks/customBrick14.png differ diff --git a/resources/assets/botania/textures/blocks/customBrick15.png b/resources/assets/botania/textures/blocks/customBrick15.png new file mode 100644 index 000000000..35af466a9 Binary files /dev/null and b/resources/assets/botania/textures/blocks/customBrick15.png differ diff --git a/resources/assets/botania/textures/blocks/customBrick2.png b/resources/assets/botania/textures/blocks/customBrick2.png new file mode 100644 index 000000000..9c20948df Binary files /dev/null and b/resources/assets/botania/textures/blocks/customBrick2.png differ diff --git a/resources/assets/botania/textures/blocks/customBrick3.png b/resources/assets/botania/textures/blocks/customBrick3.png new file mode 100644 index 000000000..a59801a7c Binary files /dev/null and b/resources/assets/botania/textures/blocks/customBrick3.png differ diff --git a/resources/assets/botania/textures/blocks/customBrick4.png b/resources/assets/botania/textures/blocks/customBrick4.png new file mode 100644 index 000000000..15ddf0a50 Binary files /dev/null and b/resources/assets/botania/textures/blocks/customBrick4.png differ diff --git a/resources/assets/botania/textures/blocks/customBrick5.png b/resources/assets/botania/textures/blocks/customBrick5.png new file mode 100644 index 000000000..414b91eee Binary files /dev/null and b/resources/assets/botania/textures/blocks/customBrick5.png differ diff --git a/resources/assets/botania/textures/blocks/customBrick6.png b/resources/assets/botania/textures/blocks/customBrick6.png new file mode 100644 index 000000000..ca08312e9 Binary files /dev/null and b/resources/assets/botania/textures/blocks/customBrick6.png differ diff --git a/resources/assets/botania/textures/blocks/customBrick7.png b/resources/assets/botania/textures/blocks/customBrick7.png new file mode 100644 index 000000000..830a2c42c Binary files /dev/null and b/resources/assets/botania/textures/blocks/customBrick7.png differ diff --git a/resources/assets/botania/textures/blocks/customBrick8.png b/resources/assets/botania/textures/blocks/customBrick8.png new file mode 100644 index 000000000..0ea270406 Binary files /dev/null and b/resources/assets/botania/textures/blocks/customBrick8.png differ diff --git a/resources/assets/botania/textures/blocks/customBrick9.png b/resources/assets/botania/textures/blocks/customBrick9.png new file mode 100644 index 000000000..4dba68bb7 Binary files /dev/null and b/resources/assets/botania/textures/blocks/customBrick9.png differ diff --git a/resources/assets/botania/textures/blocks/reedBlock0.png b/resources/assets/botania/textures/blocks/reedBlock0.png new file mode 100644 index 000000000..38b94b50d Binary files /dev/null and b/resources/assets/botania/textures/blocks/reedBlock0.png differ diff --git a/resources/assets/botania/textures/blocks/reedBlock1.png b/resources/assets/botania/textures/blocks/reedBlock1.png new file mode 100644 index 000000000..b8282f4e0 Binary files /dev/null and b/resources/assets/botania/textures/blocks/reedBlock1.png differ diff --git a/resources/assets/botania/textures/blocks/thatch.png b/resources/assets/botania/textures/blocks/thatch.png new file mode 100644 index 000000000..f66bf032e Binary files /dev/null and b/resources/assets/botania/textures/blocks/thatch.png differ