Made a few modifications to some classes, added earrings and bracelets. Improved coloring algorithm and balanced the Thieving Glove

1 files changed, 34 insertions, 15 deletions

diff --git a/java/darkknight/jewelrycraft/events/ScreenHandler.java b/java/darkknight/jewelrycraft/events/ScreenHandler.java
index 300968a..237a452 100644
--- a/java/darkknight/jewelrycraft/events/ScreenHandler.java
+++ b/java/darkknight/jewelrycraft/events/ScreenHandler.java
@@ -1,8 +1,11 @@
 package darkknight.jewelrycraft.events;
 
+import java.awt.Color;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiChat;
+import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
@@ -11,6 +14,7 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
 
 import org.lwjgl.input.Keyboard;
+import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.client.registry.ClientRegistry;
@@ -36,22 +40,37 @@ public class ScreenHandler extends Gui
     }
     
     @SubscribeEvent
-    public void onEntityJoinWorld(RenderGameOverlayEvent event)
+    public void renderScreen(RenderGameOverlayEvent event)
     {
-        if (cooldown == 0)
-        {
-            JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo());
-            cooldown = 500;
-        }        
-        else cooldown--;
-
-        if (event.isCancelable() || event.type != ElementType.EXPERIENCE || tagCache == null) return;
-        mc.renderEngine.bindTexture(new ResourceLocation("jewelrycraft", "textures/gui/curses1.png"));
-        for (String l : JewelrycraftUtil.curses.keySet())
-            if (tagCache.getInteger(l) > -1){
-                int tag = JewelrycraftUtil.curses.get(l) + 1;
-                int size = 32;
-                this.drawTexturedModalRect(2 + size * tag, 2, tag % size * size, tag / size * size, size, size);
+        if (event.isCancelable() || event.type != ElementType.ALL || tagCache == null) return; 
+        mc.renderEngine.bindTexture(new ResourceLocation("jewelrycraft", "textures/gui/curses.png"));
+        int count = 0;
+        for (String l : JewelrycraftUtil.curseValues.keySet())
+            if (tagCache.getByte(l) > -1){
+                int tag = JewelrycraftUtil.curseValues.get(l);
+                int size = 16;
+                this.drawRect(0, (size + 6) * count, 24 + mc.fontRenderer.getStringWidth(l.split(":")[1]), 4 + (size + 6) * count + 16, 0xaf000000);
+                this.drawRect(2, 2 + (size + 6) * count, 22 + mc.fontRenderer.getStringWidth(l.split(":")[1]), 2 + (size + 6) * count + 16, 0x95700064);           
+                count++;
+            }     
+        count = 0;   
+        for (String l : JewelrycraftUtil.curseValues.keySet())
+            if (tagCache.getByte(l) > -1){
+                int tag = JewelrycraftUtil.curseValues.get(l);
+                int size = 16;
+                GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+                GL11.glDisable(GL11.GL_LIGHTING);    
+                this.drawTexturedModalRect(2, 2 + (size + 6) * count, tag % size * size, tag / size * size, size, size);           
+                count++; 
             }
+        count = 0;   
+        for (String l : JewelrycraftUtil.curseValues.keySet())
+            if (tagCache.getByte(l) > -1){   
+                int tag = JewelrycraftUtil.curseValues.get(l);
+                int size = 16;
+                mc.fontRenderer.drawStringWithShadow(l.split(":")[1], 20, 7 + (size + 6) * count, 16777215);
+                if(tagCache.getByte(l) == 1) mc.fontRenderer.drawStringWithShadow("Leech", mc.fontRenderer.getStringWidth(l.split(":")[1]) + 25, 7 + (size + 6) * count, 16777215);
+                count++;
+            }  
     }
 }
\ No newline at end of file