diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEAlchemicalCalcinatorItemRenderer.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEAlchemicalCalcinatorItemRenderer.java index 22c6c645..48ec3a48 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEAlchemicalCalcinatorItemRenderer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEAlchemicalCalcinatorItemRenderer.java @@ -1,21 +1,19 @@ package WayofTime.alchemicalWizardry.common.renderer.block.itemRender; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.fml.client.FMLClientHandler; import org.lwjgl.opengl.GL11; import WayofTime.alchemicalWizardry.common.renderer.model.ModelAlchemicalCalcinator; -import cpw.mods.fml.client.FMLClientHandler; public class TEAlchemicalCalcinatorItemRenderer implements IItemRenderer { private ModelAlchemicalCalcinator modelConduit = new ModelAlchemicalCalcinator(); - private void renderConduitItem(RenderBlocks render, ItemStack item, float translateX, float translateY, float translateZ) + private void renderConduitItem(ItemStack item, float translateX, float translateY, float translateZ) { GL11.glPushMatrix(); GL11.glTranslatef(translateX + 0.5F, translateY + 1.5F, translateZ + 0.5F); @@ -28,7 +26,6 @@ public class TEAlchemicalCalcinatorItemRenderer implements IItemRenderer GL11.glPopMatrix(); } - /** * IItemRenderer implementation * */ @@ -64,16 +61,16 @@ public class TEAlchemicalCalcinatorItemRenderer implements IItemRenderer switch (type) { case ENTITY: - renderConduitItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + renderConduitItem(item, -0.5f, -0.5f, -0.5f); break; case EQUIPPED: - renderConduitItem((RenderBlocks) data[0], item, -0.4f, 0.50f, 0.35f); + renderConduitItem(item, -0.4f, 0.50f, 0.35f); break; case EQUIPPED_FIRST_PERSON: - renderConduitItem((RenderBlocks) data[0], item, -0.4f, 0.50f, 0.35f); + renderConduitItem(item, -0.4f, 0.50f, 0.35f); break; case INVENTORY: - renderConduitItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + renderConduitItem(item, -0.5f, -0.5f, -0.5f); break; default: } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEAltarItemRenderer.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEAltarItemRenderer.java index df81d2d7..dd3385fe 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEAltarItemRenderer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEAltarItemRenderer.java @@ -1,13 +1,14 @@ package WayofTime.alchemicalWizardry.common.renderer.block.itemRender; -import WayofTime.alchemicalWizardry.common.renderer.model.ModelBloodAltar; -import cpw.mods.fml.client.FMLClientHandler; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.fml.client.FMLClientHandler; + import org.lwjgl.opengl.GL11; +import WayofTime.alchemicalWizardry.common.renderer.model.ModelBloodAltar; + public class TEAltarItemRenderer implements IItemRenderer { private ModelBloodAltar modelBloodAltar; @@ -36,16 +37,16 @@ public class TEAltarItemRenderer implements IItemRenderer switch (type) { case ENTITY: - renderBloodAltar((RenderBlocks) data[0], item, 0, 0, 0, scale); + renderBloodAltar(item, 0, 0, 0, scale); break; case EQUIPPED: - renderBloodAltar((RenderBlocks) data[0], item, 0, 0, 0.5f, scale); + renderBloodAltar(item, 0, 0, 0.5f, scale); break; case EQUIPPED_FIRST_PERSON: - renderBloodAltar((RenderBlocks) data[0], item, +0.5f, 0.5f, +0.5f, scale); + renderBloodAltar(item, +0.5f, 0.5f, +0.5f, scale); break; case INVENTORY: - renderBloodAltar((RenderBlocks) data[0], item, -0.5f, -0.75f, -0.5f, scale); + renderBloodAltar(item, -0.5f, -0.75f, -0.5f, scale); break; default: @@ -53,7 +54,7 @@ public class TEAltarItemRenderer implements IItemRenderer } } - private void renderBloodAltar(RenderBlocks render, ItemStack item, float x, float y, float z, float scale) + private void renderBloodAltar(ItemStack item, float x, float y, float z, float scale) { GL11.glPushMatrix(); GL11.glTranslatef(x, y, z); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEBellJarItemRenderer.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEBellJarItemRenderer.java index b9826145..8954aebd 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEBellJarItemRenderer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEBellJarItemRenderer.java @@ -1,12 +1,13 @@ package WayofTime.alchemicalWizardry.common.renderer.block.itemRender; import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.fml.client.FMLClientHandler; import org.lwjgl.opengl.GL11; @@ -15,7 +16,6 @@ import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentContainerInfo; import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentStack; import WayofTime.alchemicalWizardry.common.renderer.model.ModelCrystalBelljar; import WayofTime.alchemicalWizardry.common.tileEntity.TEBellJar; -import cpw.mods.fml.client.FMLClientHandler; public class TEBellJarItemRenderer implements IItemRenderer { @@ -24,7 +24,7 @@ public class TEBellJarItemRenderer implements IItemRenderer private ResourceLocation mainResource = new ResourceLocation("alchemicalwizardry:textures/models/CrystalBelljar.png"); private ResourceLocation resourceLocation = new ResourceLocation("alchemicalwizardry:textures/models/Reagent.png"); - private void renderConduitItem(RenderBlocks render, ItemStack item, float translateX, float translateY, float translateZ) + private void renderConduitItem(ItemStack item, float translateX, float translateY, float translateZ) { GL11.glPushMatrix(); GL11.glTranslatef((float) translateX + 0.5F, (float) translateY + 1.5F, (float) translateZ + 0.5F); @@ -67,7 +67,7 @@ public class TEBellJarItemRenderer implements IItemRenderer private void renderTankContents(double x, double y, double z, int colourRed, int colourGreen, int colourBlue, int colourIntensity) { GL11.glPushMatrix(); - Tessellator tessellator = Tessellator.instance; + Tessellator tessellator = Tessellator.getInstance(); FMLClientHandler.instance().getClient().renderEngine.bindTexture(resourceLocation); GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, 10497.0F); GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, 10497.0F); @@ -79,12 +79,13 @@ public class TEBellJarItemRenderer implements IItemRenderer GL11.glDepthMask(false); - tessellator.startDrawingQuads(); - tessellator.setColorRGBA(colourRed, colourGreen, colourBlue, colourIntensity); + WorldRenderer wr = tessellator.getWorldRenderer(); + wr.startDrawingQuads(); + wr.func_178961_b(colourRed, colourGreen, colourBlue, colourIntensity); GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); - tessellator.setBrightness(240); + wr.func_178963_b(240); double x1 = -4d / 16d; double x2 = 4d / 16d; @@ -98,26 +99,26 @@ public class TEBellJarItemRenderer implements IItemRenderer double resy1 = 1.0d; double resy2 = 1.0d; - tessellator.addVertexWithUV(x1, y1, z1, resx1, resy1); - tessellator.addVertexWithUV(x2, y1, z1, resx2, resy1); - tessellator.addVertexWithUV(x2, y2, z1, resx2, resy2); - tessellator.addVertexWithUV(x1, y2, z1, resx1, resy2); - tessellator.addVertexWithUV(x1, y1, z1, resx1, resy1); - tessellator.addVertexWithUV(x1, y1, z2, resx2, resy1); - tessellator.addVertexWithUV(x1, y2, z2, resx2, resy2); - tessellator.addVertexWithUV(x1, y2, z1, resx1, resy2); - tessellator.addVertexWithUV(x1, y1, z2, resx1, resy1); - tessellator.addVertexWithUV(x2, y1, z2, resx2, resy1); - tessellator.addVertexWithUV(x2, y2, z2, resx2, resy2); - tessellator.addVertexWithUV(x1, y2, z2, resx1, resy2); - tessellator.addVertexWithUV(x2, y1, z1, resx1, resy1); - tessellator.addVertexWithUV(x2, y1, z2, resx2, resy1); - tessellator.addVertexWithUV(x2, y2, z2, resx2, resy2); - tessellator.addVertexWithUV(x2, y2, z1, resx1, resy2); - tessellator.addVertexWithUV(x1, y2, z1, resx1, resy1); - tessellator.addVertexWithUV(x2, y2, z1, resx2, resy1); - tessellator.addVertexWithUV(x2, y2, z2, resx2, resy2); - tessellator.addVertexWithUV(x1, y2, z2, resx1, resy2); + wr.addVertexWithUV(x1, y1, z1, resx1, resy1); + wr.addVertexWithUV(x2, y1, z1, resx2, resy1); + wr.addVertexWithUV(x2, y2, z1, resx2, resy2); + wr.addVertexWithUV(x1, y2, z1, resx1, resy2); + wr.addVertexWithUV(x1, y1, z1, resx1, resy1); + wr.addVertexWithUV(x1, y1, z2, resx2, resy1); + wr.addVertexWithUV(x1, y2, z2, resx2, resy2); + wr.addVertexWithUV(x1, y2, z1, resx1, resy2); + wr.addVertexWithUV(x1, y1, z2, resx1, resy1); + wr.addVertexWithUV(x2, y1, z2, resx2, resy1); + wr.addVertexWithUV(x2, y2, z2, resx2, resy2); + wr.addVertexWithUV(x1, y2, z2, resx1, resy2); + wr.addVertexWithUV(x2, y1, z1, resx1, resy1); + wr.addVertexWithUV(x2, y1, z2, resx2, resy1); + wr.addVertexWithUV(x2, y2, z2, resx2, resy2); + wr.addVertexWithUV(x2, y2, z1, resx1, resy2); + wr.addVertexWithUV(x1, y2, z1, resx1, resy1); + wr.addVertexWithUV(x2, y2, z1, resx2, resy1); + wr.addVertexWithUV(x2, y2, z2, resx2, resy2); + wr.addVertexWithUV(x1, y2, z2, resx1, resy2); tessellator.draw(); GL11.glDepthMask(true); @@ -164,16 +165,16 @@ public class TEBellJarItemRenderer implements IItemRenderer switch (type) { case ENTITY: - renderConduitItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + renderConduitItem(item, -0.5f, -0.5f, -0.5f); break; case EQUIPPED: - renderConduitItem((RenderBlocks) data[0], item, -0.4f, 0.50f, 0.35f); + renderConduitItem(item, -0.4f, 0.50f, 0.35f); break; case EQUIPPED_FIRST_PERSON: - renderConduitItem((RenderBlocks) data[0], item, -0.4f, 0.50f, 0.35f); + renderConduitItem(item, -0.4f, 0.50f, 0.35f); break; case INVENTORY: - renderConduitItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + renderConduitItem(item, -0.5f, -0.5f, -0.5f); break; default: } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEConduitItemRenderer.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEConduitItemRenderer.java index d22f9dbe..6044f3dd 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEConduitItemRenderer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEConduitItemRenderer.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.renderer.block.itemRender; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.fml.client.FMLClientHandler; @@ -15,7 +16,7 @@ public class TEConduitItemRenderer implements IItemRenderer { private ModelConduit modelConduit = new ModelConduit(); - private void renderConduitItem(RenderBlocks render, ItemStack item, float translateX, float translateY, float translateZ) + private void renderConduitItem(ItemStack item, float translateX, float translateY, float translateZ) { GL11.glPushMatrix(); GL11.glTranslatef((float) translateX + 0.5F, (float) translateY + 1.5F, (float) translateZ + 0.5F); @@ -23,7 +24,7 @@ public class TEConduitItemRenderer implements IItemRenderer FMLClientHandler.instance().getClient().renderEngine.bindTexture(test); GL11.glPushMatrix(); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - this.modelConduit.render((Entity) null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, ForgeDirection.DOWN, ForgeDirection.UP); + this.modelConduit.render((Entity) null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, EnumFacing.DOWN, EnumFacing.UP); GL11.glPopMatrix(); GL11.glPopMatrix(); } @@ -64,16 +65,16 @@ public class TEConduitItemRenderer implements IItemRenderer switch (type) { case ENTITY: - renderConduitItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + renderConduitItem(item, -0.5f, -0.5f, -0.5f); break; case EQUIPPED: - renderConduitItem((RenderBlocks) data[0], item, -0.4f, 0.50f, 0.35f); + renderConduitItem(item, -0.4f, 0.50f, 0.35f); break; case EQUIPPED_FIRST_PERSON: - renderConduitItem((RenderBlocks) data[0], item, -0.4f, 0.50f, 0.35f); + renderConduitItem(item, -0.4f, 0.50f, 0.35f); break; case INVENTORY: - renderConduitItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + renderConduitItem(item, -0.5f, -0.5f, -0.5f); break; default: } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TESpellEffectBlockItemRenderer.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TESpellEffectBlockItemRenderer.java index 9f481de1..a6d25c4a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TESpellEffectBlockItemRenderer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TESpellEffectBlockItemRenderer.java @@ -1,22 +1,21 @@ package WayofTime.alchemicalWizardry.common.renderer.block.itemRender; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fml.client.FMLClientHandler; import org.lwjgl.opengl.GL11; import WayofTime.alchemicalWizardry.common.renderer.model.ModelSpellEffectBlock; -import cpw.mods.fml.client.FMLClientHandler; public class TESpellEffectBlockItemRenderer implements IItemRenderer { private ModelSpellEffectBlock modelSpellBlock = new ModelSpellEffectBlock(); - private void renderConduitItem(RenderBlocks render, ItemStack item, float translateX, float translateY, float translateZ) + private void renderConduitItem(ItemStack item, float translateX, float translateY, float translateZ) { GL11.glPushMatrix(); GL11.glTranslatef((float) translateX + 0.5F, (float) translateY + 1.5F, (float) translateZ + 0.5F); @@ -25,7 +24,7 @@ public class TESpellEffectBlockItemRenderer implements IItemRenderer FMLClientHandler.instance().getClient().renderEngine.bindTexture(test); GL11.glPushMatrix(); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - this.modelSpellBlock.render((Entity) null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, ForgeDirection.DOWN, ForgeDirection.UP); + this.modelSpellBlock.render((Entity) null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, EnumFacing.DOWN, EnumFacing.UP); GL11.glPopMatrix(); GL11.glPopMatrix(); } @@ -66,16 +65,16 @@ public class TESpellEffectBlockItemRenderer implements IItemRenderer switch (type) { case ENTITY: - renderConduitItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + renderConduitItem(item, -0.5f, -0.5f, -0.5f); break; case EQUIPPED: - renderConduitItem((RenderBlocks) data[0], item, -0.4f, 0.50f, 0.35f); + renderConduitItem(item, -0.4f, 0.50f, 0.35f); break; case EQUIPPED_FIRST_PERSON: - renderConduitItem((RenderBlocks) data[0], item, -0.4f, 0.50f, 0.35f); + renderConduitItem(item, -0.4f, 0.50f, 0.35f); break; case INVENTORY: - renderConduitItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + renderConduitItem(item, -0.5f, -0.5f, -0.5f); break; default: } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TESpellEnhancementBlockItemRenderer.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TESpellEnhancementBlockItemRenderer.java index 0fbd6e01..c0c48ed0 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TESpellEnhancementBlockItemRenderer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TESpellEnhancementBlockItemRenderer.java @@ -1,22 +1,21 @@ package WayofTime.alchemicalWizardry.common.renderer.block.itemRender; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fml.client.FMLClientHandler; import org.lwjgl.opengl.GL11; import WayofTime.alchemicalWizardry.common.renderer.model.ModelSpellEnhancementBlock; -import cpw.mods.fml.client.FMLClientHandler; public class TESpellEnhancementBlockItemRenderer implements IItemRenderer { private ModelSpellEnhancementBlock modelSpellBlock = new ModelSpellEnhancementBlock(); - private void renderConduitItem(RenderBlocks render, ItemStack item, float translateX, float translateY, float translateZ) + private void renderConduitItem(ItemStack item, float translateX, float translateY, float translateZ) { GL11.glPushMatrix(); GL11.glTranslatef((float) translateX + 0.5F, (float) translateY + 1.5F, (float) translateZ + 0.5F); @@ -25,7 +24,7 @@ public class TESpellEnhancementBlockItemRenderer implements IItemRenderer FMLClientHandler.instance().getClient().renderEngine.bindTexture(test); GL11.glPushMatrix(); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - this.modelSpellBlock.render((Entity) null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, ForgeDirection.DOWN, ForgeDirection.UP); + this.modelSpellBlock.render((Entity) null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, EnumFacing.DOWN, EnumFacing.UP); GL11.glPopMatrix(); GL11.glPopMatrix(); } @@ -66,16 +65,16 @@ public class TESpellEnhancementBlockItemRenderer implements IItemRenderer switch (type) { case ENTITY: - renderConduitItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + renderConduitItem(item, -0.5f, -0.5f, -0.5f); break; case EQUIPPED: - renderConduitItem((RenderBlocks) data[0], item, -0.4f, 0.50f, 0.35f); + renderConduitItem(item, -0.4f, 0.50f, 0.35f); break; case EQUIPPED_FIRST_PERSON: - renderConduitItem((RenderBlocks) data[0], item, -0.4f, 0.50f, 0.35f); + renderConduitItem(item, -0.4f, 0.50f, 0.35f); break; case INVENTORY: - renderConduitItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + renderConduitItem(item, -0.5f, -0.5f, -0.5f); break; default: } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TESpellModifierBlockItemRenderer.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TESpellModifierBlockItemRenderer.java index 7fc7dc63..3ea9c791 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TESpellModifierBlockItemRenderer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TESpellModifierBlockItemRenderer.java @@ -1,22 +1,21 @@ package WayofTime.alchemicalWizardry.common.renderer.block.itemRender; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fml.client.FMLClientHandler; import org.lwjgl.opengl.GL11; import WayofTime.alchemicalWizardry.common.renderer.model.ModelSpellModifierBlock; -import cpw.mods.fml.client.FMLClientHandler; public class TESpellModifierBlockItemRenderer implements IItemRenderer { private ModelSpellModifierBlock modelSpellBlock = new ModelSpellModifierBlock(); - private void renderConduitItem(RenderBlocks render, ItemStack item, float translateX, float translateY, float translateZ) + private void renderConduitItem(ItemStack item, float translateX, float translateY, float translateZ) { GL11.glPushMatrix(); GL11.glTranslatef((float) translateX + 0.5F, (float) translateY + 1.5F, (float) translateZ + 0.5F); @@ -25,7 +24,7 @@ public class TESpellModifierBlockItemRenderer implements IItemRenderer FMLClientHandler.instance().getClient().renderEngine.bindTexture(test); GL11.glPushMatrix(); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - this.modelSpellBlock.render((Entity) null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, ForgeDirection.DOWN, ForgeDirection.UP); + this.modelSpellBlock.render((Entity) null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, EnumFacing.DOWN, EnumFacing.UP); GL11.glPopMatrix(); GL11.glPopMatrix(); } @@ -66,16 +65,16 @@ public class TESpellModifierBlockItemRenderer implements IItemRenderer switch (type) { case ENTITY: - renderConduitItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + renderConduitItem(item, -0.5f, -0.5f, -0.5f); break; case EQUIPPED: - renderConduitItem((RenderBlocks) data[0], item, -0.4f, 0.50f, 0.35f); + renderConduitItem(item, -0.4f, 0.50f, 0.35f); break; case EQUIPPED_FIRST_PERSON: - renderConduitItem((RenderBlocks) data[0], item, -0.4f, 0.50f, 0.35f); + renderConduitItem(item, -0.4f, 0.50f, 0.35f); break; case INVENTORY: - renderConduitItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + renderConduitItem(item, -0.5f, -0.5f, -0.5f); break; default: } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TESpellParadigmBlockItemRenderer.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TESpellParadigmBlockItemRenderer.java index 8bf4da84..2dc201ba 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TESpellParadigmBlockItemRenderer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TESpellParadigmBlockItemRenderer.java @@ -1,22 +1,21 @@ package WayofTime.alchemicalWizardry.common.renderer.block.itemRender; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fml.client.FMLClientHandler; import org.lwjgl.opengl.GL11; import WayofTime.alchemicalWizardry.common.renderer.model.ModelSpellParadigmBlock; -import cpw.mods.fml.client.FMLClientHandler; public class TESpellParadigmBlockItemRenderer implements IItemRenderer { private ModelSpellParadigmBlock modelSpellBlock = new ModelSpellParadigmBlock(); - private void renderConduitItem(RenderBlocks render, ItemStack item, float translateX, float translateY, float translateZ) + private void renderConduitItem(ItemStack item, float translateX, float translateY, float translateZ) { GL11.glPushMatrix(); GL11.glTranslatef((float) translateX + 0.5F, (float) translateY + 1.5F, (float) translateZ + 0.5F); @@ -24,7 +23,7 @@ public class TESpellParadigmBlockItemRenderer implements IItemRenderer FMLClientHandler.instance().getClient().renderEngine.bindTexture(test); GL11.glPushMatrix(); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - this.modelSpellBlock.render((Entity) null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, ForgeDirection.DOWN, ForgeDirection.UP); + this.modelSpellBlock.render((Entity) null, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, EnumFacing.DOWN, EnumFacing.UP); GL11.glPopMatrix(); GL11.glPopMatrix(); } @@ -65,16 +64,16 @@ public class TESpellParadigmBlockItemRenderer implements IItemRenderer switch (type) { case ENTITY: - renderConduitItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + renderConduitItem(item, -0.5f, -0.5f, -0.5f); break; case EQUIPPED: - renderConduitItem((RenderBlocks) data[0], item, -0.4f, 0.50f, 0.35f); + renderConduitItem(item, -0.4f, 0.50f, 0.35f); break; case EQUIPPED_FIRST_PERSON: - renderConduitItem((RenderBlocks) data[0], item, -0.4f, 0.50f, 0.35f); + renderConduitItem(item, -0.4f, 0.50f, 0.35f); break; case INVENTORY: - renderConduitItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + renderConduitItem(item, -0.5f, -0.5f, -0.5f); break; default: } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEWritingTableItemRenderer.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEWritingTableItemRenderer.java index b618b248..43bf7569 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEWritingTableItemRenderer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/itemRender/TEWritingTableItemRenderer.java @@ -1,13 +1,15 @@ package WayofTime.alchemicalWizardry.common.renderer.block.itemRender; -import WayofTime.alchemicalWizardry.common.renderer.model.ModelWritingTable; -import cpw.mods.fml.client.FMLClientHandler; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.fml.client.FMLClientHandler; + import org.lwjgl.opengl.GL11; +import WayofTime.alchemicalWizardry.common.renderer.model.ModelWritingTable; + public class TEWritingTableItemRenderer implements IItemRenderer { private ModelWritingTable model;