tested creation of rings with custom NBT - working!

reformatted source

2 files changed, 51 insertions, 47 deletions

diff --git a/common/darkknight/jewelrycraft/renders/TileEntityMolderRender.java b/common/darkknight/jewelrycraft/renders/TileEntityMolderRender.java
index 054cabd..2d40bf0 100644
--- a/common/darkknight/jewelrycraft/renders/TileEntityMolderRender.java
+++ b/common/darkknight/jewelrycraft/renders/TileEntityMolderRender.java
@@ -18,25 +18,25 @@ import net.minecraft.world.World;
 public class TileEntityMolderRender extends TileEntitySpecialRenderer
 {
     ModelMolder modelMolder = new ModelMolder();
-    String texture = "textures/tileentities/Molder.png";
-
+    String      texture     = "textures/tileentities/Molder.png";
+    
     @Override
-    public void renderTileEntityAt (TileEntity te, double x, double y, double z, float scale)
+    public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale)
     {
         GL11.glPushMatrix();
         GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
-        TileEntityMolder me = (TileEntityMolder)te;
-
+        TileEntityMolder me = (TileEntityMolder) te;
+        
         ResourceLocation blockTexture = new ResourceLocation("jewelrycraft", texture);
         Minecraft.getMinecraft().renderEngine.bindTexture(blockTexture);
         Tessellator tessellator = Tessellator.instance;
-
+        
         GL11.glPushMatrix();
-        GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);        
-        modelMolder.render((Entity)null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);     
-        if(me != null)
+        GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
+        modelMolder.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
+        if (me != null)
         {
-            if(me.hasMold)
+            if (me.hasMold)
             {
                 String name = me.mold.getDisplayName().substring(0, 1).toLowerCase() + me.mold.getDisplayName().trim().substring(1).replace(" M", "M");
                 String texture = "textures/items/" + name + ".png";
@@ -44,34 +44,36 @@ public class TileEntityMolderRender extends TileEntitySpecialRenderer
                 Minecraft.getMinecraft().renderEngine.bindTexture(lava);
                 me.mold.getIconIndex().getInterpolatedU(0);
                 int decal = 0;
-                if(me.mold.getItemDamage() == 0) decal = 32;
-                else if(me.mold.getItemDamage() > 0) decal = 64;
+                if (me.mold.getItemDamage() == 0)
+                    decal = 32;
+                else if (me.mold.getItemDamage() > 0)
+                    decal = 64;
                 double minu = me.mold.getIconIndex().getInterpolatedU(16);
                 double minv = me.mold.getIconIndex().getInterpolatedV(-decal);
-                double maxu = me.mold.getIconIndex().getInterpolatedU(256+16);
-                double maxv = me.mold.getIconIndex().getInterpolatedV(256-decal);
+                double maxu = me.mold.getIconIndex().getInterpolatedU(256 + 16);
+                double maxv = me.mold.getIconIndex().getInterpolatedV(256 - decal);
                 GL11.glPushMatrix();
-                GL11.glScalef(1f/16f, 1f/16f, 1f/16f);
+                GL11.glScalef(1f / 16f, 1f / 16f, 1f / 16f);
                 GL11.glDisable(GL11.GL_LIGHTING);
-
-                for(float f = 0; f <= 2; f+=0.01)
+                
+                for (float f = 0; f <= 2; f += 0.01)
                 {
-                    tessellator.startDrawingQuads(); 
-                    tessellator.addVertexWithUV(5, 21+f, 5, minu, minv);
-                    tessellator.addVertexWithUV(-5, 21+f, 5, maxu, minv);
-                    tessellator.addVertexWithUV(-5, 21+f, -5, maxu, maxv);
-                    tessellator.addVertexWithUV(5, 21+f, -5, minu, maxv);
+                    tessellator.startDrawingQuads();
+                    tessellator.addVertexWithUV(5, 21 + f, 5, minu, minv);
+                    tessellator.addVertexWithUV(-5, 21 + f, 5, maxu, minv);
+                    tessellator.addVertexWithUV(-5, 21 + f, -5, maxu, maxv);
+                    tessellator.addVertexWithUV(5, 21 + f, -5, minu, maxv);
                     tessellator.draw();
                 }
-                GL11.glEnable(GL11.GL_LIGHTING);   
+                GL11.glEnable(GL11.GL_LIGHTING);
                 GL11.glPopMatrix();
             }
         }
         GL11.glPopMatrix();
         GL11.glPopMatrix();
     }
-
-    public void adjustLightFixture (World world, int i, int j, int k, Block block)
+    
+    public void adjustLightFixture(World world, int i, int j, int k, Block block)
     {
         Tessellator tess = Tessellator.instance;
         float brightness = block.getBlockBrightness(world, i, j, k);
@@ -81,6 +83,5 @@ public class TileEntityMolderRender extends TileEntitySpecialRenderer
         tess.setColorOpaque_F(brightness, brightness, brightness);
         OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) modulousModifier, divModifier);
     }
-
-
+    
 }
diff --git a/common/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java b/common/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java
index 48e5353..616919d 100644
--- a/common/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java
+++ b/common/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java
@@ -18,49 +18,53 @@ import net.minecraft.world.World;
 public class TileEntitySmelterRender extends TileEntitySpecialRenderer
 {
     ModelSmelter modelSmelter = new ModelSmelter();
-    String texture = "textures/tileentities/Smelter.png", lava = "texture/blocks/lava_still.png";
-
+    String       texture      = "textures/tileentities/Smelter.png", lava = "texture/blocks/lava_still.png";
+    
     @Override
-    public void renderTileEntityAt (TileEntity te, double x, double y, double z, float scale)
+    public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale)
     {
         GL11.glPushMatrix();
         GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
-
+        
         ResourceLocation blockTexture = new ResourceLocation("jewelrycraft", texture);
         Tessellator tessellator = Tessellator.instance;
         ResourceLocation lava = new ResourceLocation(null, "textures/blocks/lava_still.png");
         Minecraft.getMinecraft().renderEngine.bindTexture(blockTexture);
         int block = te.getBlockMetadata();
-
+        
         GL11.glPushMatrix();
-        if(block == 0) GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
-        else if(block == 1) GL11.glRotatef(180F, 1F, 0.0F, 1F);
-        else if(block == 2) GL11.glRotatef(180F, 1.0F, 0.0F, 0.0F);
-        else if(block == 3) GL11.glRotatef(180F, 1.0F, 0.0F, 1.0F);
+        if (block == 0)
+            GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
+        else if (block == 1)
+            GL11.glRotatef(180F, 1F, 0.0F, 1F);
+        else if (block == 2)
+            GL11.glRotatef(180F, 1.0F, 0.0F, 0.0F);
+        else if (block == 3)
+            GL11.glRotatef(180F, 1.0F, 0.0F, 1.0F);
         
-        modelSmelter.render((Entity)null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
+        modelSmelter.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
         
         Minecraft.getMinecraft().renderEngine.bindTexture(lava);
         Block.lavaStill.getIcon(3, 0).getInterpolatedU(0);
         double minu = Block.lavaStill.getIcon(3, 0).getInterpolatedU(0);
-        double minv = Block.lavaStill.getIcon(3, 0).getInterpolatedV(((TileEntitySmelter)te).flow);
+        double minv = Block.lavaStill.getIcon(3, 0).getInterpolatedV(((TileEntitySmelter) te).flow);
         double maxu = Block.lavaStill.getIcon(3, 0).getInterpolatedU(256);
-        double maxv = Block.lavaStill.getIcon(3, 0).getInterpolatedV(16 + ((TileEntitySmelter)te).flow);
+        double maxv = Block.lavaStill.getIcon(3, 0).getInterpolatedV(16 + ((TileEntitySmelter) te).flow);
         GL11.glPushMatrix();
-        GL11.glScalef(1f/16f, 1f/16f, 1f/16f);
+        GL11.glScalef(1f / 16f, 1f / 16f, 1f / 16f);
         GL11.glDisable(GL11.GL_LIGHTING);
         
-        tessellator.startDrawingQuads();        
+        tessellator.startDrawingQuads();
         tessellator.addVertexWithUV(5, 20, 6, minu, minv);
         tessellator.addVertexWithUV(-5, 20, 6, maxu, minv);
         tessellator.addVertexWithUV(-5, 20, -6, maxu, maxv);
         tessellator.addVertexWithUV(5, 20, -6, minu, maxv);
-
+        
         tessellator.addVertexWithUV(-4, 20, -7, maxu, maxv);
         tessellator.addVertexWithUV(4, 20, -7, maxu, minv);
         tessellator.addVertexWithUV(4, 20, -6, minu, minv);
         tessellator.addVertexWithUV(-4, 20, -6, minu, maxv);
-
+        
         tessellator.addVertexWithUV(4, 20, 7, maxu, maxv);
         tessellator.addVertexWithUV(-4, 20, 7, maxu, minv);
         tessellator.addVertexWithUV(-4, 20, 6, minu, minv);
@@ -72,8 +76,8 @@ public class TileEntitySmelterRender extends TileEntitySpecialRenderer
         GL11.glPopMatrix();
         GL11.glPopMatrix();
     }
-
-    public void adjustLightFixture (World world, int i, int j, int k, Block block)
+    
+    public void adjustLightFixture(World world, int i, int j, int k, Block block)
     {
         Tessellator tess = Tessellator.instance;
         float brightness = block.getBlockBrightness(world, i, j, k);
@@ -83,6 +87,5 @@ public class TileEntitySmelterRender extends TileEntitySpecialRenderer
         tess.setColorOpaque_F(brightness, brightness, brightness);
         OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) modulousModifier, divModifier);
     }
-
-
+    
 }