Diamond block locale and also fixed bracing

This commit is contained in:
Fenn committed 2014-06-26 15:45:31 +01:00
1 parent 8d5568509a
commit 3700724133
7 files changed
+60 -49

No files matched your search

@@ -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);
@@ -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();
@@ -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));
}
@@ -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)
{
@@ -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);
@@ -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();