diff --git a/build.gradle b/build.gradle index aba98c79..bc72e9da 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { } apply plugin: 'forge' -version = "2.1.2" +version = "2.1.3" group = "info.jbcs.minecraft.chisel" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Chisel 2" diff --git a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java index 3a8d8f72..74f33adf 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java @@ -52,7 +52,7 @@ public class Chisel public static final String MOD_ID = "chisel"; public static final BlockCarvable.SoundType soundTempleFootstep = new BlockCarvable.SoundType("dig.stone", MOD_ID + ":step.templeblock", 1.0f, 1.0f); public static final String MOD_NAME = "Chisel 2"; - public static final String VERSION = "2.1.0.1"; + public static final String VERSION = "2.1.3"; public static final BlockCarvable.SoundType soundHolystoneFootstep = new BlockCarvable.SoundType("holystone", 1.0f, 1.0f); public static final BlockCarvable.SoundType soundMetalFootstep = new BlockCarvable.SoundType("metal", 1.0f, 1.0f); public static boolean multipartLoaded = false; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java index 84daa521..6e12ca11 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java @@ -2,79 +2,75 @@ package info.jbcs.minecraft.chisel.block; import info.jbcs.minecraft.chisel.Chisel; import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; - -import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -public class BlockAutoChisel extends BlockContainer -{ - public BlockAutoChisel() - { +import java.util.Random; + +public class BlockAutoChisel extends BlockContainer { + public BlockAutoChisel() { super(Material.rock); setHardness(1F); } @Override - public int getRenderType(){ + public int getRenderType() { return -1; } @Override - public boolean isOpaqueCube(){ + public boolean isOpaqueCube() { return false; } @Override - public boolean renderAsNormalBlock(){ + public boolean renderAsNormalBlock() { return false; } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int metadata, float x1, float y1, float z1){ + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int metadata, float x1, float y1, float z1) { TileEntity tile = world.getTileEntity(x, y, z); - if(world.isRemote) + if (world.isRemote) return true; - if(tile !=null && tile instanceof TileEntityAutoChisel) - player.openGui(Chisel.instance, 1, world, x, y, z); + if (tile != null && tile instanceof TileEntityAutoChisel) + player.openGui(Chisel.instance, 1, world, x, y, z); return true; } @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6){ + public void breakBlock(World world, int x, int y, int z, Block block, int par6) { dropItems(world, x, y, z); super.breakBlock(world, x, y, z, block, par6); } - private void dropItems(World world, int x, int y, int z){ + private void dropItems(World world, int x, int y, int z) { Random random = new Random(); TileEntity tileEntity = world.getTileEntity(x, y, z); - if(!(tileEntity instanceof IInventory)){ + if (!(tileEntity instanceof TileEntityAutoChisel)) { return; } - IInventory inventory = (IInventory) tileEntity; + TileEntityAutoChisel inventory = (TileEntityAutoChisel) world.getTileEntity(x, y, z); - for(int c = 0; c < inventory.getSizeInventory(); c++){ + for (int c = 0; c < inventory.getSizeInventory(); c++) { ItemStack stack = inventory.getStackInSlot(c); - if(stack != null && stack.stackSize > 0){ + if (stack != null && stack.stackSize > 0) { float rx = random.nextFloat() * 0.8F + 0.1F; float ry = random.nextFloat() * 0.8F + 0.1F; float rz = random.nextFloat() * 0.8F + 0.1F; EntityItem entityItem = new EntityItem(world, x + rx, y + ry, z + rz, stack); - if(stack.hasTagCompound()){ + if (stack.hasTagCompound()) { entityItem.getEntityItem().setTagCompound((NBTTagCompound) stack.getTagCompound().copy()); } @@ -89,8 +85,7 @@ public class BlockAutoChisel extends BlockContainer } @Override - public TileEntity createNewTileEntity(World var1, int var2) - { + public TileEntity createNewTileEntity(World var1, int var2) { return new TileEntityAutoChisel(); } } diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java index 3fec8008..52d60935 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java @@ -3,17 +3,16 @@ 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.Chisel; - -import java.util.List; - import info.jbcs.minecraft.chisel.init.ModTabs; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; +import java.util.List; + public class BlockMarbleTexturedOre extends BlockTexturedOre implements ICarvable { public CarvableHelper carverHelper; @@ -27,6 +26,14 @@ public class BlockMarbleTexturedOre extends BlockTexturedOre implements ICarvabl setCreativeTab(ModTabs.tabChiselBlocks); } + public BlockMarbleTexturedOre(Material mat, Block block) { + super(mat, block); + + carverHelper = new CarvableHelper(); + + setCreativeTab(ModTabs.tabChiselBlocks); + } + @Override public IIcon getIcon(int side, int metadata) { diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java index 79032990..f9a79ded 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java @@ -1,57 +1,10 @@ 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 BlockMarbleTexturedOre { -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); + public BlockVoidstone(Material mat, String baseIcon) { + super(mat, baseIcon); } } diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstonePillar.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstonePillar.java new file mode 100644 index 00000000..0e196c76 --- /dev/null +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstonePillar.java @@ -0,0 +1,58 @@ +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 BlockVoidstonePillar extends Block implements ICarvable { + + public static IIcon iconParticle, topBottom, pillarSide; + public static CarvableHelper carvableHelper; + + public BlockVoidstonePillar() { + 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/client/GeneralChiselClient.java b/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java index f701d164..d3bf89f7 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.BlockVoidstone; +import info.jbcs.minecraft.chisel.block.BlockVoidstonePillar; import info.jbcs.minecraft.chisel.entity.fx.EntityBallOMossFX; import info.jbcs.minecraft.chisel.entity.fx.EntityHolystoneFX; import info.jbcs.minecraft.chisel.entity.fx.EntitySnakestoneObsidianFX; @@ -22,22 +22,19 @@ import net.minecraft.world.World; import java.util.Random; -public class GeneralChiselClient -{ +public class GeneralChiselClient { public static Random rand = new Random(); public static int tick = 0; - public static void spawnLavastoneFX(World world, BlockLavastone block, int x, int y, int z) - { - if(Configurations.particlesTickrate != 0 && tick++ % Configurations.particlesTickrate != 0) return; + public static void spawnLavastoneFX(World world, BlockLavastone block, int x, int y, int z) { + if (Configurations.particlesTickrate != 0 && tick++ % Configurations.particlesTickrate != 0) return; float f = 0.15F; double x1 = x + rand.nextDouble() * (block.getBlockBoundsMaxX() - block.getBlockBoundsMinX() - f * 2.0F) + f + block.getBlockBoundsMinX(); double y1 = y + rand.nextDouble() * (block.getBlockBoundsMaxY() - block.getBlockBoundsMinY() - f * 2.0F) + f + block.getBlockBoundsMinY(); double z1 = z + rand.nextDouble() * (block.getBlockBoundsMaxZ() - block.getBlockBoundsMinZ() - f * 2.0F) + f + block.getBlockBoundsMinZ(); - switch(rand.nextInt(6)) - { + switch (rand.nextInt(6)) { case 0: y1 = y + block.getBlockBoundsMinY() - f; y--; @@ -64,7 +61,7 @@ public class GeneralChiselClient break; } - if(world.getBlock(x, y, z).isOpaqueCube()) return; + if (world.getBlock(x, y, z).isOpaqueCube()) return; EntityLavaFX res = new EntityLavaFX(world, x1, y1, z1); // res.motionX=x1-x-0.5; @@ -78,17 +75,15 @@ public class GeneralChiselClient Minecraft.getMinecraft().effectRenderer.addEffect(res); } - public static void spawnHolystoneFX(World world, BlockHolystone block, int x, int y, int z) - { - if(Configurations.particlesTickrate != 0 && tick++ % Configurations.particlesTickrate != 0) return; + public static void spawnHolystoneFX(World world, BlockHolystone block, int x, int y, int z) { + if (Configurations.particlesTickrate != 0 && tick++ % Configurations.particlesTickrate != 0) return; float f = 0.15F; double x1 = x + rand.nextDouble() * (block.getBlockBoundsMaxX() - block.getBlockBoundsMinX() - f * 2.0F) + f + block.getBlockBoundsMinX(); double y1 = y + rand.nextDouble() * (block.getBlockBoundsMaxY() - block.getBlockBoundsMinY() - f * 2.0F) + f + block.getBlockBoundsMinY(); double z1 = z + rand.nextDouble() * (block.getBlockBoundsMaxZ() - block.getBlockBoundsMinZ() - f * 2.0F) + f + block.getBlockBoundsMinZ(); - switch(rand.nextInt(6)) - { + switch (rand.nextInt(6)) { case 0: y1 = y + block.getBlockBoundsMinY() - f; y--; @@ -115,30 +110,27 @@ public class GeneralChiselClient break; } - if(world.getBlock(x, y, z).isOpaqueCube()) return; + if (world.getBlock(x, y, z).isOpaqueCube()) return; EntityHolystoneFX res = new EntityHolystoneFX(world, block, x1, y1, z1); Minecraft.getMinecraft().effectRenderer.addEffect(res); } - public static void spawnSnakestoneObsidianFX(World world, BlockSnakestoneObsidian block, int x, int y, int z) - { - if(Configurations.particlesTickrate == 0 || tick++ % Configurations.particlesTickrate == 0) - { + public static void spawnSnakestoneObsidianFX(World world, BlockSnakestoneObsidian block, int x, int y, int z) { + if (Configurations.particlesTickrate == 0 || tick++ % Configurations.particlesTickrate == 0) { EntitySnakestoneObsidianFX res = new EntitySnakestoneObsidianFX(world, block, x, y, z); Minecraft.getMinecraft().effectRenderer.addEffect(res); } } - public static void spawnVoidstoneFX(World world, BlockVoidstone block, int x, int y, int z){ - if(Configurations.particlesTickrate == 0 || tick++ % Configurations.particlesTickrate == 0){ + public static void spawnVoidstoneFX(World world, BlockVoidstonePillar block, int x, int y, int z) { + if (Configurations.particlesTickrate == 0 || tick++ % Configurations.particlesTickrate == 0) { float f = 0.15F; double x1 = x + rand.nextDouble() * (block.getBlockBoundsMaxX() - block.getBlockBoundsMinX() - f * 2.0F) + f + block.getBlockBoundsMinX(); double y1 = y + rand.nextDouble() * (block.getBlockBoundsMaxY() - block.getBlockBoundsMinY() - f * 2.0F) + f + block.getBlockBoundsMinY(); double z1 = z + rand.nextDouble() * (block.getBlockBoundsMaxZ() - block.getBlockBoundsMinZ() - f * 2.0F) + f + block.getBlockBoundsMinZ(); - switch(rand.nextInt(6)) - { + switch (rand.nextInt(6)) { case 0: y1 = y + block.getBlockBoundsMinY() - f; y--; @@ -165,27 +157,24 @@ public class GeneralChiselClient break; } - if(world.getBlock(x, y, z).isOpaqueCube()) return; + if (world.getBlock(x, y, z).isOpaqueCube()) return; EntityVoidstoneFX res = new EntityVoidstoneFX(world, block, x, y, z); Minecraft.getMinecraft().effectRenderer.addEffect(res); } } - public static void spawnBallOMossFX(World world, double x, double y, double z) - { - if(Configurations.particlesTickrate == 0 || tick++ % Configurations.particlesTickrate == 0) - { + public static void spawnBallOMossFX(World world, double x, double y, double z) { + if (Configurations.particlesTickrate == 0 || tick++ % Configurations.particlesTickrate == 0) { EntityBallOMossFX res = new EntityBallOMossFX(world, x, y, z); Minecraft.getMinecraft().effectRenderer.addEffect(res); } } - public static EntityDiggingFX addBlockHitEffects(World world, int x, int y, int z, int side) - { + public static EntityDiggingFX addBlockHitEffects(World world, int x, int y, int z, int side) { Block block = world.getBlock(x, y, z); - if(block.isAir(world, x, y, z)) + if (block.isAir(world, x, y, z)) return null; EffectRenderer renderer = Minecraft.getMinecraft().effectRenderer; @@ -195,8 +184,7 @@ public class GeneralChiselClient double d1 = y + rand.nextDouble() * (block.getBlockBoundsMaxY() - block.getBlockBoundsMinY() - f * 2.0F) + f + block.getBlockBoundsMinY(); double d2 = z + rand.nextDouble() * (block.getBlockBoundsMaxZ() - block.getBlockBoundsMinZ() - f * 2.0F) + f + block.getBlockBoundsMinZ(); - switch(side) - { + switch (side) { case 0: d1 = y + block.getBlockBoundsMinY() - f; break; @@ -228,15 +216,12 @@ public class GeneralChiselClient return res; } - public static void spawnChiselEffect(int x, int y, int z, String sound) - { + public static void spawnChiselEffect(int x, int y, int z, String sound) { World world = Minecraft.getMinecraft().theWorld; - for(int side = 0; side < 6; side++) - { - for(int j = 0; j < 16; j++) - { + for (int side = 0; side < 6; side++) { + for (int j = 0; j < 16; j++) { EntityDiggingFX fx = addBlockHitEffects(Minecraft.getMinecraft().theWorld, x, y, z, side); - if(fx == null) return; + if (fx == null) return; fx.multipleParticleScaleBy(0.25f + 0.5f * rand.nextFloat()); fx.multiplyVelocity(0.3f * rand.nextFloat()); @@ -246,17 +231,16 @@ public class GeneralChiselClient GeneralClient.playChiselSound(world, x, y, z, sound); } - public static void speedupPlayer(World world, Entity entity, double concreteVelocity) - { + public static void speedupPlayer(World world, Entity entity, double concreteVelocity) { double velocity = Math.sqrt(entity.motionX * entity.motionX + entity.motionZ * entity.motionZ); - if(!(entity instanceof EntityPlayerSP)) return; - if(velocity == 0) return; - if(velocity >= Configurations.concreteVelocity) return; + if (!(entity instanceof EntityPlayerSP)) return; + if (velocity == 0) return; + if (velocity >= Configurations.concreteVelocity) return; EntityPlayerSP player = (EntityPlayerSP) entity; - if(Math.abs(player.movementInput.moveForward) < 0.75f && Math.abs(player.movementInput.moveStrafe) < 0.75f) + if (Math.abs(player.movementInput.moveForward) < 0.75f && Math.abs(player.movementInput.moveStrafe) < 0.75f) return; entity.motionX = Configurations.concreteVelocity * entity.motionX / velocity; 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 5d5487eb..04f24580 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.BlockVoidstone; +import info.jbcs.minecraft.chisel.block.BlockVoidstonePillar; import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; @@ -8,11 +8,11 @@ import net.minecraft.world.World; public class EntityVoidstoneFX extends EntityFX { + static final float fadetime = 20F; float initialScale; float angleOffset; - static final float fadetime = 20F; - public EntityVoidstoneFX(World world, BlockVoidstone blockVoidstone, double x, double y, double z){ + public EntityVoidstoneFX(World world, BlockVoidstonePillar blockVoidstone, double x, double y, double z) { super(world, x, y, z, 0, 0, 0); initialScale = 1.0F + 1.0F * General.rand.nextFloat(); angleOffset = rand.nextFloat() * 360; @@ -30,17 +30,17 @@ public class EntityVoidstoneFX extends EntityFX { } @Override - public int getFXLayer(){ + public int getFXLayer() { return 1; } @Override - public void renderParticle(Tessellator tesselator, float partialTick, float rotX, float rotXZ, float rotZ, float rotYZ, float rotXY){ + public void renderParticle(Tessellator tesselator, float partialTick, float rotX, float rotXZ, float rotZ, float rotYZ, float rotXY) { particleScale = 0.25F + initialScale * (float) Math.sin(particleAge + angleOffset) / 180.0F; - if(particleAge < fadetime){ + if (particleAge < fadetime) { particleAlpha = particleAge / fadetime; - } else if(particleAge + fadetime >= particleMaxAge){ + } else if (particleAge + fadetime >= particleMaxAge) { particleAlpha = (particleMaxAge - particleAge) / fadetime; } else { particleAlpha = 1.0F; @@ -50,8 +50,8 @@ public class EntityVoidstoneFX extends EntityFX { } @Override - public void onUpdate(){ - if(particleAge++ >= particleMaxAge){ + public void onUpdate() { + if (particleAge++ >= particleMaxAge) { setDead(); } } 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 934fe194..380608e5 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java +++ b/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java @@ -69,8 +69,8 @@ public class ModBlocks { public static BlockCarvable laboratory; public static BlockCarvable pumpkin; public static BlockCarvable jackOLantern; - public static BlockCarvable voidstone; - public static BlockVoidstone voidstonePillar = new BlockVoidstone(); + public static BlockVoidstone voidstone; + public static BlockVoidstonePillar voidstonePillar = new BlockVoidstonePillar(); public static Block autoChisel; public static BlockPresent present; public static BlockSnakestone snakestone; @@ -1319,11 +1319,10 @@ public class ModBlocks { } if(Configurations.featureEnabled("voidstone")){ - voidstone = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(5F).setStepSound(Block.soundTypeStone); + voidstone = (BlockVoidstone) new BlockVoidstone(Material.rock, Chisel.MOD_ID + ":void").setHardness(2.0F).setResistance(5F).setStepSound(Block.soundTypeStone); voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.0.desc"), 0, "voidstone/metalborder"); voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.1.desc"), 1, "voidstone/quarters"); - voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.2.desc"), 2, "voidstone/skulls"); - voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.3.desc"), 3, "voidstone/smooth"); + voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.2.desc"), 2, "voidstone/smooth"); voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.12.desc"), 12, "voidstone/rune"); voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.13.desc"), 13, "voidstone/raw"); voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.14.desc"), 14, "voidstone/eye"); @@ -1333,8 +1332,8 @@ public class ModBlocks { } if(Configurations.featureEnabled("voidstonePillars")){ - voidstonePillar = (BlockVoidstone) new BlockVoidstone().setStepSound(Block.soundTypeStone); - voidstonePillar.carvableHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.0.desc"), 0, "voidstone/pillar-side"); + voidstonePillar = (BlockVoidstonePillar) new BlockVoidstonePillar().setStepSound(Block.soundTypeStone); + voidstonePillar.carvableHelper.addVariation(StatCollector.translateToLocal("tile.voidstonePillar.0.desc"), 0, "voidstone/pillar-side"); voidstonePillar.carvableHelper.register(voidstonePillar, "voidstonePillar"); Carving.chisel.registerOre("voidstonePillar", "voidstonePillar"); } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 792cc121..1a0892ad 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -25,10 +25,9 @@ tile.leaves.12.desc=Christmas Lights #Void Stone Blocks tile.voidstone.name=Void Stone -tile.voidstone.0.desc=Void stone with a metal norder +tile.voidstone.0.desc=Void stone with a metal border tile.voidstone.1.desc=Large void stone tiles -tile.voidstone.2.desc=Skulls -tile.voidstone.3.desc=Smooth void stone +tile.voidstone.2.desc=Smooth void stone tile.voidstone.12.desc=Runic void stone tile.voidstone.13.desc=Raw void stone tile.voidstone.14.desc=Eye diff --git a/src/main/resources/assets/chisel/textures/blocks/void.png b/src/main/resources/assets/chisel/textures/blocks/void.png new file mode 100644 index 00000000..6ddbcd16 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/void.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/void.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/void.png.mcmeta new file mode 100644 index 00000000..ebad5d7b --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/void.png.mcmeta @@ -0,0 +1,18 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 4, + 3, + 2, + 1, + 0, + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/bevel.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/bevel.png index ebe0318a..ceccd547 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/voidstone/bevel.png and b/src/main/resources/assets/chisel/textures/blocks/voidstone/bevel.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/eye.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/eye.png index 0e9d390a..eee61a24 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/voidstone/eye.png and b/src/main/resources/assets/chisel/textures/blocks/voidstone/eye.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/metalborder.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/metalborder.png index 315ad47c..8d77c1df 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/voidstone/metalborder.png and b/src/main/resources/assets/chisel/textures/blocks/voidstone/metalborder.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/pillar-top.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/pillar-top.png index eb538644..1415a12d 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/voidstone/pillar-top.png and b/src/main/resources/assets/chisel/textures/blocks/voidstone/pillar-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/pillar-top.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/voidstone/pillar-top.png.mcmeta new file mode 100644 index 00000000..ebad5d7b --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/voidstone/pillar-top.png.mcmeta @@ -0,0 +1,18 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 4, + 3, + 2, + 1, + 0, + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/quarters.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/quarters.png index b2ac4a1f..f61a6c5d 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/voidstone/quarters.png and b/src/main/resources/assets/chisel/textures/blocks/voidstone/quarters.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/raw.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/raw.png index 1230a6b0..5ae2c24b 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/voidstone/raw.png and b/src/main/resources/assets/chisel/textures/blocks/voidstone/raw.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/rune.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/rune.png index 03e475aa..506c54c0 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/voidstone/rune.png and b/src/main/resources/assets/chisel/textures/blocks/voidstone/rune.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/skulls.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/skulls.png deleted file mode 100644 index 7170e0d2..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/voidstone/skulls.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/smooth.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/smooth.png index f172650b..4160cbae 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/voidstone/smooth.png and b/src/main/resources/assets/chisel/textures/blocks/voidstone/smooth.png differ