Fixed a few things as well as working towards having the ability to translate everything

9 files changed, 61 insertions, 15 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiGuide.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiGuide.java
index 48542f8..a0b2e6d 100644
--- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiGuide.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiGuide.java
@@ -184,7 +184,6 @@ public class GuiGuide extends GuiContainer
         GL11.glRotatef(160.0F, 1.0F, 0.0F, 0.0F);
         if (rotate) GL11.glRotatef(rot, 0.0F, 1.0F, 0.0F);
         else{
-            // GL11.glRotatef(entityitem.getEntityItem().getItemDamage() % 8 / 8F * 360, 0, 1, 0);
             GL11.glRotatef(xRot, 1, 0, 0);
             GL11.glRotatef(yRot, 0, 1, 0);
             GL11.glRotatef(zRot, 0, 0, 1);
diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTab.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTab.java
index e2632ac..8258cfc 100644
--- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTab.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTab.java
@@ -8,16 +8,14 @@ public abstract class GuiTab extends GuiRectangle
 {
     protected int values;
     protected int del;
-    protected String name;
     
     /**
      * @param name
      * @param id
      */
-    public GuiTab(String name, int id)
+    public GuiTab(int id)
     {
         super(-62, 10 + 19 * id, 19, 18);
-        this.name = name;
         values = 0;
         del = 0;
     }
@@ -27,7 +25,7 @@ public abstract class GuiTab extends GuiRectangle
      */
     public String getName()
     {
-        return name;
+        return "";
     }
     
     /**
diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabBlocks.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabBlocks.java
index 478d5fe..ef7eabc 100644
--- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabBlocks.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabBlocks.java
@@ -6,9 +6,11 @@ import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
 import darkknight.jewelrycraft.block.BlockList;
 import darkknight.jewelrycraft.client.Page;
 import darkknight.jewelrycraft.item.ItemList;
+import darkknight.jewelrycraft.util.Variables;
 
 public class GuiTabBlocks extends GuiTab
 {
@@ -18,7 +20,12 @@ public class GuiTabBlocks extends GuiTab
      */
     public GuiTabBlocks(int id)
     {
-        super("Blocks", id);
+        super(id);
+    }
+    
+    public String getName()
+    {
+        return StatCollector.translateToLocal("guide." + Variables.MODID + ".tab.blocks");
     }
     
     /**
diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabGemsAndIngots.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabGemsAndIngots.java
index 4648ecd..33d94f2 100644
--- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabGemsAndIngots.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabGemsAndIngots.java
@@ -3,8 +3,10 @@ package darkknight.jewelrycraft.client.gui;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
 import org.lwjgl.opengl.GL11;
 import darkknight.jewelrycraft.util.JewelrycraftUtil;
+import darkknight.jewelrycraft.util.Variables;
 
 public class GuiTabGemsAndIngots extends GuiTab
 {
@@ -14,7 +16,12 @@ public class GuiTabGemsAndIngots extends GuiTab
      */
     public GuiTabGemsAndIngots(int id)
     {
-        super("Gems, ores and ingots", id);
+        super(id);
+    }
+    
+    public String getName()
+    {
+        return StatCollector.translateToLocal("guide." + Variables.MODID + ".tab.misc");
     }
     
     /**
diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabIntroduction.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabIntroduction.java
index de84af0..25acf21 100644
--- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabIntroduction.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabIntroduction.java
@@ -2,14 +2,16 @@ package darkknight.jewelrycraft.client.gui;
 
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
 import darkknight.jewelrycraft.client.Page;
 import darkknight.jewelrycraft.item.ItemList;
+import darkknight.jewelrycraft.util.Variables;
 
 public class GuiTabIntroduction extends GuiTab
 {
     public GuiTabIntroduction(int id)
     {
-        super("Introduction", id);
+        super(id);
     }
     
     @Override
@@ -17,6 +19,11 @@ public class GuiTabIntroduction extends GuiTab
     {
         return new ItemStack(ItemList.ring);
     }
+    
+    public String getName()
+    {
+        return StatCollector.translateToLocal("guide." + Variables.MODID + ".tab.introduction");
+    }
    
     @Override
     public void drawBackground(GuiGuide gui, int x, int y, int page)
@@ -26,15 +33,15 @@ public class GuiTabIntroduction extends GuiTab
         switch(page)
         {
             case 1:
-                text = "Welcome to Jewelrycraft 2! This mod is about making jewelry that you can modify to your own will. To find out how to create a jewelry, please consult the book and look at the Smelter block. To add modifiers to it you need to perform a ritual. To see how to do that, look at the Cursed Eye";
+                text = StatCollector.translateToLocal("guide." + Variables.MODID + ".tab.introduction."+page);
                 Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
                 break;
             case 2:
-                text = "block in this guide. Please be aware that even if you can add anything as a modifier and can have multiple modifiers on one jewelry, this mod is still in alpha and does not have that many modifiers implemented and currently don't have any different effects depending on";
+                text = StatCollector.translateToLocal("guide." + Variables.MODID + ".tab.introduction."+page);
                 Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
                 break;
             case 3:
-                text = "the gem used. To see what modifiers are currently implemented, just look in the Modifiers tab located in this guide (it is the one with the blaze powder as an icon). This mod was made by OnyxDarkKnight and the help of domi1819, pau101, Damien Hazard, boni and MineMarteen.";
+                text = StatCollector.translateToLocal("guide." + Variables.MODID + ".tab.introduction."+page);
                 Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text);
                 break;
         }
diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabItems.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabItems.java
index 02f9640..a1818e0 100644
--- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabItems.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabItems.java
@@ -6,11 +6,13 @@ import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
 import darkknight.jewelrycraft.block.BlockList;
 import darkknight.jewelrycraft.client.Page;
 import darkknight.jewelrycraft.item.ItemList;
 import darkknight.jewelrycraft.util.JewelryNBT;
 import darkknight.jewelrycraft.util.JewelrycraftUtil;
+import darkknight.jewelrycraft.util.Variables;
 
 public class GuiTabItems extends GuiTab
 {
@@ -20,7 +22,12 @@ public class GuiTabItems extends GuiTab
      */
     public GuiTabItems(int id)
     {
-        super("Items", id);
+        super(id);
+    }
+    
+    public String getName()
+    {
+        return StatCollector.translateToLocal("guide." + Variables.MODID + ".tab.items");
     }
     
     /**
diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabModifiers.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabModifiers.java
index 79f7e92..1f92967 100644
--- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabModifiers.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabModifiers.java
@@ -3,14 +3,21 @@ package darkknight.jewelrycraft.client.gui;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
 import darkknight.jewelrycraft.client.Page;
+import darkknight.jewelrycraft.util.Variables;
 
 public class GuiTabModifiers extends GuiTab
 {
     int maxPages;
     public GuiTabModifiers(int id)
     {
-        super("Modifiers", id);
+        super(id);
+    }
+    
+    public String getName()
+    {
+        return StatCollector.translateToLocal("guide." + Variables.MODID + ".tab.modifiers");
     }
     
     /**
diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabOresToIngots.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabOresToIngots.java
index 074ab64..b7f192d 100644
--- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabOresToIngots.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabOresToIngots.java
@@ -4,9 +4,11 @@ import java.util.HashMap;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
 import org.lwjgl.opengl.GL11;
 import darkknight.jewelrycraft.block.BlockList;
 import darkknight.jewelrycraft.util.JewelrycraftUtil;
+import darkknight.jewelrycraft.util.Variables;
 
 public class GuiTabOresToIngots extends GuiTab
 {
@@ -15,7 +17,12 @@ public class GuiTabOresToIngots extends GuiTab
      */
     public GuiTabOresToIngots(int id)
     {
-        super("Ores to ingots", id);
+        super(id);
+    }
+    
+    public String getName()
+    {
+        return StatCollector.translateToLocal("guide." + Variables.MODID + ".tab.oretoingot");
     }
     
     /**
diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabRitual.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabRitual.java
index ffb58d9..5e3c06e 100644
--- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabRitual.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabRitual.java
@@ -4,14 +4,21 @@ import org.lwjgl.opengl.GL11;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
 import darkknight.jewelrycraft.block.BlockList;
 import darkknight.jewelrycraft.client.Page;
+import darkknight.jewelrycraft.util.Variables;
 
 public class GuiTabRitual extends GuiTab
 {
     public GuiTabRitual(int id)
     {
-        super("Ritual", id);
+        super(id);
+    }
+    
+    public String getName()
+    {
+        return StatCollector.translateToLocal("guide." + Variables.MODID + ".tab.ritual");
     }
     
     @Override