diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java index 84267773..a4b1dd9d 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java @@ -480,18 +480,18 @@ public class ChiselBlocks { blockDiamond = (BlockBeaconBase) new BlockBeaconBase().setHardness(5F).setResistance(10F).setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("diamond", Blocks.diamond_block, 0, 0); - blockDiamond.carverHelper.addVariation("Embossed diamond block", 1, "diamond/terrain-diamond-embossed"); - blockDiamond.carverHelper.addVariation("Diamond block with panel", 2, "diamond/terrain-diamond-gem"); - blockDiamond.carverHelper.addVariation("Diamond cells", 3, "diamond/terrain-diamond-cells"); - blockDiamond.carverHelper.addVariation("Diamonds in purple obsidian", 4, "diamond/terrain-diamond-space"); - blockDiamond.carverHelper.addVariation("Diamonds in obsidian", 5, "diamond/terrain-diamond-spaceblack"); - blockDiamond.carverHelper.addVariation("Diamond block simple", 6, "diamond/terrain-diamond-simple"); - blockDiamond.carverHelper.addVariation("Bismuth", 7, "diamond/a1-blockdiamond-bismuth"); - blockDiamond.carverHelper.addVariation("Crushed diamond", 8, "diamond/a1-blockdiamond-crushed"); - blockDiamond.carverHelper.addVariation("Small diamond blocks", 9, "diamond/a1-blockdiamond-four"); - blockDiamond.carverHelper.addVariation("Small ornate diamond blocks", 10, "diamond/a1-blockdiamond-fourornate"); - blockDiamond.carverHelper.addVariation("Zelda diamond block", 11, "diamond/a1-blockdiamond-zelda"); - blockDiamond.carverHelper.addVariation("Diamond block with ornate layer", 12, "diamond/a1-blockdiamond-ornatelayer"); + blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.0.desc"), 1, "diamond/terrain-diamond-embossed"); + blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.1.desc"), 2, "diamond/terrain-diamond-gem"); + blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.2.desc"), 3, "diamond/terrain-diamond-cells"); + blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.3.desc"), 4, "diamond/terrain-diamond-space"); + blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.4.desc"), 5, "diamond/terrain-diamond-spaceblack"); + blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.5.desc"), 6, "diamond/terrain-diamond-simple"); + blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.6.desc"), 7, "diamond/a1-blockdiamond-bismuth"); + blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.7.desc"), 8, "diamond/a1-blockdiamond-crushed"); + blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.8.desc"), 9, "diamond/a1-blockdiamond-four"); + blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.9.desc"), 10, "diamond/a1-blockdiamond-fourornate"); + blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.10.desc"), 11, "diamond/a1-blockdiamond-zelda"); + blockDiamond.carverHelper.addVariation(I18n.format("chisel.tile.diamond.11.desc"), 12, "diamond/a1-blockdiamond-ornatelayer"); blockDiamond.carverHelper.register(blockDiamond, "diamond"); Carving.chisel.registerOre("diamond", "blockDiamond"); } @@ -1045,7 +1045,6 @@ public class ChiselBlocks } - if(Chisel.featureEnabled("templeBlock")) { blockTemple = (BlockCarvable) new BlockEldritch().setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundTempleFootstep); diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java index af9e5af9..5ee48397 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java @@ -16,8 +16,8 @@ public class ChiselModCompatibility { try { - if((cl = Class.forName(name)) != null) - action(); + if((cl = Class.forName(name)) != null) + action(); } catch(ClassNotFoundException e) { e.printStackTrace(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java index eea82847..8f256519 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java +++ b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java @@ -1,32 +1,27 @@ package info.jbcs.minecraft.chisel.carving; -import info.jbcs.minecraft.chisel.ChiselBlocks; -import info.jbcs.minecraft.chisel.block.BlockMarbleStairs; -import info.jbcs.minecraft.chisel.carving.CarvableVariation.CarvableVariationCTM; +import cpw.mods.fml.common.registry.GameRegistry; import info.jbcs.minecraft.chisel.Chisel; import info.jbcs.minecraft.chisel.block.BlockMarbleSlab; -import info.jbcs.minecraft.chisel.item.ItemCarvable; +import info.jbcs.minecraft.chisel.carving.CarvableVariation.CarvableVariationCTM; import info.jbcs.minecraft.chisel.client.render.CTM; import info.jbcs.minecraft.chisel.client.render.TextureSubmap; +import info.jbcs.minecraft.chisel.item.ItemCarvable; import info.jbcs.minecraft.utilities.GeneralClient; +import net.minecraft.block.Block; +import net.minecraft.block.BlockPane; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import net.minecraft.block.Block; -import net.minecraft.block.BlockPane; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.client.resources.I18n; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; - public class CarvableHelper { static final String modName = "chisel"; @@ -424,8 +419,10 @@ public class CarvableHelper { for(CarvableVariation variation : variations) { - if(variation.metadata == 1){ - System.out.println(variation.description); + + if(variation.metadata == 1) + { + // System.out.println(variation.description); } list.add(new ItemStack(block, 1, variation.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 3226e047..e1ed7846 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java @@ -128,8 +128,8 @@ public class GeneralChiselClient Minecraft.getMinecraft().effectRenderer.addEffect(res); } } - public static - void spawnBallOMossFX(World world, double x, double y, double z) + + public static void spawnBallOMossFX(World world, double x, double y, double z) { if(Chisel.particlesTickrate == 0 || tick++ % Chisel.particlesTickrate == 0) { diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksCTM.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksCTM.java index 2f14d653..14844492 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksCTM.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksCTM.java @@ -140,8 +140,7 @@ public class RenderBlocksCTM extends RenderBlocks tessellator.addVertexWithUV(0.0, 0.0, 0.0, i.getMinU(), i.getMaxV()); tessellator.addVertexWithUV(0.0, 0.0, 1.0, i.getMaxU(), i.getMaxV()); tessellator.addVertexWithUV(0.0, 1.0, 1.0, i.getMaxU(), i.getMinV()); - } - else + } else { int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 4); @@ -164,8 +163,7 @@ public class RenderBlocksCTM extends RenderBlocks tessellator.addVertexWithUV(1.0, 0.0, 1.0, i.getMaxU(), i.getMaxV()); tessellator.addVertexWithUV(1.0, 0.0, 0.0, i.getMinU(), i.getMaxV()); tessellator.addVertexWithUV(1.0, 1.0, 0.0, i.getMinU(), i.getMinV()); - } - else + } else { int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 5); @@ -188,8 +186,7 @@ public class RenderBlocksCTM extends RenderBlocks tessellator.addVertexWithUV(1.0, 0.0, 0.0, i.getMaxU(), i.getMaxV()); tessellator.addVertexWithUV(0.0, 0.0, 0.0, i.getMinU(), i.getMaxV()); tessellator.addVertexWithUV(0.0, 1.0, 0.0, i.getMinU(), i.getMinV()); - } - else + } else { int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 2); @@ -213,8 +210,7 @@ public class RenderBlocksCTM extends RenderBlocks tessellator.addVertexWithUV(0.0, 0.0, 1.0, i.getMinU(), i.getMaxV()); tessellator.addVertexWithUV(1.0, 0.0, 1.0, i.getMaxU(), i.getMaxV()); tessellator.addVertexWithUV(1.0, 1.0, 1.0, i.getMaxU(), i.getMinV()); - } - else + } else { int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 3); @@ -237,8 +233,7 @@ public class RenderBlocksCTM extends RenderBlocks tessellator.addVertexWithUV(0.0, 0.0, 0.0, i.getMinU(), i.getMinV()); tessellator.addVertexWithUV(1.0, 0.0, 0.0, i.getMaxU(), i.getMinV()); tessellator.addVertexWithUV(1.0, 0.0, 1.0, i.getMaxU(), i.getMaxV()); - } - else + } else { int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 0); @@ -261,8 +256,7 @@ public class RenderBlocksCTM extends RenderBlocks tessellator.addVertexWithUV(0.0, 1.0, 1.0, i.getMinU(), i.getMaxV()); tessellator.addVertexWithUV(1.0, 1.0, 1.0, i.getMaxU(), i.getMaxV()); tessellator.addVertexWithUV(1.0, 1.0, 0.0, i.getMaxU(), i.getMinV()); - } - else + } else { int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 1); diff --git a/src/main/java/info/jbcs/minecraft/chisel/item/ItemChisel.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemChisel.java index 0a246eb4..c766d306 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/item/ItemChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemChisel.java @@ -156,8 +156,8 @@ public class ItemChisel extends ItemTool try { //TODO chisel left click thingy - // Packet packet = Chisel.packet.create(Packets.CHISELED).writeInt(x).writeInt(y).writeInt(z); - // Chisel.packet.sendToAllAround(packet, new TargetPoint(player.dimension, x, y, z, 30.0f)); + // Packet packet = Chisel.packet.create(Packets.CHISELED).writeInt(x).writeInt(y).writeInt(z); + // Chisel.packet.sendToAllAround(packet, new TargetPoint(player.dimension, x, y, z, 30.0f)); } catch(Exception e) { e.printStackTrace(); diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 0ac52d08..bf86ca22 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -8,6 +8,9 @@ item.cloudBottle.name=Cloud In A Bottle # Block localizations # Have fun! ~zombiepig333 +#Cobblestone Blocks +chisel.tile.cobblestone.name=Cobblestone + #Marble Blocks chisel.tile.marble.name=Marble chisel.tile.marble.0.desc=Raw Marble @@ -235,6 +238,24 @@ chisel.tile.blockFactory.13.desc=Weared Metal Wall with Openings for Ventilation chisel.tile.blockFactory.14.desc=Rusty Metal Plates chisel.tile.blockFactory.15.desc=Weared Metal Column +#Diamond blocks +chisel.tile.diamond.name=Diamond Block +chisel.tile.diamond.0.desc=Embossed diamond block +chisel.tile.diamond.1.desc=Diamond block with panel +chisel.tile.diamond.2.desc=Diamond cells +chisel.tile.diamond.3.desc=Diamonds in purple obsidian +chisel.tile.diamond.4.desc=Diamonds in obsidian +chisel.tile.diamond.5.desc=Diamond block simple +chisel.tile.diamond.6.desc=Bismuth +chisel.tile.diamond.7.desc=Crushed diamond +chisel.tile.diamond.8.desc=Small diamond blocks +chisel.tile.diamond.9.desc=Small ornate diamond blocks +chisel.tile.diamond.10.desc=Zelda diamond block +chisel.tile.diamond.11.desc=Diamond block with ornate layer + + + + # Creative Tab localizations itemGroup.tabChisel=Chisel Blocks