diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java new file mode 100644 index 00000000..79032990 --- /dev/null +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java @@ -0,0 +1,57 @@ +package info.jbcs.minecraft.chisel.block; + +import info.jbcs.minecraft.chisel.api.ICarvable; +import info.jbcs.minecraft.chisel.carving.CarvableHelper; +import info.jbcs.minecraft.chisel.carving.CarvableVariation; +import info.jbcs.minecraft.chisel.client.GeneralChiselClient; +import info.jbcs.minecraft.chisel.init.ModTabs; +import info.jbcs.minecraft.chisel.utils.General; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +import java.util.Random; + +public class BlockVoidstone extends Block implements ICarvable{ + + public static IIcon iconParticle, topBottom, pillarSide; + public static CarvableHelper carvableHelper; + + public BlockVoidstone() { + super(Material.rock); + carvableHelper = new CarvableHelper(); + setHardness(5.0F); + setResistance(10.0F); + setCreativeTab(ModTabs.tabChiselBlocks); + } + + @Override + public void randomDisplayTick(World world, int x, int y, int z, Random random) + { + if(General.rand.nextInt(4) == 0 && world.isRemote) + GeneralChiselClient.spawnVoidstoneFX(world, this, x, y, z); + } + + @Override + public IIcon getIcon(int side, int meta){ + if(side == 0 || side == 1){ + return topBottom; + } else { + return pillarSide; + } + } + + @Override + public void registerBlockIcons(IIconRegister icon){ + iconParticle = icon.registerIcon("Chisel:voidstone/particles/star"); + topBottom = icon.registerIcon("Chisel:voidstone/pillar-top"); + pillarSide = icon.registerIcon("Chisel:voidstone/pillar-side"); + } + + @Override + public CarvableVariation getVariation(int metadata) { + return carvableHelper.getVariation(metadata); + } +} diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/BlockVoidstone.java b/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/BlockVoidstone.java deleted file mode 100644 index 37985ffa..00000000 --- a/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/BlockVoidstone.java +++ /dev/null @@ -1,26 +0,0 @@ -package info.jbcs.minecraft.chisel.block.tileentity; - -import info.jbcs.minecraft.chisel.client.GeneralChiselClient; -import info.jbcs.minecraft.chisel.utils.General; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; - -import java.util.Random; - -public class BlockVoidstone extends Block { - - public static IIcon iconParticle; - - protected BlockVoidstone() { - super(Material.rock); - } - - @Override - public void randomDisplayTick(World world, int x, int y, int z, Random random) - { - if(General.rand.nextInt(4) == 0 && world.isRemote) - GeneralChiselClient.spawnVoidstoneFX(world, this, x, y, z); - } -} diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java b/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java index 15739def..f519b02d 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java @@ -4,7 +4,7 @@ import info.jbcs.minecraft.chisel.Configurations; import info.jbcs.minecraft.chisel.block.BlockHolystone; import info.jbcs.minecraft.chisel.block.BlockLavastone; import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian; -import info.jbcs.minecraft.chisel.block.tileentity.BlockVoidstone; +import info.jbcs.minecraft.chisel.block.BlockVoidstone; import info.jbcs.minecraft.chisel.entity.fx.EntityBallOMossFX; import info.jbcs.minecraft.chisel.entity.fx.EntityHolystoneFX; import info.jbcs.minecraft.chisel.entity.fx.EntitySnakestoneObsidianFX; @@ -17,7 +17,6 @@ import net.minecraft.client.particle.EntityDiggingFX; import net.minecraft.client.particle.EntityLavaFX; import net.minecraft.entity.Entity; import net.minecraft.world.World; -import sun.security.krb5.Config; import java.util.Random; diff --git a/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityVoidstoneFX.java b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityVoidstoneFX.java index bca5c76f..5d5487eb 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityVoidstoneFX.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityVoidstoneFX.java @@ -1,6 +1,6 @@ package info.jbcs.minecraft.chisel.entity.fx; -import info.jbcs.minecraft.chisel.block.tileentity.BlockVoidstone; +import info.jbcs.minecraft.chisel.block.BlockVoidstone; import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java index ae5ce863..a1dd0cbd 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java +++ b/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java @@ -4,7 +4,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import info.jbcs.minecraft.chisel.Chisel; import info.jbcs.minecraft.chisel.Configurations; import info.jbcs.minecraft.chisel.block.*; -import info.jbcs.minecraft.chisel.block.tileentity.BlockVoidstone; +import info.jbcs.minecraft.chisel.block.BlockVoidstone; import info.jbcs.minecraft.chisel.carving.CarvableHelper; import info.jbcs.minecraft.chisel.carving.CarvableVariation; import info.jbcs.minecraft.chisel.carving.Carving; @@ -69,7 +69,7 @@ public class ModBlocks { public static BlockCarvable pumpkin; public static BlockCarvable jackOLantern; public static BlockCarvable voidstone; - public static BlockVoidstone voidstonePillar; + public static BlockVoidstone voidstonePillar = new BlockVoidstone(); public static Block autoChisel; public static BlockSnakestone snakestone; public static BlockSnakestone sandSnakestone; @@ -1266,8 +1266,16 @@ public class ModBlocks { if(Configurations.featureEnabled("voidstone")){ voidstone = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(5F).setStepSound(Block.soundTypeStone); voidstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.voidstone.0.desc"), 0, "voidstone/metalborder"); - voidstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.voidstone.1.desc"), 1, "voidstone/pillar-side"); - voidstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.voidstone.2.desc"), 2, voidstonePillar, 0); + voidstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.voidstone.1.desc"), 1, "voidstone/quarters"); + voidstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.voidstone.2.desc"), 2, "voidstone/skulls"); + voidstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.voidstone.3.desc"), 3, "voidstone/smooth"); + voidstone.carverHelper.register(voidstone, "voidstone"); + } + + if(Configurations.featureEnabled("voidstonePillars")){ + voidstonePillar = (BlockVoidstone) new BlockVoidstone().setStepSound(Block.soundTypeStone); + voidstonePillar.carvableHelper.addVariation(StatCollector.translateToLocal("chisel.tile.voidstone.0.desc"), 0, "voidstone/pillar-side"); + voidstonePillar.carvableHelper.register(voidstonePillar, "voidstonePillar"); } Blocks.stone.setHarvestLevel("chisel", 0, 0); diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 5d52a4a1..ba349fb4 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -11,6 +11,17 @@ item.cloudBottle.name=Cloud In A Bottle #Chisel 2 tile.autoChisel.name=Auto Chisel +#Void Stone Blocks +tile.voidstone.name=Void Stone +chisel.tile.voidstone.0.desc=Void Stone with a Metal Border +chisel.tile.voidstone.1.desc=Large Void Stone Tiles +chisel.tile.voidstone.2.desc=Skulls +chisel.tile.voidstone.3.desc=Smooth Void Stone + +#Void Stone Pillars +tile.voidstonePillar.name=Void Stone Pillar +chisel.tile.voidstonePillar.0.desc=Striped Void Stone Pillar + #Chisel 1 #Cobblestone Blocks