catfoolyou
/
Project164
mirror of https://github.com/catfoolyou/Project164.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix default skins

This commit is contained in:
catfoolyou 2025-03-02 14:18:50 -05:00
parent 6d66cd8357
commit aab76343ea
6 changed files with 125 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lwjgl-rundir/_eagstorage.g.dat
View File

Binary file not shown.

BIN
lwjgl-rundir/_eagstorage.p.dat
View File

Binary file not shown.

BIN
lwjgl-rundir/eaglercraft.jar
View File

Binary file not shown.

5
src/main/java/net/minecraft/src/ItemRenderer.java
View File

@ -218,14 +218,13 @@ public class ItemRenderer
EaglerAdapter.glRotatef(var3.prevRotationYaw + (var3.rotationYaw - var3.prevRotationYaw) * par1, 0.0F, 1.0F, 0.0F); EaglerAdapter.glRotatef(var3.prevRotationYaw + (var3.rotationYaw - var3.prevRotationYaw) * par1, 0.0F, 1.0F, 0.0F);
RenderHelper.enableStandardItemLighting(); RenderHelper.enableStandardItemLighting();
EaglerAdapter.glPopMatrix(); EaglerAdapter.glPopMatrix();
EntityPlayerSP var5 = (EntityPlayerSP)var3; EntityPlayerSP var5 = var3;
float var6 = var5.prevRenderArmPitch + (var5.renderArmPitch - var5.prevRenderArmPitch) * par1; float var6 = var5.prevRenderArmPitch + (var5.renderArmPitch - var5.prevRenderArmPitch) * par1;
float var7 = var5.prevRenderArmYaw + (var5.renderArmYaw - var5.prevRenderArmYaw) * 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.rotationPitch - var6) * 0.1F, 1.0F, 0.0F, 0.0F);
EaglerAdapter.glRotatef((var3.rotationYaw - var7) * 0.1F, 0.0F, 1.0F, 0.0F); EaglerAdapter.glRotatef((var3.rotationYaw - var7) * 0.1F, 0.0F, 1.0F, 0.0F);
ItemStack var8 = this.itemToRender; 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)); float var9 = 1.0F;
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 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 var11 = var10 % 65536;
int var12 = var10 / 65536; int var12 = var10 / 65536;

1
src/main/java/net/minecraft/src/RenderItem.java
View File

@ -179,7 +179,6 @@ public class RenderItem extends Render
* Renders a dropped item * Renders a dropped item
*/ */
private void renderDroppedItem(EntityItem par1EntityItem, Icon par2Icon, int par3, float par4, float par5, float par6, float par7) { 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; Tessellator var8 = Tessellator.instance;
if (par2Icon == null) { if (par2Icon == null) {

140
src/main/java/net/minecraft/src/RenderPlayer.java
View File

@ -1,9 +1,6 @@
package net.minecraft.src; package net.minecraft.src;
import net.lax1dude.eaglercraft.DefaultSkinRenderer; import net.lax1dude.eaglercraft.*;
import net.lax1dude.eaglercraft.EaglerAdapter;
import net.lax1dude.eaglercraft.EaglerProfile;
import net.lax1dude.eaglercraft.TextureLocation;
public class RenderPlayer extends RendererLivingEntity public class RenderPlayer extends RendererLivingEntity
{ {
@ -19,6 +16,8 @@ public class RenderPlayer extends RendererLivingEntity
{ {
super(new ModelBiped(0.0F), 0.5F); super(new ModelBiped(0.0F), 0.5F);
this.modelBipedMain = (ModelBiped)this.mainModel; 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.modelArmorChestplate = new ModelBiped(1.0F);
this.modelArmor = new ModelBiped(0.5F); 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)
{ {
boolean isHiPoly = DefaultSkinRenderer.isPlayerHighPoly(par1EntityPlayer);
boolean fnawEnabled = Minecraft.getMinecraft().gameSettings.allowFNAWSkins;
if(DefaultSkinRenderer.isPlayerStandard(par1EntityPlayer) || (isHiPoly && !fnawEnabled)) {
float var10 = 1.0F; float var10 = 1.0F;
EaglerAdapter.glColor3f(var10, var10, var10); EaglerAdapter.glColor3f(var10, var10, var10);
ItemStack var11 = par1AbstractClientPlayer.inventory.getCurrentItem(); ItemStack var11 = par1EntityPlayer.inventory.getCurrentItem();
this.modelArmorChestplate.heldItemRight = this.modelArmor.heldItemRight = this.modelBipedMain.heldItemRight = var11 != null ? 1 : 0; 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) if (var11 != null && par1EntityPlayer.getItemInUseCount() > 0) {
{
EnumAction var12 = var11.getItemUseAction(); EnumAction var12 = var11.getItemUseAction();
if (var12 == EnumAction.block) if (var12 == EnumAction.block) {
{ this.modelArmorChestplate.heldItemRight = this.modelArmor.heldItemRight = this.modelBipedMain.heldItemRight = this.modelBipedMainNewSkin.heldItemRight = this.modelBipedMainNewSkinSlim.heldItemRight = 3;
this.modelArmorChestplate.heldItemRight = this.modelArmor.heldItemRight = this.modelBipedMain.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 = par1AbstractClientPlayer.isSneaking(); this.modelArmorChestplate.isSneak = this.modelArmor.isSneak = this.modelBipedMain.isSneak = this.modelBipedMainNewSkin.isSneak = this.modelBipedMainNewSkinSlim.isSneak = par1EntityPlayer.isSneaking();
double var14 = par4 - (double)par1AbstractClientPlayer.yOffset; double var14 = par4 - (double) par1EntityPlayer.yOffset;
if (par1AbstractClientPlayer.isSneaking() && !(par1AbstractClientPlayer instanceof EntityPlayerSP)) if (par1EntityPlayer.isSneaking() && !(par1EntityPlayer instanceof EntityPlayerSP)) {
{
var14 -= 0.125D; var14 -= 0.125D;
} }
super.doRenderLiving(par1AbstractClientPlayer, par2, var14, par6, par8, par9); this.mainModel = ((!isHiPoly && DefaultSkinRenderer.isPlayerNewSkin(par1EntityPlayer)) ? (DefaultSkinRenderer.isPlayerNewSkinSlim(par1EntityPlayer) ? this.modelBipedMainNewSkinSlim : this.modelBipedMainNewSkin) : this.modelBipedMain);
this.modelArmorChestplate.aimedBow = this.modelArmor.aimedBow = this.modelBipedMain.aimedBow = false; int skinLayersByte = DefaultSkinRenderer.getSkinLayerByte(par1EntityPlayer);
this.modelArmorChestplate.isSneak = this.modelArmor.isSneak = this.modelBipedMain.isSneak = false; if(this.mainModel instanceof ModelBipedNewSkins) {
this.modelArmorChestplate.heldItemRight = this.modelArmor.heldItemRight = this.modelBipedMain.heldItemRight = 0; 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;
}
}
}
} }
protected TextureLocation func_110817_a(EntityPlayer par1AbstractClientPlayer) protected TextureLocation func_110817_a(EntityPlayer par1AbstractClientPlayer)