eaglercraft/eaglercraft-1.5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed hidden name tags on FNAW skins, fixed missing nametag background

Browse Source
This commit is contained in:
LAX1DUDE 2022-06-12 14:38:21 -07:00
parent 308efb7342
commit 2e25ceb889
4 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/lax1dude/eaglercraft/ConfigConstants.java
View File

@ -4,7 +4,7 @@ public class ConfigConstants {
public static boolean profanity = false; public static boolean profanity = false;
public static final String version = "22w23b"; public static final String version = "22w23c";
public static final String mainMenuString = "eaglercraft " + version; public static final String mainMenuString = "eaglercraft " + version;
public static final String forkMe = "https://github.com/LAX1DUDE/eaglercraft"; public static final String forkMe = "https://github.com/LAX1DUDE/eaglercraft";

4
src/main/java/net/lax1dude/eaglercraft/glemu/EaglerAdapterGL30.java
View File

@ -585,6 +585,10 @@ public class EaglerAdapterGL30 extends EaglerAdapterImpl2 {
System.err.println("matrix is not supported while recording display list use tessellator class instead"); System.err.println("matrix is not supported while recording display list use tessellator class instead");
} }
} }
private static final Matrix4f tmpMat = new Matrix4f();
public static final void glMultMatrixf(Matrix4f mat) {
getMatrix().load(Matrix4f.mul(getMatrix(), mat, tmpMat));
}
public static final void glBlendFunc(int p1, int p2) { public static final void glBlendFunc(int p1, int p2) {
fogPremultiply = (p1 == GL_ONE && p2 == GL_ONE_MINUS_SRC_ALPHA); fogPremultiply = (p1 == GL_ONE && p2 == GL_ONE_MINUS_SRC_ALPHA);
_wglBlendFunc(p1, p2); _wglBlendFunc(p1, p2);

8
src/main/java/net/minecraft/src/RenderLiving.java
View File

@ -384,6 +384,7 @@ public abstract class RenderLiving extends Render {
EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA);
Tessellator var15 = Tessellator.instance; Tessellator var15 = Tessellator.instance;
EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D);
EaglerAdapter.glDisable(EaglerAdapter.GL_ALPHA_TEST);
var15.startDrawingQuads(); var15.startDrawingQuads();
int var16 = var14.getStringWidth(var13) / 2; int var16 = var14.getStringWidth(var13) / 2;
var15.setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F); var15.setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F);
@ -392,9 +393,12 @@ public abstract class RenderLiving extends Render {
var15.addVertex((double) (var16 + 1), 8.0D, 0.0D); var15.addVertex((double) (var16 + 1), 8.0D, 0.0D);
var15.addVertex((double) (var16 + 1), -1.0D, 0.0D); var15.addVertex((double) (var16 + 1), -1.0D, 0.0D);
var15.draw(); var15.draw();
EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST);
EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D);
EaglerAdapter.glDepthMask(true); EaglerAdapter.glDepthMask(true);
EaglerAdapter.glAlphaFunc(EaglerAdapter.GL_GREATER, 0.01f);
var14.drawString(var13, -var14.getStringWidth(var13) / 2, 0, 553648127); var14.drawString(var13, -var14.getStringWidth(var13) / 2, 0, 553648127);
EaglerAdapter.glAlphaFunc(EaglerAdapter.GL_GREATER, 0.1f);
EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING);
EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND);
EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
@ -449,6 +453,7 @@ public abstract class RenderLiving extends Render {
} }
EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D);
EaglerAdapter.glDisable(EaglerAdapter.GL_ALPHA_TEST);
var15.startDrawingQuads(); var15.startDrawingQuads();
int var17 = var12.getStringWidth(par2Str) / 2; int var17 = var12.getStringWidth(par2Str) / 2;
var15.setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F); var15.setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F);
@ -458,7 +463,10 @@ public abstract class RenderLiving extends Render {
var15.addVertex((double) (var17 + 1), (double) (-1 + var16), 0.0D); var15.addVertex((double) (var17 + 1), (double) (-1 + var16), 0.0D);
var15.draw(); var15.draw();
EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D);
EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST);
EaglerAdapter.glAlphaFunc(EaglerAdapter.GL_GREATER, 0.02f);
var12.drawString(par2Str, -var12.getStringWidth(par2Str) / 2, var16, 553648127); var12.drawString(par2Str, -var12.getStringWidth(par2Str) / 2, var16, 553648127);
EaglerAdapter.glAlphaFunc(EaglerAdapter.GL_GREATER, 0.1f);
EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST); EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST);
EaglerAdapter.glDepthMask(true); EaglerAdapter.glDepthMask(true);
var12.drawString(par2Str, -var12.getStringWidth(par2Str) / 2, var16, -1); var12.drawString(par2Str, -var12.getStringWidth(par2Str) / 2, var16, -1);

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

@ -4,6 +4,7 @@ import net.lax1dude.eaglercraft.EaglerProfile;
import net.lax1dude.eaglercraft.HighPolySkin; import net.lax1dude.eaglercraft.HighPolySkin;
import net.lax1dude.eaglercraft.ModelBipedNewSkins; import net.lax1dude.eaglercraft.ModelBipedNewSkins;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.glemu.vector.Matrix4f;
import net.lax1dude.eaglercraft.DefaultSkinRenderer; import net.lax1dude.eaglercraft.DefaultSkinRenderer;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
@ -30,7 +31,7 @@ public class RenderPlayer extends RenderLiving {
* partialTick * partialTick
*/ */
protected int setArmorModel(EntityPlayer par1EntityPlayer, int par2, float par3) { protected int setArmorModel(EntityPlayer par1EntityPlayer, int par2, float par3) {
if(!DefaultSkinRenderer.isPlayerStandard(par1EntityPlayer)) { if(!DefaultSkinRenderer.isPlayerStandard(par1EntityPlayer) && !DefaultSkinRenderer.isZombieModel(DefaultSkinRenderer.getPlayerRenderer(par1EntityPlayer))) {
return -1; return -1;
} }
ItemStack var4 = par1EntityPlayer.inventory.armorItemInSlot(3 - par2); ItemStack var4 = par1EntityPlayer.inventory.armorItemInSlot(3 - par2);
@ -108,6 +109,7 @@ public class RenderPlayer extends RenderLiving {
} }
private boolean renderPass2 = false; private boolean renderPass2 = false;
private final Matrix4f tmpMatrix = new Matrix4f();
public void renderPlayer(EntityPlayer par1EntityPlayer, 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) {
if(DefaultSkinRenderer.isPlayerHighPoly(par1EntityPlayer)) { if(DefaultSkinRenderer.isPlayerHighPoly(par1EntityPlayer)) {
@ -283,14 +285,18 @@ public class RenderPlayer extends RenderLiving {
}else if(msh == HighPolySkin.LAXATIVE_DUDE) { }else if(msh == HighPolySkin.LAXATIVE_DUDE) {
float fff = (i == 0) ? 1.0f : -1.0f; float fff = (i == 0) ? 1.0f : -1.0f;
float swing = (MathHelper.cos(var13 % 100000.0f) * fff + 0.2f) * var15; float swing = (MathHelper.cos(var13 % 100000.0f) * fff + 0.2f) * var15;
float swing2 = (MathHelper.sin(var13 % 100000.0f) * fff + 1.2f) * var15; float swing2 = (MathHelper.cos(var13 % 100000.0f) * fff * 0.5f + 0.0f) * var15;
EaglerAdapter.glRotatef(swing * 13.0f, 1.0f, 0.0f, 0.0f); EaglerAdapter.glRotatef(swing * 25.0f, 1.0f, 0.0f, 0.0f);
if(par1EntityPlayer.isSwingInProgress) { if(par1EntityPlayer.isSwingInProgress) {
float var17 = MathHelper.cos(-par1EntityPlayer.getSwingProgress(par9) * (float)Math.PI * 2.0f - 1.2f) - 0.362f; float var17 = MathHelper.cos(-par1EntityPlayer.getSwingProgress(par9) * (float)Math.PI * 2.0f - 1.2f) - 0.362f;
var17 *= var17; var17 *= var17;
EaglerAdapter.glRotatef(-var17 * 25.0f, 1.0f, 0.0f, 0.0f); EaglerAdapter.glRotatef(-var17 * 25.0f, 1.0f, 0.0f, 0.0f);
} }
EaglerAdapter.glScalef(1.0f, 1.0f, 1.0f - swing2 * 0.4f);
// shear matrix
tmpMatrix.setIdentity();
tmpMatrix.m21 = swing2;
EaglerAdapter.glMultMatrixf(tmpMatrix);
} }
if(i != 0) { if(i != 0) {
@ -412,6 +418,7 @@ public class RenderPlayer extends RenderLiving {
EaglerAdapter.glPopMatrix(); EaglerAdapter.glPopMatrix();
EaglerAdapter.flipLightMatrix(); EaglerAdapter.flipLightMatrix();
passSpecialRender(par1EntityPlayer, par2, par4, par6);
}else if(DefaultSkinRenderer.isPlayerStandard(par1EntityPlayer)) { }else if(DefaultSkinRenderer.isPlayerStandard(par1EntityPlayer)) {
float var10 = 1.0F; float var10 = 1.0F;
EaglerAdapter.glColor3f(var10, var10, var10); EaglerAdapter.glColor3f(var10, var10, var10);
@ -598,7 +605,7 @@ public class RenderPlayer extends RenderLiving {
float var11; float var11;
if (par1EntityPlayer.username.equals("LAX1DUDE") && !par1EntityPlayer.isInvisible() && !par1EntityPlayer.getHideCape() && renderType != 21) { if (par1EntityPlayer.username.equalsIgnoreCase("LAX1DUDE") && !par1EntityPlayer.isInvisible() && !par1EntityPlayer.getHideCape() && renderType != 21) {
lax1dude_cape.bindTexture(); lax1dude_cape.bindTexture();
EaglerAdapter.glPushMatrix(); EaglerAdapter.glPushMatrix();
EaglerAdapter.glTranslatef(0.0F, 0.0F, 0.125F); EaglerAdapter.glTranslatef(0.0F, 0.0F, 0.125F);