mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-20 04:09:40 +00:00
Stairs and Slabs!
This commit is contained in:
1 parent
9ae911e935
commit
06783c022b
30 files changed
+537
-96
No files matched your search
@@ -1,22 +0,0 @@
|
||||
/**
|
||||
* 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 a
|
||||
* Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License
|
||||
* (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB)
|
||||
*
|
||||
* File Created @ [May 3, 2014, 9:20:49 PM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.block;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
|
||||
public class BlockNaturaCharge extends BlockMod {
|
||||
|
||||
public BlockNaturaCharge() {
|
||||
super(Material.tnt);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -19,11 +19,27 @@ 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.BlockManaBeacon;
|
||||
import vazkii.botania.common.block.decor.BlockShinyFlower;
|
||||
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.living.BlockDreamwoodPlankSlab;
|
||||
import vazkii.botania.common.block.decor.slabs.living.BlockDreamwoodSlab;
|
||||
import vazkii.botania.common.block.decor.slabs.living.BlockLivingrockBrickSlab;
|
||||
import vazkii.botania.common.block.decor.slabs.living.BlockLivingrockSlab;
|
||||
import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodPlankSlab;
|
||||
import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodSlab;
|
||||
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;
|
||||
import vazkii.botania.common.block.decor.stairs.living.BlockLivingrockStairs;
|
||||
import vazkii.botania.common.block.decor.stairs.living.BlockLivingwoodPlankStairs;
|
||||
import vazkii.botania.common.block.decor.stairs.living.BlockLivingwoodStairs;
|
||||
import vazkii.botania.common.block.dispenser.BehaviourSeeds;
|
||||
import vazkii.botania.common.block.dispenser.BehaviourWand;
|
||||
import vazkii.botania.common.block.quartz.BlockSpecialQuartz;
|
||||
import vazkii.botania.common.block.quartz.BlockSpecialQuartzSlab;
|
||||
import vazkii.botania.common.block.quartz.BlockSpecialQuartzStairs;
|
||||
import vazkii.botania.common.block.subtile.SubTileManastar;
|
||||
import vazkii.botania.common.block.subtile.SubTilePureDaisy;
|
||||
import vazkii.botania.common.block.subtile.functional.SubTileAgricarnation;
|
||||
@@ -105,6 +121,25 @@ public final class ModBlocks {
|
||||
public static Block alfPortal;
|
||||
public static Block dreamwood;
|
||||
|
||||
public static Block livingwoodStairs;
|
||||
public static Block livingwoodSlab;
|
||||
public static Block livingwoodSlabFull;
|
||||
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 livingrockBrickStairs;
|
||||
public static Block livingrockBrickSlab;
|
||||
public static Block livingrockBrickSlabFull;
|
||||
public static Block dreamwoodStairs;
|
||||
public static Block dreamwoodSlab;
|
||||
public static Block dreamwoodSlabFull;
|
||||
public static Block dreamwoodPlankStairs;
|
||||
public static Block dreamwoodPlankSlab;
|
||||
public static Block dreamwoodPlankSlabFull;
|
||||
|
||||
public static Block darkQuartz;
|
||||
public static Block darkQuartzSlab;
|
||||
public static Block darkQuartzSlabFull;
|
||||
@@ -154,7 +189,26 @@ public final class ModBlocks {
|
||||
platform = new BlockPlatform();
|
||||
alfPortal = new BlockAlfPortal();
|
||||
dreamwood = new BlockDreamwood();
|
||||
|
||||
|
||||
livingwoodStairs = new BlockLivingwoodStairs();
|
||||
livingwoodSlab = new BlockLivingwoodSlab(false);
|
||||
livingwoodSlabFull = new BlockLivingwoodSlab(true);
|
||||
livingwoodPlankStairs = new BlockLivingwoodPlankStairs();
|
||||
livingwoodPlankSlab = new BlockLivingwoodPlankSlab(false);
|
||||
livingwoodPlankSlabFull = new BlockLivingwoodPlankSlab(true);
|
||||
livingrockStairs = new BlockLivingrockStairs();
|
||||
livingrockSlab = new BlockLivingrockSlab(false);
|
||||
livingrockSlabFull = new BlockLivingrockSlab(true);
|
||||
livingrockBrickStairs = new BlockLivingrockBrickStairs();
|
||||
livingrockBrickSlab = new BlockLivingrockBrickSlab(false);
|
||||
livingrockBrickSlabFull = new BlockLivingrockBrickSlab(true);
|
||||
dreamwoodStairs = new BlockDreamwoodStairs();
|
||||
dreamwoodSlab = new BlockDreamwoodSlab(false);
|
||||
dreamwoodSlabFull = new BlockDreamwoodSlab(true);
|
||||
dreamwoodPlankStairs = new BlockDreamwoodPlankStairs();
|
||||
dreamwoodPlankSlab = new BlockDreamwoodPlankSlab(false);
|
||||
dreamwoodPlankSlabFull = new BlockDreamwoodPlankSlab(true);
|
||||
|
||||
if(ConfigHandler.darkQuartzEnabled) {
|
||||
darkQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_DARK);
|
||||
darkQuartzSlab = new BlockSpecialQuartzSlab(darkQuartz, false);
|
||||
@@ -180,18 +234,31 @@ public final class ModBlocks {
|
||||
redQuartzStairs = new BlockSpecialQuartzStairs(redQuartz);
|
||||
|
||||
if(ConfigHandler.darkQuartzEnabled) {
|
||||
((BlockSpecialQuartzSlab) darkQuartzSlab).register();
|
||||
((BlockSpecialQuartzSlab) darkQuartzSlabFull).register();
|
||||
((BlockModSlab) darkQuartzSlab).register();
|
||||
((BlockModSlab) darkQuartzSlabFull).register();
|
||||
}
|
||||
((BlockSpecialQuartzSlab) manaQuartzSlab).register();
|
||||
((BlockSpecialQuartzSlab) manaQuartzSlabFull).register();
|
||||
((BlockSpecialQuartzSlab) blazeQuartzSlab).register();
|
||||
((BlockSpecialQuartzSlab) blazeQuartzSlabFull).register();
|
||||
((BlockSpecialQuartzSlab) lavenderQuartzSlab).register();
|
||||
((BlockSpecialQuartzSlab) lavenderQuartzSlabFull).register();
|
||||
((BlockSpecialQuartzSlab) redQuartzSlab).register();
|
||||
((BlockSpecialQuartzSlab) redQuartzSlabFull).register();
|
||||
|
||||
((BlockModSlab) manaQuartzSlab).register();
|
||||
((BlockModSlab) manaQuartzSlabFull).register();
|
||||
((BlockModSlab) blazeQuartzSlab).register();
|
||||
((BlockModSlab) blazeQuartzSlabFull).register();
|
||||
((BlockModSlab) lavenderQuartzSlab).register();
|
||||
((BlockModSlab) lavenderQuartzSlabFull).register();
|
||||
((BlockModSlab) redQuartzSlab).register();
|
||||
((BlockModSlab) redQuartzSlabFull).register();
|
||||
|
||||
((BlockModSlab) livingwoodSlab).register();
|
||||
((BlockModSlab) livingwoodSlabFull).register();
|
||||
((BlockModSlab) livingwoodPlankSlab).register();
|
||||
((BlockModSlab) livingwoodPlankSlabFull).register();
|
||||
((BlockModSlab) livingrockSlab).register();
|
||||
((BlockModSlab) livingrockSlabFull).register();
|
||||
((BlockModSlab) livingrockBrickSlab).register();
|
||||
((BlockModSlab) livingrockBrickSlabFull).register();
|
||||
((BlockModSlab) dreamwoodSlab).register();
|
||||
((BlockModSlab) dreamwoodSlabFull).register();
|
||||
((BlockModSlab) dreamwoodPlankSlab).register();
|
||||
((BlockModSlab) dreamwoodPlankSlabFull).register();
|
||||
|
||||
for(int i = 0; i < 16; i++)
|
||||
OreDictionary.registerOre(LibOreDict.FLOWER[i], new ItemStack(flower, 1, i));
|
||||
|
||||
|
||||
+2
-1
@@ -9,7 +9,7 @@
|
||||
*
|
||||
* File Created @ [Mar 3, 2014, 4:53:59 PM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.block;
|
||||
package vazkii.botania.common.block.decor;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.util.List;
|
||||
@@ -29,6 +29,7 @@ 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.BlockModContainer;
|
||||
import vazkii.botania.common.block.tile.TileManaBeacon;
|
||||
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
+3
-1
@@ -9,7 +9,7 @@
|
||||
*
|
||||
* File Created @ [Jun 2, 2014, 8:15:49 PM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.block;
|
||||
package vazkii.botania.common.block.decor;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -17,6 +17,8 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.common.block.BlockModFlower;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
+2
-1
@@ -9,7 +9,7 @@
|
||||
*
|
||||
* File Created @ [Feb 4, 2014, 6:00:44 PM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.block;
|
||||
package vazkii.botania.common.block.decor;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.util.List;
|
||||
@@ -27,6 +27,7 @@ import net.minecraft.world.World;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.core.helper.Vector3;
|
||||
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
+2
-2
@@ -9,7 +9,7 @@
|
||||
*
|
||||
* File Created @ [Jun 11, 2014, 1:05:32 AM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.block.quartz;
|
||||
package vazkii.botania.common.block.decor.quartz;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -26,7 +26,7 @@ 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.quartz.ItemBlockSpecialQuartz;
|
||||
import vazkii.botania.common.item.block.ItemBlockSpecialQuartz;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
+7
-22
@@ -9,7 +9,7 @@
|
||||
*
|
||||
* File Created @ [Jun 11, 2014, 1:08:28 AM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.block.quartz;
|
||||
package vazkii.botania.common.block.decor.quartz;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
@@ -23,34 +23,27 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.core.BotaniaCreativeTab;
|
||||
import vazkii.botania.common.item.block.quartz.ItemBlockSpecialQuartzSlab;
|
||||
import vazkii.botania.common.block.decor.slabs.BlockModSlab;
|
||||
import vazkii.botania.common.item.block.ItemBlockModSlab;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class BlockSpecialQuartzSlab extends BlockSlab implements ILexiconable {
|
||||
public class BlockSpecialQuartzSlab extends BlockModSlab {
|
||||
|
||||
Block source;
|
||||
String name;
|
||||
|
||||
public BlockSpecialQuartzSlab(Block source, boolean par2) {
|
||||
super(par2, Material.rock);
|
||||
super(par2, Material.rock, "quartzSlab" + ((BlockSpecialQuartz) source).type + (par2 ? "Full" : "Half"));
|
||||
setHardness(0.8F);
|
||||
setResistance(10F);
|
||||
name = "quartzSlab" + ((BlockSpecialQuartz) source).type + (par2 ? "Full" : "Half");
|
||||
this.source = source;
|
||||
setBlockName(name);
|
||||
if(!par2) {
|
||||
setLightOpacity(0);
|
||||
setCreativeTab(BotaniaCreativeTab.INSTANCE);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getFullBlock() {
|
||||
if(source == ModBlocks.darkQuartz)
|
||||
return (BlockSlab) ModBlocks.darkQuartzSlabFull;
|
||||
@@ -67,6 +60,7 @@ public class BlockSpecialQuartzSlab extends BlockSlab implements ILexiconable {
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getSingleBlock() {
|
||||
if(source == ModBlocks.darkQuartz)
|
||||
return (BlockSlab) ModBlocks.darkQuartzSlab;
|
||||
@@ -88,10 +82,6 @@ public class BlockSpecialQuartzSlab extends BlockSlab implements ILexiconable {
|
||||
return new ItemStack(getSingleBlock());
|
||||
}
|
||||
|
||||
public void register() {
|
||||
GameRegistry.registerBlock(this, ItemBlockSpecialQuartzSlab.class, name);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public IIcon getIcon(int par1, int par2) {
|
||||
@@ -108,11 +98,6 @@ public class BlockSpecialQuartzSlab extends BlockSlab implements ILexiconable {
|
||||
return new ItemStack(getSingleBlock());
|
||||
}
|
||||
|
||||
@Override
|
||||
public String func_150002_b(int i) {
|
||||
return "tile.botania:" + name;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerBlockIcons(IIconRegister par1IconRegister) {
|
||||
+4
-15
@@ -9,7 +9,7 @@
|
||||
*
|
||||
* File Created @ [Jun 11, 2014, 1:12:50 AM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.block.quartz;
|
||||
package vazkii.botania.common.block.decor.quartz;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockStairs;
|
||||
@@ -18,27 +18,16 @@ 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.decor.stairs.BlockModStairs;
|
||||
import vazkii.botania.common.core.BotaniaCreativeTab;
|
||||
import vazkii.botania.common.item.block.ItemBlockMod;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
public class BlockSpecialQuartzStairs extends BlockStairs implements ILexiconable {
|
||||
public class BlockSpecialQuartzStairs extends BlockModStairs {
|
||||
|
||||
public BlockSpecialQuartzStairs(Block source) {
|
||||
super(source, 0);
|
||||
setBlockName("quartzStairs" + ((BlockSpecialQuartz) source).type);
|
||||
setCreativeTab(BotaniaCreativeTab.INSTANCE);
|
||||
super(source, 0, "quartzStairs" + ((BlockSpecialQuartz) source).type);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Block setBlockName(String par1Str) {
|
||||
GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str);
|
||||
return super.setBlockName(par1Str);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) {
|
||||
return LexiconData.decorativeBlocks;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
package vazkii.botania.common.block.decor.slabs;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
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;
|
||||
|
||||
public abstract class BlockLivingSlab extends BlockModSlab {
|
||||
|
||||
Block source;
|
||||
int meta;
|
||||
|
||||
public BlockLivingSlab(boolean full, Block source, int meta) {
|
||||
super(full, source.getMaterial(), source.getUnlocalizedName().replaceAll("tile.", "") + meta + "Slab" + (full ? "Full" : ""));
|
||||
setStepSound(source.stepSound);
|
||||
this.source = source;
|
||||
this.meta = meta;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public IIcon getIcon(int par1, int par2) {
|
||||
return source.getIcon(par1, meta);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,77 @@
|
||||
package vazkii.botania.common.block.decor.slabs;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.block.BlockSlab;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
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 vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.core.BotaniaCreativeTab;
|
||||
import vazkii.botania.common.item.block.ItemBlockModSlab;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
|
||||
public abstract class BlockModSlab extends BlockSlab implements ILexiconable {
|
||||
|
||||
String name;
|
||||
|
||||
public BlockModSlab(boolean full, Material mat, String name) {
|
||||
super(full, mat);
|
||||
this.name = name;
|
||||
setBlockName(name);
|
||||
if(!full) {
|
||||
setLightOpacity(0);
|
||||
setCreativeTab(BotaniaCreativeTab.INSTANCE);
|
||||
}
|
||||
}
|
||||
|
||||
public abstract BlockSlab getFullBlock();
|
||||
|
||||
public abstract BlockSlab getSingleBlock();
|
||||
|
||||
@Override
|
||||
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) {
|
||||
return new ItemStack(getSingleBlock());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
|
||||
return Item.getItemFromBlock(getSingleBlock());
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack createStackedBlock(int par1) {
|
||||
return new ItemStack(getSingleBlock());
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerBlockIcons(IIconRegister par1IconRegister) {
|
||||
// NO-OP
|
||||
}
|
||||
|
||||
public void register() {
|
||||
GameRegistry.registerBlock(this, ItemBlockModSlab.class, name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String func_150002_b(int i) {
|
||||
return name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) {
|
||||
return LexiconData.decorativeBlocks;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package vazkii.botania.common.block.decor.slabs.living;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockSlab;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.decor.slabs.BlockLivingSlab;
|
||||
|
||||
public class BlockDreamwoodPlankSlab extends BlockLivingSlab {
|
||||
|
||||
public BlockDreamwoodPlankSlab(boolean full) {
|
||||
super(full, ModBlocks.dreamwood, 1);
|
||||
setHardness(2.0F);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getFullBlock() {
|
||||
return (BlockSlab) ModBlocks.dreamwoodSlabFull;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getSingleBlock() {
|
||||
return (BlockSlab) ModBlocks.dreamwoodSlab;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package vazkii.botania.common.block.decor.slabs.living;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockSlab;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.decor.slabs.BlockLivingSlab;
|
||||
|
||||
public class BlockDreamwoodSlab extends BlockLivingSlab {
|
||||
|
||||
public BlockDreamwoodSlab(boolean full) {
|
||||
super(full, ModBlocks.dreamwood, 0);
|
||||
setHardness(2.0F);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getFullBlock() {
|
||||
return (BlockSlab) ModBlocks.dreamwoodPlankSlabFull;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getSingleBlock() {
|
||||
return (BlockSlab) ModBlocks.dreamwoodPlankSlab;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package vazkii.botania.common.block.decor.slabs.living;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockSlab;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.decor.slabs.BlockLivingSlab;
|
||||
|
||||
public class BlockLivingrockBrickSlab extends BlockLivingSlab {
|
||||
|
||||
public BlockLivingrockBrickSlab(boolean full) {
|
||||
super(full, ModBlocks.livingrock, 1);
|
||||
setHardness(2.0F);
|
||||
setResistance(10.0F);
|
||||
setStepSound(soundTypeStone);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getFullBlock() {
|
||||
return (BlockSlab) ModBlocks.livingrockSlabFull;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getSingleBlock() {
|
||||
return (BlockSlab) ModBlocks.livingrockSlab;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package vazkii.botania.common.block.decor.slabs.living;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockSlab;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.decor.slabs.BlockLivingSlab;
|
||||
|
||||
public class BlockLivingrockSlab extends BlockLivingSlab {
|
||||
|
||||
public BlockLivingrockSlab(boolean full) {
|
||||
super(full, ModBlocks.livingrock, 0);
|
||||
setHardness(2.0F);
|
||||
setResistance(10.0F);
|
||||
setStepSound(soundTypeStone);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getFullBlock() {
|
||||
return (BlockSlab) ModBlocks.livingrockBrickSlabFull;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getSingleBlock() {
|
||||
return (BlockSlab) ModBlocks.livingrockBrickSlab;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package vazkii.botania.common.block.decor.slabs.living;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockSlab;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.decor.slabs.BlockLivingSlab;
|
||||
|
||||
public class BlockLivingwoodPlankSlab extends BlockLivingSlab {
|
||||
|
||||
public BlockLivingwoodPlankSlab(boolean full) {
|
||||
super(full, ModBlocks.livingwood, 1);
|
||||
setHardness(2.0F);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getFullBlock() {
|
||||
return (BlockSlab) ModBlocks.livingwoodPlankSlabFull;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getSingleBlock() {
|
||||
return (BlockSlab) ModBlocks.livingwoodPlankSlab;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package vazkii.botania.common.block.decor.slabs.living;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockSlab;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.decor.slabs.BlockLivingSlab;
|
||||
|
||||
public class BlockLivingwoodSlab extends BlockLivingSlab {
|
||||
|
||||
public BlockLivingwoodSlab(boolean full) {
|
||||
super(full, ModBlocks.livingwood, 0);
|
||||
setHardness(2.0F);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getFullBlock() {
|
||||
return (BlockSlab) ModBlocks.livingwoodSlabFull;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockSlab getSingleBlock() {
|
||||
return (BlockSlab) ModBlocks.livingwoodSlab;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package vazkii.botania.common.block.decor.stairs;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
|
||||
public class BlockLivingStairs extends BlockModStairs {
|
||||
|
||||
public BlockLivingStairs(Block source, int meta) {
|
||||
super(source, meta, source.getUnlocalizedName().replaceAll("tile.", "") + meta + "Stairs");
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
package vazkii.botania.common.block.decor.stairs;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockStairs;
|
||||
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.decor.quartz.BlockSpecialQuartz;
|
||||
import vazkii.botania.common.core.BotaniaCreativeTab;
|
||||
import vazkii.botania.common.item.block.ItemBlockMod;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
|
||||
public class BlockModStairs extends BlockStairs implements ILexiconable {
|
||||
|
||||
public BlockModStairs(Block source, int meta, String name) {
|
||||
super(source, meta);
|
||||
setBlockName(name);
|
||||
setCreativeTab(BotaniaCreativeTab.INSTANCE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Block setBlockName(String par1Str) {
|
||||
GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str);
|
||||
return super.setBlockName(par1Str);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) {
|
||||
return LexiconData.decorativeBlocks;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package vazkii.botania.common.block.decor.stairs.living;
|
||||
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.decor.stairs.BlockLivingStairs;
|
||||
|
||||
public class BlockDreamwoodPlankStairs extends BlockLivingStairs {
|
||||
|
||||
public BlockDreamwoodPlankStairs() {
|
||||
super(ModBlocks.dreamwood, 1);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package vazkii.botania.common.block.decor.stairs.living;
|
||||
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.decor.stairs.BlockLivingStairs;
|
||||
|
||||
public class BlockDreamwoodStairs extends BlockLivingStairs {
|
||||
|
||||
public BlockDreamwoodStairs() {
|
||||
super(ModBlocks.dreamwood, 0);
|
||||
}
|
||||
|
||||
}
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
package vazkii.botania.common.block.decor.stairs.living;
|
||||
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.decor.stairs.BlockLivingStairs;
|
||||
|
||||
public class BlockLivingrockBrickStairs extends BlockLivingStairs {
|
||||
|
||||
public BlockLivingrockBrickStairs() {
|
||||
super(ModBlocks.livingrock, 1);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package vazkii.botania.common.block.decor.stairs.living;
|
||||
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.decor.stairs.BlockLivingStairs;
|
||||
|
||||
public class BlockLivingrockStairs extends BlockLivingStairs {
|
||||
|
||||
public BlockLivingrockStairs() {
|
||||
super(ModBlocks.livingrock, 0);
|
||||
}
|
||||
|
||||
}
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
package vazkii.botania.common.block.decor.stairs.living;
|
||||
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.decor.stairs.BlockLivingStairs;
|
||||
|
||||
public class BlockLivingwoodPlankStairs extends BlockLivingStairs {
|
||||
|
||||
public BlockLivingwoodPlankStairs() {
|
||||
super(ModBlocks.livingwood, 1);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package vazkii.botania.common.block.decor.stairs.living;
|
||||
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.decor.stairs.BlockLivingStairs;
|
||||
|
||||
public class BlockLivingwoodStairs extends BlockLivingStairs {
|
||||
|
||||
public BlockLivingwoodStairs() {
|
||||
super(ModBlocks.livingwood, 0);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -82,6 +82,20 @@ public final class BotaniaCreativeTab extends CreativeTabs {
|
||||
addItem(ModItems.signalFlare);
|
||||
|
||||
addBlock(ModBlocks.dreamwood);
|
||||
|
||||
addBlock(ModBlocks.livingwoodStairs);
|
||||
addBlock(ModBlocks.livingwoodSlab);
|
||||
addBlock(ModBlocks.livingwoodPlankStairs);
|
||||
addBlock(ModBlocks.livingwoodPlankSlab);
|
||||
addBlock(ModBlocks.livingrockStairs);
|
||||
addBlock(ModBlocks.livingrockSlab);
|
||||
addBlock(ModBlocks.livingrockBrickStairs);
|
||||
addBlock(ModBlocks.livingrockBrickSlab);
|
||||
addBlock(ModBlocks.dreamwoodStairs);
|
||||
addBlock(ModBlocks.dreamwoodSlab);
|
||||
addBlock(ModBlocks.dreamwoodPlankStairs);
|
||||
addBlock(ModBlocks.dreamwoodPlankSlab);
|
||||
|
||||
addItem(ModItems.quartz);
|
||||
if(ConfigHandler.darkQuartzEnabled) {
|
||||
addBlock(ModBlocks.darkQuartz);
|
||||
|
||||
@@ -724,27 +724,37 @@ public final class ModCrafingRecipes {
|
||||
'I', LibOreDict.ELEMENTIUM);
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.manaResource, 9, 0), new ItemStack(ModBlocks.storage, 1, 0));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.manaResource, 9, 4), new ItemStack(ModBlocks.storage, 1, 1));
|
||||
addStairsAndSlabs(ModBlocks.livingwood, 0, ModBlocks.livingwoodStairs, ModBlocks.livingwoodSlab);
|
||||
addStairsAndSlabs(ModBlocks.livingwood, 1, ModBlocks.livingwoodPlankStairs, ModBlocks.livingwoodPlankSlab);
|
||||
addStairsAndSlabs(ModBlocks.livingrock, 0, ModBlocks.livingrockStairs, ModBlocks.livingrockSlab);
|
||||
addStairsAndSlabs(ModBlocks.livingrock, 1, ModBlocks.livingrockBrickStairs, ModBlocks.livingrockBrickSlab);
|
||||
addStairsAndSlabs(ModBlocks.dreamwood, 0, ModBlocks.dreamwoodStairs, ModBlocks.dreamwoodSlab);
|
||||
addStairsAndSlabs(ModBlocks.dreamwood, 1, ModBlocks.dreamwoodPlankStairs, ModBlocks.dreamwoodPlankSlab);
|
||||
}
|
||||
|
||||
private static void addStairsAndSlabs(Block block, int meta, Block stairs, Block slab) {
|
||||
GameRegistry.addRecipe(new ItemStack(slab, 6),
|
||||
"QQQ",
|
||||
'Q', new ItemStack(block, 1, meta));
|
||||
GameRegistry.addRecipe(new ItemStack(stairs, 4),
|
||||
" Q", " QQ", "QQQ",
|
||||
'Q', new ItemStack(block, 1, meta));
|
||||
GameRegistry.addRecipe(new ItemStack(stairs, 4),
|
||||
"Q ", "QQ ", "QQQ",
|
||||
'Q', new ItemStack(block, 1, meta));
|
||||
}
|
||||
|
||||
private static IRecipe addQuartzRecipes(int meta, Item req, Block block, Block stairs, Block slab) {
|
||||
GameRegistry.addRecipe(new ItemStack(block),
|
||||
"QQ", "QQ",
|
||||
'Q', new ItemStack(ModItems.quartz, 1, meta));
|
||||
GameRegistry.addRecipe(new ItemStack(slab, 6),
|
||||
"QQQ",
|
||||
'Q', block);
|
||||
GameRegistry.addRecipe(new ItemStack(block, 2, 2),
|
||||
"Q", "Q",
|
||||
'Q', block);
|
||||
GameRegistry.addRecipe(new ItemStack(block, 1, 1),
|
||||
"Q", "Q",
|
||||
'Q', slab);
|
||||
GameRegistry.addRecipe(new ItemStack(stairs, 4),
|
||||
" Q", " QQ", "QQQ",
|
||||
'Q', block);
|
||||
GameRegistry.addRecipe(new ItemStack(stairs, 4),
|
||||
"Q ", "QQ ", "QQQ",
|
||||
'Q', block);
|
||||
addStairsAndSlabs(block, meta, stairs, slab);
|
||||
|
||||
if(req != null) {
|
||||
if(req == Items.coal)
|
||||
|
||||
+5
-5
@@ -9,17 +9,17 @@
|
||||
*
|
||||
* File Created @ [Jun 11, 2014, 1:16:59 AM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.item.block.quartz;
|
||||
package vazkii.botania.common.item.block;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemSlab;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import vazkii.botania.common.block.quartz.BlockSpecialQuartzSlab;
|
||||
import vazkii.botania.common.block.decor.slabs.BlockModSlab;
|
||||
|
||||
public class ItemBlockSpecialQuartzSlab extends ItemSlab {
|
||||
public class ItemBlockModSlab extends ItemSlab {
|
||||
|
||||
public ItemBlockSpecialQuartzSlab(Block par1) {
|
||||
super(par1, ((BlockSpecialQuartzSlab)par1).getSingleBlock(), ((BlockSpecialQuartzSlab)par1).getFullBlock(), false);
|
||||
public ItemBlockModSlab(Block par1) {
|
||||
super(par1, ((BlockModSlab)par1).getSingleBlock(), ((BlockModSlab)par1).getFullBlock(), false);
|
||||
}
|
||||
|
||||
@Override
|
||||
+2
-2
@@ -9,12 +9,12 @@
|
||||
*
|
||||
* File Created @ [Jun 11, 2014, 1:13:36 AM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.item.block.quartz;
|
||||
package vazkii.botania.common.item.block;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemMultiTexture;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import vazkii.botania.common.block.quartz.BlockSpecialQuartz;
|
||||
import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartz;
|
||||
|
||||
public class ItemBlockSpecialQuartz extends ItemMultiTexture {
|
||||
|
||||
@@ -41,7 +41,7 @@ public final class LibBlockNames {
|
||||
public static final String PLATFORM = "platform";
|
||||
public static final String ALF_PORTAL = "alfheimPortal";
|
||||
public static final String DREAM_WOOD = "dreamwood";
|
||||
|
||||
|
||||
public static final String SPECIAL_FLOWER_PREFIX = FLOWER + ".";
|
||||
|
||||
public static final String SUBTILE_PUREDAISY = "puredaisy";
|
||||
|
||||
@@ -231,6 +231,18 @@ tile.botania:dreamwood2.name=Mossy Dreamwood Planks
|
||||
tile.botania:dreamwood3.name=Framed Dreamwood
|
||||
tile.botania:dreamwood4.name=Pattern Framed Dreamwood
|
||||
tile.botania:dreamwood5.name=Glimmering Dreamwood
|
||||
tile.botania:livingwood0Stairs.name=Livingwood Stairs
|
||||
tile.botania:livingwood0Slab.name=Livingwood Slab
|
||||
tile.botania:livingwood1Stairs.name=Livingwood Plank Stairs
|
||||
tile.botania:livingwood1Slab.name=Livingwood Plank Slab
|
||||
tile.botania:livingrock0Stairs.name=Livingrock Stairs
|
||||
tile.botania:livingrock0Slab.name=Livingrock Slab
|
||||
tile.botania:livingrock1Stairs.name=Livingrock Brick Stairs
|
||||
tile.botania:livingrock1Slab.name=Livingrock Brick Slab
|
||||
tile.botania:dreamwood0Stairs.name=Dreamwood Stairs
|
||||
tile.botania:dreamwood0Slab.name=Dreamwood Slab
|
||||
tile.botania:dreamwood1Stairs.name=Dreamwood Plank Stairs
|
||||
tile.botania:dreamwood1Slab.name=Dreamwood Plank Slab
|
||||
|
||||
# FLOWER NAMES
|
||||
tile.botania:flower..name=Botania Flower
|
||||
|
||||
Reference in new issue
Block a user