From bd578151d1b10a03a823c9574bd5fe782a1dc981 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Tue, 7 Jul 2015 23:42:38 +0100 Subject: [PATCH] 1.9 bricks! --- .../botania/common/block/ModFluffBlocks.java | 14 +++++- .../block/decor/BlockEndStoneBrick.java | 8 ++-- .../decor/slabs/BlockEnderBrickSlab.java | 43 +++++++++++++++++++ .../decor/stairs/BlockEnderBrickStairs.java | 31 +++++++++++++ .../common/core/BotaniaCreativeTab.java | 4 +- .../common/crafting/ModCraftingRecipes.java | 13 ++++++ .../botania/common/lexicon/LexiconData.java | 2 +- .../resources/assets/botania/lang/en_US.lang | 8 +++- 8 files changed, 114 insertions(+), 9 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java create mode 100644 src/main/java/vazkii/botania/common/block/decor/stairs/BlockEnderBrickStairs.java diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index c4465c499..3bcea555a 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -21,6 +21,7 @@ import vazkii.botania.common.block.decor.slabs.Block18StoneSlab; import vazkii.botania.common.block.decor.slabs.BlockBiomeStoneSlab; import vazkii.botania.common.block.decor.slabs.BlockDirtPathSlab; import vazkii.botania.common.block.decor.slabs.BlockEndStoneSlab; +import vazkii.botania.common.block.decor.slabs.BlockEnderBrickSlab; import vazkii.botania.common.block.decor.slabs.BlockModSlab; import vazkii.botania.common.block.decor.slabs.BlockReedSlab; import vazkii.botania.common.block.decor.slabs.BlockThatchSlab; @@ -40,6 +41,7 @@ import vazkii.botania.common.block.decor.slabs.prismarine.BlockPrismarineSlab; import vazkii.botania.common.block.decor.stairs.Block18StoneStairs; import vazkii.botania.common.block.decor.stairs.BlockBiomeStoneStairs; import vazkii.botania.common.block.decor.stairs.BlockEndStoneStairs; +import vazkii.botania.common.block.decor.stairs.BlockEnderBrickStairs; 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; @@ -156,6 +158,9 @@ public final class ModFluffBlocks { public static Block endStoneSlab; public static Block endStoneSlabFull; public static Block endStoneStairs; + public static Block enderBrickSlab; + public static Block enderBrickSlabFull; + public static Block enderBrickStairs; public static void init() { livingwoodStairs = new BlockLivingwoodStairs(); @@ -264,7 +269,10 @@ public final class ModFluffBlocks { endStoneSlab = new BlockEndStoneSlab(false); endStoneSlabFull = new BlockEndStoneSlab(true); endStoneStairs = new BlockEndStoneStairs(); - + enderBrickSlab = new BlockEnderBrickSlab(false); + enderBrickSlabFull = new BlockEnderBrickSlab(true); + enderBrickStairs = new BlockEnderBrickStairs(); + if(ConfigHandler.darkQuartzEnabled) { ((BlockModSlab) darkQuartzSlab).register(); ((BlockModSlab) darkQuartzSlabFull).register(); @@ -321,7 +329,9 @@ public final class ModFluffBlocks { ((BlockModSlab) endStoneSlab).register(); ((BlockModSlab) endStoneSlabFull).register(); - + ((BlockModSlab) enderBrickSlab).register(); + ((BlockModSlab) enderBrickSlabFull).register(); + for(int i = 0; i < 24; i++) { ((BlockModSlab) biomeStoneSlabs[i]).register(); ((BlockModSlab) biomeStoneFullSlabs[i]).register(); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java index 0b0f66a1c..22b476c67 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -33,7 +33,7 @@ import cpw.mods.fml.common.registry.GameRegistry; public class BlockEndStoneBrick extends BlockMod implements ILexiconable { - private static IIcon[] icons = new IIcon[2]; + private static IIcon[] icons = new IIcon[5]; public BlockEndStoneBrick() { super(Material.rock); @@ -45,20 +45,20 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable { @Override public void registerBlockIcons(IIconRegister register) { - for(int i = 0; i < 2; i++) { + for(int i = 0; i < icons.length; i++) { icons[i] = IconHelper.forBlock(register, this, i); } } @Override public void getSubBlocks(Item item, CreativeTabs tab, List list) { - for(int i = 0; i < 2; i++) + for(int i = 0; i < 4; i++) list.add(new ItemStack(item, 1, i)); } @Override public IIcon getIcon(int side, int meta) { - return icons[Math.min(icons.length - 1, meta)]; + return meta == 3 ? icons[side == 0 || side == 1 ? 4 : 3] : icons[Math.min(icons.length - 1, meta)]; } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java new file mode 100644 index 000000000..0ba15ddd1 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java @@ -0,0 +1,43 @@ +/** + * 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 7, 2015, 10:37:15 PM (GMT)] + */ +package vazkii.botania.common.block.decor.slabs; + +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.ModFluffBlocks; +import vazkii.botania.common.lexicon.LexiconData; + +public class BlockEnderBrickSlab extends BlockLivingSlab { + + public BlockEnderBrickSlab(boolean full) { + super(full, ModBlocks.endStoneBrick, 2); + } + + @Override + public BlockSlab getFullBlock() { + return (BlockSlab) ModFluffBlocks.enderBrickSlabFull; + } + + @Override + public BlockSlab getSingleBlock() { + return (BlockSlab) ModFluffBlocks.enderBrickSlab; + } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.endStoneDecor; + } + +} diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEnderBrickStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEnderBrickStairs.java new file mode 100644 index 000000000..fdd23147c --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEnderBrickStairs.java @@ -0,0 +1,31 @@ +/** + * 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 7, 2015, 10:38:15 PM (GMT)] + */ +package vazkii.botania.common.block.decor.stairs; + +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.lexicon.LexiconData; + +public class BlockEnderBrickStairs extends BlockLivingStairs { + + public BlockEnderBrickStairs() { + super(ModBlocks.endStoneBrick, 2); + } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.endStoneDecor; + } + +} diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index f639d6a63..331f19594 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -352,7 +352,9 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.endStoneBrick); addBlock(ModFluffBlocks.endStoneSlab); addBlock(ModFluffBlocks.endStoneStairs); - + addBlock(ModFluffBlocks.enderBrickSlab); + addBlock(ModFluffBlocks.enderBrickStairs); + addItem(ModItems.cosmetic); } diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 96bb54098..7fe7348fb 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -237,6 +237,8 @@ public final class ModCraftingRecipes { public static IRecipe recipeCorporeaInterceptor; public static IRecipe recipeEndStoneBricks; public static IRecipe recipeEndStoneChiseledBricks; + public static IRecipe recipeEnderBricks; + public static IRecipe recipePillarEnderBricks; public static IRecipe recipeLivingwoodBow; public static IRecipe recipeCrystalBow; public static List recipesCosmeticItems; @@ -1596,6 +1598,17 @@ public final class ModCraftingRecipes { 'S', new ItemStack(ModFluffBlocks.endStoneSlab)); recipeEndStoneChiseledBricks = BotaniaAPI.getLatestAddedRecipe(); + GameRegistry.addRecipe(new ItemStack(ModBlocks.endStoneBrick, 4, 2), + " B ", "BPB", " B ", + 'B', new ItemStack(ModBlocks.endStoneBrick), + 'P', new ItemStack(Items.ender_pearl)); + recipeEnderBricks = BotaniaAPI.getLatestAddedRecipe(); + + GameRegistry.addRecipe(new ItemStack(ModBlocks.endStoneBrick, 2, 3), + "B", "B", + 'B', new ItemStack(ModBlocks.endStoneBrick, 1, 2)); + recipePillarEnderBricks = BotaniaAPI.getLatestAddedRecipe(); + // Livingwood Bow Recipe addOreDictRecipe(new ItemStack(ModItems.livingwoodBow), " TS", "T S", " TS", diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 1fa3fc19c..1e7769919 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -770,7 +770,7 @@ public final class LexiconData { corporeaInterceptor.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeCorporeaInterceptor)); endStoneDecor = new BLexiconEntry(LibLexicon.ENDER_END_STONE_DECOR, categoryEnder); - endStoneDecor.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeEndStoneBricks), new PageCraftingRecipe("2", ModCraftingRecipes.recipeEndStoneChiseledBricks)); + endStoneDecor.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeEndStoneBricks), new PageCraftingRecipe("2", ModCraftingRecipes.recipeEndStoneChiseledBricks), new PageCraftingRecipe("3", ModCraftingRecipes.recipeEnderBricks), new PageCraftingRecipe("4", ModCraftingRecipes.recipePillarEnderBricks)); spawnerMover = new ALexiconEntry(LibLexicon.ENDER_SPAWNER_MOVER, categoryEnder); spawnerMover.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSpawnerMover)); diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index d0e0b9981..1c7e5f8e6 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -899,8 +899,12 @@ tile.botania:corporeaIndex.name=Corporea Index tile.botania:corporeaFunnel.name=Corporea Funnel tile.botania:endStoneBrick0.name=End Stone Bricks tile.botania:endStoneBrick1.name=Chiseled End Stone Brick +tile.botania:endStoneBrick2.name=Ender Bricks +tile.botania:endStoneBrick3.name=Pillar End Bricks tile.botania:endStoneBrick0Slab.name=End Stone Brick Slab tile.botania:endStoneBrick0Stairs.name=End Stone Brick Stairs +tile.botania:endStoneBrick2Slab.name=Ender Brick Slab +tile.botania:endStoneBrick2Stairs.name=Ender Brick Stairs tile.botania:mushroom0.name=White Shimmering Mushroom tile.botania:mushroom1.name=Orange Shimmering Mushroom tile.botania:mushroom2.name=Magenta Shimmering Mushroom @@ -2516,9 +2520,11 @@ botania.page.corporeaCrystalCube2=I can see forever # -- DECORATIVE END BLOCKS botania.entry.endStoneDecor=Decorative End Blocks -botania.page.endStoneDecor0=Similarly to other stone blocks, &1End Stone&0 can be converted into bricks and chiseled bricks, the bricks can be used as stairs or slabs just like normal &1Stone Bricks&0 would. +botania.page.endStoneDecor0=Similarly to other stone blocks, &1End Stone&0 can be converted into bricks and chiseled bricks, the bricks can be used as stairs or slabs just like normal &1Stone Bricks&0 would.
&1Ender Pearls&0 can be combined with the bricks to create &1Ender Brick&0 blocks, which can also can be used for stairs or slabs. botania.page.endStoneDecor1=Making &1End Stone Bricks&0 botania.page.endStoneDecor2=Making &1Chiseled End Stone Bricks&0 +botania.page.endStoneDecor3=Making &1Ender Bricks&0 +botania.page.endStoneDecor4=Making &1Pillar Ender Bricks&0 # -- LIFE AGGREGATOR botania.entry.spawnerMover=Life Aggregator