From e784d2524d3818144dfaf7af5e25dc8572da018a Mon Sep 17 00:00:00 2001 From: lax1dude Date: Sat, 20 Apr 2024 19:45:20 -0700 Subject: [PATCH] Update #29 - Fixed name tags not showing on FNAW skins --- client_version | 2 +- .../net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java | 6 +++--- .../lax1dude/eaglercraft/v1_8/profile/RenderHighPoly.java | 8 ++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/client_version b/client_version index 17a60b9..a02af7c 100644 --- a/client_version +++ b/client_version @@ -1 +1 @@ -u28 \ No newline at end of file +u29 \ No newline at end of file diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java index aed0804..b272274 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java @@ -10,7 +10,7 @@ public class EaglercraftVersion { /// Customize these to fit your fork: public static final String projectForkName = "EaglercraftX"; - public static final String projectForkVersion = "u28"; + public static final String projectForkVersion = "u29"; public static final String projectForkVendor = "lax1dude"; public static final String projectForkURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8"; @@ -20,7 +20,7 @@ public class EaglercraftVersion { public static final String projectOriginName = "EaglercraftX"; public static final String projectOriginAuthor = "lax1dude"; public static final String projectOriginRevision = "1.8"; - public static final String projectOriginVersion = "u28"; + public static final String projectOriginVersion = "u29"; public static final String projectOriginURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8"; // rest in peace @@ -31,7 +31,7 @@ public class EaglercraftVersion { public static final boolean enableUpdateService = true; public static final String updateBundlePackageName = "net.lax1dude.eaglercraft.v1_8.client"; - public static final int updateBundlePackageVersionInt = 28; + public static final int updateBundlePackageVersionInt = 29; public static final String updateLatestLocalStorageKey = "latestUpdate_" + updateBundlePackageName; diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/profile/RenderHighPoly.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/profile/RenderHighPoly.java index fb83670..035d68e 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/profile/RenderHighPoly.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/profile/RenderHighPoly.java @@ -52,11 +52,16 @@ public class RenderHighPoly extends RenderPlayer { public void doRender(AbstractClientPlayer abstractclientplayer, double d0, double d1, double d2, float f, float f1) { if (!abstractclientplayer.isUser() || this.renderManager.livingPlayer == abstractclientplayer) { + double nameY = d1; HighPolySkin highPolySkin = abstractclientplayer.getEaglerSkinModel().highPoly; if(highPolySkin == null) { super.doRender(abstractclientplayer, d0, d1, d2, f, f1); return; + }else if(highPolySkin == HighPolySkin.LAXATIVE_DUDE) { + nameY += 0.1; + }else if(highPolySkin == HighPolySkin.BABY_WINSTON) { + nameY -= 1.0; } GlStateManager.pushMatrix(); @@ -421,6 +426,9 @@ public class RenderHighPoly extends RenderPlayer { GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit); GlStateManager.enableCull(); GlStateManager.popMatrix(); + if (!this.renderOutlines) { + this.renderName(abstractclientplayer, d0, nameY, d2); + } } }