diff --git a/lwjgl-rundir/_eagstorage.g.dat b/lwjgl-rundir/_eagstorage.g.dat index cb90c93..d8b05c8 100644 Binary files a/lwjgl-rundir/_eagstorage.g.dat and b/lwjgl-rundir/_eagstorage.g.dat differ diff --git a/lwjgl-rundir/_eagstorage.p.dat b/lwjgl-rundir/_eagstorage.p.dat index 2aeb2bf..17a6c7a 100644 Binary files a/lwjgl-rundir/_eagstorage.p.dat and b/lwjgl-rundir/_eagstorage.p.dat differ diff --git a/lwjgl-rundir/eaglercraft.jar b/lwjgl-rundir/eaglercraft.jar index 59baf97..a8889a7 100644 Binary files a/lwjgl-rundir/eaglercraft.jar and b/lwjgl-rundir/eaglercraft.jar differ diff --git a/src/main/java/net/minecraft/src/ItemRenderer.java b/src/main/java/net/minecraft/src/ItemRenderer.java index 1634c45..cbd3a3e 100644 --- a/src/main/java/net/minecraft/src/ItemRenderer.java +++ b/src/main/java/net/minecraft/src/ItemRenderer.java @@ -218,14 +218,13 @@ public class ItemRenderer EaglerAdapter.glRotatef(var3.prevRotationYaw + (var3.rotationYaw - var3.prevRotationYaw) * par1, 0.0F, 1.0F, 0.0F); RenderHelper.enableStandardItemLighting(); EaglerAdapter.glPopMatrix(); - EntityPlayerSP var5 = (EntityPlayerSP)var3; + EntityPlayerSP var5 = var3; float var6 = var5.prevRenderArmPitch + (var5.renderArmPitch - var5.prevRenderArmPitch) * par1; float var7 = var5.prevRenderArmYaw + (var5.renderArmYaw - var5.prevRenderArmYaw) * par1; EaglerAdapter.glRotatef((var3.rotationPitch - var6) * 0.1F, 1.0F, 0.0F, 0.0F); EaglerAdapter.glRotatef((var3.rotationYaw - var7) * 0.1F, 0.0F, 1.0F, 0.0F); ItemStack var8 = this.itemToRender; - float var9 = this.mc.theWorld.getLightBrightness(MathHelper.floor_double(var3.posX), MathHelper.floor_double(var3.posY), MathHelper.floor_double(var3.posZ)); - var9 = 1.0F; + float var9 = 1.0F; int var10 = this.mc.theWorld.getLightBrightnessForSkyBlocks(MathHelper.floor_double(var3.posX), MathHelper.floor_double(var3.posY), MathHelper.floor_double(var3.posZ), 0); int var11 = var10 % 65536; int var12 = var10 / 65536; diff --git a/src/main/java/net/minecraft/src/RenderItem.java b/src/main/java/net/minecraft/src/RenderItem.java index e1fd7fd..4c90733 100644 --- a/src/main/java/net/minecraft/src/RenderItem.java +++ b/src/main/java/net/minecraft/src/RenderItem.java @@ -179,7 +179,6 @@ public class RenderItem extends Render * Renders a dropped item */ private void renderDroppedItem(EntityItem par1EntityItem, Icon par2Icon, int par3, float par4, float par5, float par6, float par7) { - System.out.println("test"); Tessellator var8 = Tessellator.instance; if (par2Icon == null) { diff --git a/src/main/java/net/minecraft/src/RenderPlayer.java b/src/main/java/net/minecraft/src/RenderPlayer.java index 4a0e34c..baf5d29 100644 --- a/src/main/java/net/minecraft/src/RenderPlayer.java +++ b/src/main/java/net/minecraft/src/RenderPlayer.java @@ -1,9 +1,6 @@ package net.minecraft.src; -import net.lax1dude.eaglercraft.DefaultSkinRenderer; -import net.lax1dude.eaglercraft.EaglerAdapter; -import net.lax1dude.eaglercraft.EaglerProfile; -import net.lax1dude.eaglercraft.TextureLocation; +import net.lax1dude.eaglercraft.*; public class RenderPlayer extends RendererLivingEntity { @@ -19,6 +16,8 @@ public class RenderPlayer extends RendererLivingEntity { super(new ModelBiped(0.0F), 0.5F); this.modelBipedMain = (ModelBiped)this.mainModel; + this.modelBipedMainNewSkin = new ModelBipedNewSkins(0.0F, false); + this.modelBipedMainNewSkinSlim = new ModelBipedNewSkins(0.0F, true); this.modelArmorChestplate = new ModelBiped(1.0F); this.modelArmor = new ModelBiped(0.5F); } @@ -99,39 +98,132 @@ public class RenderPlayer extends RendererLivingEntity } } - public void renderPlayer(EntityPlayer par1AbstractClientPlayer, double par2, double par4, double par6, float par8, float par9) + public void renderPlayer(EntityPlayer par1EntityPlayer, double par2, double par4, double par6, float par8, float par9) { - float var10 = 1.0F; - EaglerAdapter.glColor3f(var10, var10, var10); - ItemStack var11 = par1AbstractClientPlayer.inventory.getCurrentItem(); - this.modelArmorChestplate.heldItemRight = this.modelArmor.heldItemRight = this.modelBipedMain.heldItemRight = var11 != null ? 1 : 0; + boolean isHiPoly = DefaultSkinRenderer.isPlayerHighPoly(par1EntityPlayer); + boolean fnawEnabled = Minecraft.getMinecraft().gameSettings.allowFNAWSkins; + if(DefaultSkinRenderer.isPlayerStandard(par1EntityPlayer) || (isHiPoly && !fnawEnabled)) { + float var10 = 1.0F; + EaglerAdapter.glColor3f(var10, var10, var10); + ItemStack var11 = par1EntityPlayer.inventory.getCurrentItem(); + this.modelArmorChestplate.heldItemRight = this.modelArmor.heldItemRight = this.modelBipedMain.heldItemRight = this.modelBipedMainNewSkin.heldItemRight = this.modelBipedMainNewSkinSlim.heldItemRight = var11 != null ? 1 : 0; - if (var11 != null && par1AbstractClientPlayer.getItemInUseCount() > 0) - { - EnumAction var12 = var11.getItemUseAction(); + if (var11 != null && par1EntityPlayer.getItemInUseCount() > 0) { + EnumAction var12 = var11.getItemUseAction(); - if (var12 == EnumAction.block) - { - this.modelArmorChestplate.heldItemRight = this.modelArmor.heldItemRight = this.modelBipedMain.heldItemRight = 3; + if (var12 == EnumAction.block) { + this.modelArmorChestplate.heldItemRight = this.modelArmor.heldItemRight = this.modelBipedMain.heldItemRight = this.modelBipedMainNewSkin.heldItemRight = this.modelBipedMainNewSkinSlim.heldItemRight = 3; + } else if (var12 == EnumAction.bow) { + this.modelArmorChestplate.aimedBow = this.modelArmor.aimedBow = this.modelBipedMain.aimedBow = this.modelBipedMainNewSkin.aimedBow = this.modelBipedMainNewSkinSlim.aimedBow = true; + } } - else if (var12 == EnumAction.bow) - { - this.modelArmorChestplate.aimedBow = this.modelArmor.aimedBow = this.modelBipedMain.aimedBow = true; + + this.modelArmorChestplate.isSneak = this.modelArmor.isSneak = this.modelBipedMain.isSneak = this.modelBipedMainNewSkin.isSneak = this.modelBipedMainNewSkinSlim.isSneak = par1EntityPlayer.isSneaking(); + double var14 = par4 - (double) par1EntityPlayer.yOffset; + + if (par1EntityPlayer.isSneaking() && !(par1EntityPlayer instanceof EntityPlayerSP)) { + var14 -= 0.125D; + } + + this.mainModel = ((!isHiPoly && DefaultSkinRenderer.isPlayerNewSkin(par1EntityPlayer)) ? (DefaultSkinRenderer.isPlayerNewSkinSlim(par1EntityPlayer) ? this.modelBipedMainNewSkinSlim : this.modelBipedMainNewSkin) : this.modelBipedMain); + int skinLayersByte = DefaultSkinRenderer.getSkinLayerByte(par1EntityPlayer); + if(this.mainModel instanceof ModelBipedNewSkins) { + ModelBipedNewSkins md = (ModelBipedNewSkins)this.mainModel; + md.field_178730_v.isHidden = (skinLayersByte & 1) != 1; + md.field_178734_a.isHidden = (skinLayersByte & 4) != 4; + md.field_178732_b.isHidden = (skinLayersByte & 8) != 8; + md.field_178733_c.isHidden = (skinLayersByte & 16) != 16; + md.field_178731_d.isHidden = (skinLayersByte & 32) != 32; + } + ((ModelBiped)this.mainModel).bipedHeadwear.isHidden = isHiPoly || (skinLayersByte & 2) != 2; + this.mainModel.isChild = false; + ((ModelBiped)this.mainModel).blockTransparentSkin = true; + super.doRenderLiving(par1EntityPlayer, par2, var14, par6, par8, par9); + ((ModelBiped)this.mainModel).blockTransparentSkin = false; + //this.mainModel = this.modelBipedMain; + this.modelArmorChestplate.aimedBow = this.modelArmor.aimedBow = this.modelBipedMain.aimedBow = this.modelBipedMainNewSkin.aimedBow = this.modelBipedMainNewSkinSlim.aimedBow = false; + this.modelArmorChestplate.isSneak = this.modelArmor.isSneak = this.modelBipedMain.isSneak = this.modelBipedMainNewSkin.isSneak = this.modelBipedMainNewSkinSlim.isSneak = false; + this.modelArmorChestplate.heldItemRight = this.modelArmor.heldItemRight = this.modelBipedMain.heldItemRight = this.modelBipedMainNewSkin.heldItemRight = this.modelBipedMainNewSkinSlim.heldItemRight = 0; + }else { + int renderType = DefaultSkinRenderer.getPlayerRenderer(par1EntityPlayer); + if(DefaultSkinRenderer.isZombieModel(renderType)) { + if(DefaultSkinRenderer.zombieRenderer == null) DefaultSkinRenderer.zombieRenderer = new ModelZombie(0.0F, true); + this.mainModel = DefaultSkinRenderer.zombieRenderer; + this.mainModel.isChild = false; + DefaultSkinRenderer.zombieRenderer.isSneak = par1EntityPlayer.isSneaking(); + DefaultSkinRenderer.zombieRenderer.isRiding = par1EntityPlayer.isRiding(); + double var14 = par4 - (double) par1EntityPlayer.yOffset; + if (par1EntityPlayer.isSneaking() && !(par1EntityPlayer instanceof EntityPlayerSP)) var14 -= 0.125D; + super.doRenderLiving(par1EntityPlayer, par2, var14, par6, par8, par9); + DefaultSkinRenderer.zombieRenderer.isSneak = false; + DefaultSkinRenderer.zombieRenderer.isRiding = false; + this.mainModel = this.modelBipedMain; + }else { + switch(renderType) { + case 32: + if(DefaultSkinRenderer.villagerRenderer == null) DefaultSkinRenderer.villagerRenderer = new ModelVillager(0.0F); + DefaultSkinRenderer.villagerRenderer.isChild = false; + this.mainModel = DefaultSkinRenderer.villagerRenderer; + super.doRenderLiving(par1EntityPlayer, par2, par4 - (double) par1EntityPlayer.yOffset, par6, par8, par9); + this.mainModel = this.modelBipedMain; + break; + case 19: + if(DefaultSkinRenderer.endermanRenderer == null) DefaultSkinRenderer.endermanRenderer = new ModelEnderman(); + DefaultSkinRenderer.endermanRenderer.isChild = false; + DefaultSkinRenderer.endermanRenderer.isCarrying = (par1EntityPlayer.inventory.getCurrentItem() != null && par1EntityPlayer.inventory.getCurrentItem().itemID < 256); + this.mainModel = DefaultSkinRenderer.endermanRenderer; + super.doRenderLiving(par1EntityPlayer, par2, par4 - (double) par1EntityPlayer.yOffset + 0.05f, par6, par8, par9); + + RenderEnderman.tex_eyes.bindTexture(); + + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glDisable(EaglerAdapter.GL_CULL_FACE); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE); + EaglerAdapter.glTranslatef((float)par2, (float)par4 - par1EntityPlayer.yOffset + 0.05f, (float)par6); + float var13 = this.handleRotationFloat(par1EntityPlayer, par9); + float var10 = par1EntityPlayer.prevRenderYawOffset + (par1EntityPlayer.renderYawOffset - par1EntityPlayer.prevRenderYawOffset) * par9; + float var11 = par1EntityPlayer.prevRotationYawHead + (par1EntityPlayer.rotationYawHead - par1EntityPlayer.prevRotationYawHead) * par9; + float var12 = par1EntityPlayer.prevRotationPitch + (par1EntityPlayer.rotationPitch - par1EntityPlayer.prevRotationPitch) * par9; + this.rotateCorpse(par1EntityPlayer, var13, var10, par9); + EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL); + EaglerAdapter.glScalef(-0.95F, -1.0F, 0.95F); //? + EaglerAdapter.glTranslatef(0.0F, -24.0F * 0.0625F - 0.0078125F + 0.1606f, 0.0F); + + char var5 = 61680; + int var6 = var5 % 65536; + int var7 = var5 / 65536; + EaglerAdapter.glColor4f(2.3F, 2.3F, 2.3F, par1EntityPlayer.isInvisible() ? 0.3f : 1.0f); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) var6 / 1.0F, (float) var7 / 1.0F); + DefaultSkinRenderer.endermanRenderer.render(null, 0f, 0f, var13, var11 - var10, var12, 0.0625f); + EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); + EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST); + EaglerAdapter.glEnable(EaglerAdapter.GL_CULL_FACE); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + + DefaultSkinRenderer.endermanRenderer.isCarrying = false; + this.mainModel = this.modelBipedMain; + break; + case 20: + if(DefaultSkinRenderer.skeletonRenderer == null) DefaultSkinRenderer.skeletonRenderer = new ModelSkeleton(0.0F); + DefaultSkinRenderer.skeletonRenderer.isChild = false; + this.mainModel = DefaultSkinRenderer.skeletonRenderer; + super.doRenderLiving(par1EntityPlayer, par2, par4 - (double) par1EntityPlayer.yOffset, par6, par8, par9); + this.mainModel = this.modelBipedMain; + break; + case 21: + if(DefaultSkinRenderer.blazeRenderer == null) DefaultSkinRenderer.blazeRenderer = new ModelBlaze(); + DefaultSkinRenderer.blazeRenderer.isChild = false; + this.mainModel = DefaultSkinRenderer.blazeRenderer; + super.doRenderLiving(par1EntityPlayer, par2, par4 - (double) par1EntityPlayer.yOffset, par6, par8, par9); + this.mainModel = this.modelBipedMain; + break; + } } } - - this.modelArmorChestplate.isSneak = this.modelArmor.isSneak = this.modelBipedMain.isSneak = par1AbstractClientPlayer.isSneaking(); - double var14 = par4 - (double)par1AbstractClientPlayer.yOffset; - - if (par1AbstractClientPlayer.isSneaking() && !(par1AbstractClientPlayer instanceof EntityPlayerSP)) - { - var14 -= 0.125D; - } - - super.doRenderLiving(par1AbstractClientPlayer, par2, var14, par6, par8, par9); - this.modelArmorChestplate.aimedBow = this.modelArmor.aimedBow = this.modelBipedMain.aimedBow = false; - this.modelArmorChestplate.isSneak = this.modelArmor.isSneak = this.modelBipedMain.isSneak = false; - this.modelArmorChestplate.heldItemRight = this.modelArmor.heldItemRight = this.modelBipedMain.heldItemRight = 0; } protected TextureLocation func_110817_a(EntityPlayer par1AbstractClientPlayer)