update mappings version, and forge build

SlimeKnights · Mar 11, 2015 · f0bfe7c · f0bfe7c
1 parent f246f78
commit f0bfe7c
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 16 deletions.
diff --git a/build.gradle b/build.gradle
@@ -78,6 +78,7 @@ version = "${config.minecraft_version}-${artifact_version}"
 
 minecraft {
     version = config.minecraft_version + "-" + config.forge_version
+    mappings = config.mappings
     runDir = 'run'
     replace '${version}', project.version
 }

diff --git a/build.properties b/build.properties
@@ -1,4 +1,5 @@
 mod_version=0.4
 minecraft_version=1.8
-forge_version=11.14.0.1251-1.8
+forge_version=11.14.1.1334
+mappings=snapshot_20150310
 
diff --git a/src/mantle/Mantle.java b/src/mantle/Mantle.java
@@ -4,6 +4,8 @@
 import static mantle.lib.CoreRepo.modId;
 import static mantle.lib.CoreRepo.modName;
 import static mantle.lib.CoreRepo.modVersion;
+
+import LZMA.LzmaInputStream;
 import mantle.books.BookData;
 import mantle.books.BookDataStore;
 import mantle.common.IDDumps;
@@ -67,7 +69,6 @@ public void preInit (FMLPreInitializationEvent evt)
         CoreConfig.loadConfiguration(evt.getModConfigurationDirectory());
 
         NetworkRegistry.INSTANCE.registerGuiHandler(instance, proxy);
-
         mantleBook = (Manual) new Manual().setUnlocalizedName("mantle.manual");
         GameRegistry.registerItem(mantleBook, "mantleBook");
 

diff --git a/src/mantle/books/external/ZipLoader.java b/src/mantle/books/external/ZipLoader.java
@@ -114,7 +114,7 @@ else if (bl != null)
                                                 {
                                                     try
                                                     {
-                                                        is.setTagCompound(JsonToNBT.func_180713_a(bis.tags));
+                                                        is.setTagCompound(JsonToNBT.getTagFromJson(bis.tags));
                                                     }
                                                     catch (Exception e1)
                                                     {

diff --git a/src/mantle/client/pages/ContentsTablePage.java b/src/mantle/client/pages/ContentsTablePage.java
@@ -48,7 +48,7 @@ public void renderContentLayer (int localWidth, int localHeight, boolean isTrans
         manual.renderitem.zLevel = 100;
         for (int i = 0; i < icons.length; i++)
         {
-            manual.renderitem.func_175042_a(icons[i], localWidth + 16, localHeight + 18 * i + 18);
+            manual.renderitem.renderItemIntoGUI(icons[i], localWidth + 16, localHeight + 18 * i + 18);
             int yOffset = 18;
             if (isTranslatable)
                 iconText[i] = StatCollector.translateToLocal(iconText[i]);

diff --git a/src/mantle/client/pages/CraftingPage.java b/src/mantle/client/pages/CraftingPage.java
@@ -56,25 +56,25 @@ public void drawCraftingPage (String info, ItemStack[] icons, int recipeSize, in
 
         if (recipeSize == 2)
         {
-            manual.renderitem.func_180450_b(icons[0], (localWidth + 126) / 2, (localHeight + 68) / 2);
+            manual.renderitem.renderItemAndEffectIntoGUI(icons[0], (localWidth + 126) / 2, (localHeight + 68) / 2);
             if (icons[0].stackSize > 1)
-                manual.renderitem.func_180453_a(manual.fonts, icons[0], (localWidth + 126) / 2, (localHeight + 68) / 2, String.valueOf(icons[0].stackSize));
+                manual.renderitem.renderItemOverlayIntoGUI(manual.fonts, icons[0], (localWidth + 126) / 2, (localHeight + 68) / 2, String.valueOf(icons[0].stackSize));
             for (int i = 0; i < icons.length - 1; i++)
             {
                 if (icons[i + 1] != null)
-                    manual.renderitem.func_180450_b(icons[i + 1], (localWidth + 14 + 36 * (i % 2)) / 2, (localHeight + 36 * (i / 2) + 52) / 2);
+                    manual.renderitem.renderItemAndEffectIntoGUI(icons[i + 1], (localWidth + 14 + 36 * (i % 2)) / 2, (localHeight + 36 * (i / 2) + 52) / 2);
             }
         }
 
         if (recipeSize == 3)
         {
-            manual.renderitem.func_180450_b(icons[0], (localWidth + 138) / 2, (localHeight + 70) / 2);
+            manual.renderitem.renderItemAndEffectIntoGUI(icons[0], (localWidth + 138) / 2, (localHeight + 70) / 2);
             if (icons[0].stackSize > 1)
-                manual.renderitem.func_180453_a(manual.fonts, icons[0], (localWidth + 126) / 2, (localHeight + 68) / 2, String.valueOf(icons[0].stackSize));
+                manual.renderitem.renderItemOverlayIntoGUI(manual.fonts, icons[0], (localWidth + 126) / 2, (localHeight + 68) / 2, String.valueOf(icons[0].stackSize));
             for (int i = 0; i < icons.length - 1; i++)
             {
                 if (icons[i + 1] != null)
-                    manual.renderitem.func_180450_b(icons[i + 1], (localWidth - 2 + 36 * (i % 3)) / 2, (localHeight + 36 * (i / 3) + 34) / 2);
+                    manual.renderitem.renderItemAndEffectIntoGUI(icons[i + 1], (localWidth - 2 + 36 * (i % 3)) / 2, (localHeight + 36 * (i / 3) + 34) / 2);
             }
         }
 

diff --git a/src/mantle/client/pages/FurnacePage.java b/src/mantle/client/pages/FurnacePage.java
@@ -42,12 +42,12 @@ public void renderContentLayer (int localWidth, int localHeight, boolean isTrans
         RenderHelper.enableGUIStandardItemLighting();
         manual.renderitem.zLevel = 100;
 
-        manual.renderitem.func_180450_b(MantleClientRegistry.getManualIcon("coal"), (localWidth + 38) / 2, (localHeight + 110) / 2);
-        manual.renderitem.func_180450_b(icons[0], (localWidth + 106) / 2, (localHeight + 74) / 2);
-        manual.renderitem.func_180450_b(icons[1], (localWidth + 38) / 2, (localHeight + 38) / 2);
+        manual.renderitem.renderItemAndEffectIntoGUI(MantleClientRegistry.getManualIcon("coal"), (localWidth + 38) / 2, (localHeight + 110) / 2);
+        manual.renderitem.renderItemAndEffectIntoGUI(icons[0], (localWidth + 106) / 2, (localHeight + 74) / 2);
+        manual.renderitem.renderItemAndEffectIntoGUI(icons[1], (localWidth + 38) / 2, (localHeight + 38) / 2);
 
         if (icons[0].stackSize > 1)
-            manual.renderitem.func_180453_a(manual.fonts, icons[0], (localWidth + 106) / 2, (localHeight + 74) / 2, String.valueOf(icons[0].stackSize));
+            manual.renderitem.renderItemOverlayIntoGUI(manual.fonts, icons[0], (localWidth + 106) / 2, (localHeight + 74) / 2, String.valueOf(icons[0].stackSize));
 
         manual.renderitem.zLevel = 0;
         GL11.glScalef(0.5F, 0.5F, 0.5F);

diff --git a/src/mantle/client/pages/SidebarPage.java b/src/mantle/client/pages/SidebarPage.java
@@ -52,7 +52,7 @@ public void renderContentLayer (int localWidth, int localHeight, boolean isTrans
             {
                 iconText[i] = StatCollector.translateToLocal(iconText[i]);
             }
-            manual.renderitem.func_175042_a(icons[i], localWidth + 8, localHeight + 18 * i + offset);
+            manual.renderitem.renderItemIntoGUI(icons[i], localWidth + 8, localHeight + 18 * i + offset);
             int yOffset = 39;
             if (iconText[i].length() > 40)
                 yOffset = 34;

diff --git a/src/mantle/common/IDDumps.java b/src/mantle/common/IDDumps.java
@@ -32,7 +32,7 @@ public static void dump(){
         }
         if (CoreConfig.dumpEnchantIDs)
         {
-            for (Enchantment e : Enchantment.enchantmentsList)
+            for (Enchantment e : Enchantment.enchantmentsBookList)
             {
                 if (e != null && e.getName() != null)
                 {