That's what I get for writing 1.6.4 mods on a 1.6.2 enviroment...

TrainerGuy22 · Oct 2, 2013 · 28f9361 · 28f9361
1 parent 2c2feec
commit 28f9361
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 23 deletions.
diff --git a/reliquary_common/xreliquary/client/ItemRendererHandgun.java b/reliquary_common/xreliquary/client/ItemRendererHandgun.java
@@ -42,7 +42,7 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
         case EQUIPPED: {
             GL11.glPushMatrix();
 
-            Minecraft.getMinecraft().renderEngine.func_110577_a(ClientReference.HANDGUN_TEXTURE);
+            Minecraft.getMinecraft().renderEngine.bindTexture(ClientReference.HANDGUN_TEXTURE);
 
             GL11.glRotatef(0F, 1.0F, 0.0F, 0.0F);
             GL11.glRotatef(176F, 0.0F, 1.0F, 0.0F);

diff --git a/reliquary_common/xreliquary/client/RenderBlazeShot.java b/reliquary_common/xreliquary/client/RenderBlazeShot.java
@@ -2,8 +2,9 @@
 
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.Render;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.entity.Entity;
+import net.minecraft.util.ResourceLocation;
+
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 import xreliquary.entities.EntityBlazeShot;
@@ -47,7 +48,7 @@ public void doRender(Entity par1Entity, double par2, double par4, double par6, f
 	}
 
 	@Override
-	protected ResourceLocation func_110775_a(Entity entity) {
+	protected ResourceLocation getEntityTexture(Entity entity) {
 		return ClientReference.BLAZE;
 	}
 }
diff --git a/reliquary_common/xreliquary/client/RenderBusterShot.java b/reliquary_common/xreliquary/client/RenderBusterShot.java
@@ -2,8 +2,9 @@
 
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.Render;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.entity.Entity;
+import net.minecraft.util.ResourceLocation;
+
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 import xreliquary.entities.EntityBusterShot;
@@ -46,7 +47,7 @@ public void doRender(Entity par1Entity, double par2, double par4, double par6, f
 	}
 
 	@Override
-	protected ResourceLocation func_110775_a(Entity entity) {
+	protected ResourceLocation getEntityTexture(Entity entity) {
 		return ClientReference.BUSTER;
 	}
 }
diff --git a/reliquary_common/xreliquary/client/RenderConcussiveShot.java b/reliquary_common/xreliquary/client/RenderConcussiveShot.java
@@ -2,8 +2,9 @@
 
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.Render;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.entity.Entity;
+import net.minecraft.util.ResourceLocation;
+
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 import xreliquary.entities.EntityConcussiveShot;
@@ -46,7 +47,7 @@ public void doRender(Entity par1Entity, double par2, double par4, double par6, f
 	}
 
 	@Override
-	protected ResourceLocation func_110775_a(Entity entity) {
+	protected ResourceLocation getEntityTexture(Entity entity) {
 		return ClientReference.CONCUSSIVE;
 	}
 }
diff --git a/reliquary_common/xreliquary/client/RenderEnderShot.java b/reliquary_common/xreliquary/client/RenderEnderShot.java
@@ -2,8 +2,9 @@
 
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.Render;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.entity.Entity;
+import net.minecraft.util.ResourceLocation;
+
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 import xreliquary.entities.EntityEnderShot;
@@ -46,7 +47,7 @@ public void doRender(Entity par1Entity, double par2, double par4, double par6, f
 	}
 
 	@Override
-	protected ResourceLocation func_110775_a(Entity entity) {
+	protected ResourceLocation getEntityTexture(Entity entity) {
 		return ClientReference.ENDER;
 	}
 }
diff --git a/reliquary_common/xreliquary/client/RenderExorcismShot.java b/reliquary_common/xreliquary/client/RenderExorcismShot.java
@@ -2,8 +2,9 @@
 
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.Render;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.entity.Entity;
+import net.minecraft.util.ResourceLocation;
+
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 import xreliquary.entities.EntityExorcismShot;
@@ -46,7 +47,7 @@ public void doRender(Entity par1Entity, double par2, double par4, double par6, f
 	}
 
 	@Override
-	protected ResourceLocation func_110775_a(Entity entity) {
+	protected ResourceLocation getEntityTexture(Entity entity) {
 		return ClientReference.EXORCISM;
 	}
 }
diff --git a/reliquary_common/xreliquary/client/RenderNeutralShot.java b/reliquary_common/xreliquary/client/RenderNeutralShot.java
@@ -2,8 +2,9 @@
 
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.Render;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.entity.Entity;
+import net.minecraft.util.ResourceLocation;
+
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 import xreliquary.entities.EntityNeutralShot;
@@ -46,7 +47,7 @@ public void doRender(Entity par1Entity, double par2, double par4, double par6, f
 	}
 
 	@Override
-	protected ResourceLocation func_110775_a(Entity entity) {
+	protected ResourceLocation getEntityTexture(Entity entity) {
 		return ClientReference.NEUTRAL;
 	}
 }
diff --git a/reliquary_common/xreliquary/client/RenderSandShot.java b/reliquary_common/xreliquary/client/RenderSandShot.java
@@ -2,8 +2,9 @@
 
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.Render;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.entity.Entity;
+import net.minecraft.util.ResourceLocation;
+
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 import xreliquary.entities.EntitySandShot;
@@ -46,7 +47,7 @@ public void doRender(Entity par1Entity, double par2, double par4, double par6, f
 	}
 
 	@Override
-	protected ResourceLocation func_110775_a(Entity entity) {
+	protected ResourceLocation getEntityTexture(Entity entity) {
 		return ClientReference.SAND;
 	}
 }
diff --git a/reliquary_common/xreliquary/client/RenderSeekerShot.java b/reliquary_common/xreliquary/client/RenderSeekerShot.java
@@ -2,8 +2,9 @@
 
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.Render;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.entity.Entity;
+import net.minecraft.util.ResourceLocation;
+
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 import xreliquary.entities.EntitySeekerShot;
@@ -46,7 +47,7 @@ public void doRender(Entity par1Entity, double par2, double par4, double par6, f
 	}
 
 	@Override
-	protected ResourceLocation func_110775_a(Entity entity) {
+	protected ResourceLocation getEntityTexture(Entity entity) {
 		return ClientReference.SEEKER;
 	}
 }
diff --git a/reliquary_common/xreliquary/client/RenderStormShot.java b/reliquary_common/xreliquary/client/RenderStormShot.java
@@ -2,8 +2,8 @@
 
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.Render;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.entity.Entity;
+import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
@@ -52,7 +52,7 @@ public void doRender(Entity par1Entity, double par2, double par4,
     }
 
 	@Override
-	protected ResourceLocation func_110775_a(Entity entity) {
+	protected ResourceLocation getEntityTexture(Entity entity) {
 		return ClientReference.STORM;
 	}
 }
diff --git a/reliquary_common/xreliquary/client/RenderThrown.java b/reliquary_common/xreliquary/client/RenderThrown.java
@@ -2,8 +2,9 @@
 
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.Render;
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.entity.Entity;
+import net.minecraft.util.ResourceLocation;
+
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 import xreliquary.lib.Reference;
@@ -43,7 +44,7 @@ public void doRender(Entity par1Entity, double par2, double par4, double par6, f
 	}
 
 	@Override
-	protected ResourceLocation func_110775_a(Entity entity) {
+	protected ResourceLocation getEntityTexture(Entity entity) {
 		return new ResourceLocation(Reference.MOD_ID, Reference.ART_PATH_ENTITIES + Reference.THROWN_ITEM_SPRITES);
 	}
 }
diff --git a/reliquary_common/xreliquary/lib/ClientReference.java b/reliquary_common/xreliquary/lib/ClientReference.java
@@ -1,6 +1,6 @@
 package xreliquary.lib;
 
-import net.minecraft.client.resources.ResourceLocation;
+import net.minecraft.util.ResourceLocation;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

diff --git a/reliquary_common/xreliquary/lib/Reference.java b/reliquary_common/xreliquary/lib/Reference.java
@@ -2,7 +2,6 @@
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.client.resources.ResourceLocation;
 
 public class Reference {
     // class for all the mod related constants