1.9 bricks!

This commit is contained in:
Lizbeth Rika committed 2015-07-07 23:42:38 +01:00
1 parent 0cf1834b3a
commit bd578151d1
8 files changed
+114 -9

No files matched your search

@@ -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();
@@ -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
@@ -0,0 +1,43 @@
/**
* This class was created by <Vazkii>. 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;
}
}
@@ -0,0 +1,31 @@
/**
* This class was created by <Vazkii>. 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;
}
}
@@ -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);
}
@@ -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<IRecipe> 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",
@@ -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));