Added Walls to some botania blocks. About time!

This commit is contained in:
Lizbeth Rika committed 2015-07-18 22:58:10 +01:00
1 parent 8f442bb706
commit 2925f0814d
13 files changed
+413 -10

No files matched your search

@@ -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);
@@ -0,0 +1,34 @@
/**
* 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 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;
}
}
@@ -0,0 +1,42 @@
/**
* 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 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;
}
}
@@ -0,0 +1,72 @@
/**
* 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 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
}
}
@@ -0,0 +1,35 @@
/**
* 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 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;
}
}
@@ -0,0 +1,24 @@
/**
* 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 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);
}
}
@@ -0,0 +1,58 @@
/**
* 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 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);
}
}
@@ -0,0 +1,25 @@
/**
* 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 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);
}
}
@@ -0,0 +1,26 @@
/**
* 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 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);
}
}
@@ -0,0 +1,25 @@
/**
* 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 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);
}
}
@@ -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);
@@ -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),