Working update for MC 1.8

.gitignore

@@ -78,3 +78,54 @@ local.properties
 .buildpath
 /run/
 /logs/
+# Created by https://www.gitignore.io
+
+### Intellij ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
+
+*.iml
+
+## Directory-based project format:
+.idea/
+# if you remove the above rule, at least ignore the following:
+
+# User-specific stuff:
+# .idea/workspace.xml
+# .idea/tasks.xml
+# .idea/dictionaries
+
+# Sensitive or high-churn files:
+# .idea/dataSources.ids
+# .idea/dataSources.xml
+# .idea/sqlDataSources.xml
+# .idea/dynamic.xml
+# .idea/uiDesigner.xml
+
+# Gradle:
+# .idea/gradle.xml
+# .idea/libraries
+
+# Mongo Explorer plugin:
+# .idea/mongoSettings.xml
+
+## File-based project format:
+*.ipr
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+
+libs

build.gradle

@@ -17,13 +17,12 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "1.0"
+version = "1.0.0"
 group= "com.maxpowa" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "advancedhud"
 
 minecraft {
-    version = "1.7.10-10.13.0.1180"
-    assetDir = "eclipse/assets"
+    version = "1.8-11.14.3.1450"
 }
 
 processResources

src/main/java/advancedhud/AdvancedHUD.java

@@ -1,7 +1,5 @@
 package advancedhud;
 
-import org.apache.logging.log4j.Logger;
-
 import advancedhud.api.HUDRegistry;
 import advancedhud.client.huditems.HudItemAir;
 import advancedhud.client.huditems.HudItemArmor;
@@ -15,24 +13,27 @@
 import advancedhud.client.huditems.HudItemJumpBar;
 import advancedhud.client.huditems.HudItemRecordDisplay;
 import advancedhud.client.huditems.HudItemTooltips;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import net.minecraftforge.fml.common.FMLCommonHandler;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import org.apache.logging.log4j.Logger;
+
+
+
 
-@Mod(modid = "AdvancedHUD", name = "AdvancedHUD", version = "Version [@VERSION@] for @MCVERSION@")
+@Mod(modid = "AdvancedHUD", name = "AdvancedHUD", version = "1.1.0")
 public class AdvancedHUD {
 
-    public static String MC_VERSION = "@MCVERSION@";
-    public static String ADVHUD_VERSION = "@VERSION@";
+    public static String MC_VERSION = "1.8";
+    public static String ADVHUD_VERSION = "1.1.0";
     public static Logger log;
 
-    @EventHandler
+    @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         log = event.getModLog();
     }
-    @EventHandler
+    @Mod.EventHandler
     public void onInit(FMLInitializationEvent event) {
         FMLCommonHandler.instance().bus().register(new TickHandler());
         FMLCommonHandler.instance().bus().register(new KeyRegister());

src/main/java/advancedhud/KeyRegister.java

@@ -1,15 +1,13 @@
 package advancedhud;
 
+import advancedhud.client.ui.GuiAdvancedHUDConfiguration;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.settings.KeyBinding;
-
+import net.minecraftforge.fml.client.registry.ClientRegistry;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.gameevent.InputEvent;
 import org.lwjgl.input.Keyboard;
 
-import advancedhud.client.ui.GuiAdvancedHUDConfiguration;
-import cpw.mods.fml.client.registry.ClientRegistry;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent;
-
 public class KeyRegister {
 
     public static KeyBinding config = new KeyBinding("\u00a7aAdvancedHUD Config", Keyboard.KEY_H, "key.categories.misc");
@@ -19,7 +17,7 @@ public class KeyRegister {
     }
 
     @SubscribeEvent
-    public void KeyInputEvent(KeyInputEvent event) {
+    public void KeyInputEvent(InputEvent.KeyInputEvent event) {
         Minecraft mc = Minecraft.getMinecraft();
         if (config.isPressed() && mc.currentScreen == null) {
             mc.displayGuiScreen(new GuiAdvancedHUDConfiguration());

src/main/java/advancedhud/TickHandler.java

@@ -1,21 +1,19 @@
 package advancedhud;
 
-import net.minecraft.client.Minecraft;
 import advancedhud.api.HUDRegistry;
 import advancedhud.client.GuiAdvancedHUD;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.TickEvent.Phase;
-import cpw.mods.fml.common.gameevent.TickEvent.RenderTickEvent;
-import cpw.mods.fml.common.gameevent.TickEvent.Type;
+import net.minecraft.client.Minecraft;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.gameevent.TickEvent;
 
 public class TickHandler {
 
     private boolean ticked = false;
     private boolean firstload = true;
 
     @SubscribeEvent
-    public void RenderTickEvent(RenderTickEvent event) {
-        if ((event.type == Type.RENDER || event.type == Type.CLIENT) && event.phase == Phase.END) {
+    public void RenderTickEvent(TickEvent.RenderTickEvent event) {
+        if ((event.type == TickEvent.Type.RENDER || event.type == TickEvent.Type.CLIENT) && event.phase == TickEvent.Phase.END) {
             Minecraft mc = Minecraft.getMinecraft();
             if (!ticked && mc.ingameGUI != null) {
                 mc.ingameGUI = new GuiAdvancedHUD(mc);

src/main/java/advancedhud/api/RenderAssist.java

@@ -1,22 +1,22 @@
 package advancedhud.api;
 
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
 import net.minecraft.client.renderer.entity.RenderItem;
 import net.minecraft.client.renderer.texture.DynamicTexture;
 import net.minecraft.client.resources.IResource;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-
 import org.apache.batik.transcoder.TranscoderException;
 import org.apache.batik.transcoder.TranscoderInput;
 import org.apache.batik.transcoder.TranscoderOutput;
 import org.apache.batik.transcoder.image.ImageTranscoder;
 import org.lwjgl.opengl.GL11;
 
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+
 /**
  * 
  * Some methods which are usually in GuiIngame, but since we don't have<br>
@@ -37,20 +37,21 @@ public static void drawUnfilledCircle(float posX, float posY, float radius, int
         float f1 = (color >> 16 & 255) / 255.0F;
         float f2 = (color >> 8 & 255) / 255.0F;
         float f3 = (color & 255) / 255.0F;
-        Tessellator tessellator = Tessellator.instance;
+        Tessellator tessellator = Tessellator.getInstance();
+        final WorldRenderer renderer = tessellator.getWorldRenderer();
         GL11.glEnable(GL11.GL_BLEND);
         GL11.glDisable(GL11.GL_TEXTURE_2D);
         GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
         GL11.glColor4f(f1, f2, f3, f);
-        tessellator.startDrawing(GL11.GL_LINE_LOOP);
+        renderer.startDrawing(GL11.GL_LINE_LOOP);
         for (int i = 0; i < num_segments; i++) {
             double theta = 2.0f * Math.PI * i / num_segments;// get the current
                                                              // angle
 
             double x = radius * Math.cos(theta);// calculate the x component
             double y = radius * Math.sin(theta);// calculate the y component
 
-            tessellator.addVertex(x + posX, y + posY, 0.0D);// output vertex
+            renderer.addVertex(x + posX, y + posY, 0.0D);// output vertex
 
         }
         tessellator.draw();
@@ -114,16 +115,17 @@ public static void drawUnfilledRect(float x1, float g, float x2, float y2, int c
         float f1 = (color >> 16 & 255) / 255.0F;
         float f2 = (color >> 8 & 255) / 255.0F;
         float f3 = (color & 255) / 255.0F;
-        Tessellator tessellator = Tessellator.instance;
+        Tessellator tessellator = Tessellator.getInstance();
+        final WorldRenderer renderer = tessellator.getWorldRenderer();
         GL11.glEnable(GL11.GL_BLEND);
         GL11.glDisable(GL11.GL_TEXTURE_2D);
         GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
         GL11.glColor4f(f1, f2, f3, f);
-        tessellator.startDrawing(GL11.GL_LINE_LOOP);
-        tessellator.addVertex(x1, y2, 0.0D);
-        tessellator.addVertex(x2, y2, 0.0D);
-        tessellator.addVertex(x2, g, 0.0D);
-        tessellator.addVertex(x1, g, 0.0D);
+        renderer.startDrawing(GL11.GL_LINE_LOOP);
+        renderer.addVertex(x1, y2, 0.0D);
+        renderer.addVertex(x2, y2, 0.0D);
+        renderer.addVertex(x2, g, 0.0D);
+        renderer.addVertex(x1, g, 0.0D);
         tessellator.draw();
         GL11.glEnable(GL11.GL_TEXTURE_2D);
         GL11.glDisable(GL11.GL_BLEND);
@@ -167,12 +169,13 @@ public static void drawVerticalLine(int par1, int par2, int par3, int par4) {
      */
     public static void drawTexturedModalRect(float x, float y, float u, float v, float width, float height) {
         float f = 0.00390625F;
-        Tessellator tessellator = Tessellator.instance;
-        tessellator.startDrawingQuads();
-        tessellator.addVertexWithUV(x + 0, y + height, RenderAssist.zLevel, (u + 0) * f, (v + height) * f);
-        tessellator.addVertexWithUV(x + width, y + height, RenderAssist.zLevel, (u + width) * f, (v + height) * f);
-        tessellator.addVertexWithUV(x + width, y + 0, RenderAssist.zLevel, (u + width) * f, (v + 0) * f);
-        tessellator.addVertexWithUV(x + 0, y + 0, RenderAssist.zLevel, (u + 0) * f, (v + 0) * f);
+        Tessellator tessellator = Tessellator.getInstance();
+        final WorldRenderer renderer = tessellator.getWorldRenderer();
+        renderer.startDrawingQuads();
+        renderer.addVertexWithUV(x + 0, y + height, RenderAssist.zLevel, (u + 0) * f, (v + height) * f);
+        renderer.addVertexWithUV(x + width, y + height, RenderAssist.zLevel, (u + width) * f, (v + height) * f);
+        renderer.addVertexWithUV(x + width, y + 0, RenderAssist.zLevel, (u + width) * f, (v + 0) * f);
+        renderer.addVertexWithUV(x + 0, y + 0, RenderAssist.zLevel, (u + 0) * f, (v + 0) * f);
         tessellator.draw();
     }
 
@@ -223,16 +226,17 @@ public static void drawRect(float g, float h, float i, float j, int color) {
         float f1 = (color >> 16 & 255) / 255.0F;
         float f2 = (color >> 8 & 255) / 255.0F;
         float f3 = (color & 255) / 255.0F;
-        Tessellator tessellator = Tessellator.instance;
+        Tessellator tessellator = Tessellator.getInstance();
+        final WorldRenderer renderer = tessellator.getWorldRenderer();
         GL11.glEnable(GL11.GL_BLEND);
         GL11.glDisable(GL11.GL_TEXTURE_2D);
         GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
         GL11.glColor4f(f1, f2, f3, f);
-        tessellator.startDrawingQuads();
-        tessellator.addVertex(g, j, 0.0D);
-        tessellator.addVertex(i, j, 0.0D);
-        tessellator.addVertex(i, h, 0.0D);
-        tessellator.addVertex(g, h, 0.0D);
+        renderer.startDrawingQuads();
+        renderer.addVertex(g, j, 0.0D);
+        renderer.addVertex(i, j, 0.0D);
+        renderer.addVertex(i, h, 0.0D);
+        renderer.addVertex(g, h, 0.0D);
         tessellator.draw();
         GL11.glEnable(GL11.GL_TEXTURE_2D);
         GL11.glDisable(GL11.GL_BLEND);
@@ -243,7 +247,7 @@ public static void drawRect(float g, float h, float i, float j, int color) {
      * location.
      */
     public static void renderInventorySlot(int slot, int x, int y, float partialTick, Minecraft mc) {
-        RenderItem itemRenderer = new RenderItem();
+        RenderItem itemRenderer = mc.getRenderItem();
         ItemStack itemstack = mc.thePlayer.inventory.mainInventory[slot];
         x += 91;
         y += 12;
@@ -258,14 +262,16 @@ public static void renderInventorySlot(int slot, int x, int y, float partialTick
                 GL11.glScalef(1.0F / f2, (f2 + 1.0F) / 2.0F, 1.0F);
                 GL11.glTranslatef(-(x + 8), -(y + 12), 0.0F);
             }
+            itemRenderer.func_180450_b(itemstack,x,y);
 
-            itemRenderer.renderItemAndEffectIntoGUI(mc.fontRenderer, mc.getTextureManager(), itemstack, x, y);
+            //itemRenderer.renderItemAndEffectIntoGUI(mc.fontRendererObj, mc.getTextureManager(), itemstack, x, y);
 
             if (f1 > 0.0F) {
                 GL11.glPopMatrix();
             }
+            itemRenderer.func_180453_a(mc.fontRendererObj, itemstack, x, y, null);
 
-            itemRenderer.renderItemOverlayIntoGUI(mc.fontRenderer, mc.getTextureManager(), itemstack, x, y);
+            //itemRenderer.renderItemOverlayIntoGUI(mc.fontRenderer, mc.getTextureManager(), itemstack, x, y);
         }
     }