From 3e84bfbc1a3642f28cb4f0ac012153ee5a3df3b4 Mon Sep 17 00:00:00 2001 From: LAX1DUDE Date: Fri, 20 Jan 2023 23:37:09 -0800 Subject: [PATCH] Update #15 - Fixed vanilla scoreboard glitch --- client_version | 2 +- .../net/minecraft/client/gui/GuiIngame.edit.java | 11 ++++++++++- .../lax1dude/eaglercraft/v1_8/EaglercraftVersion.java | 4 ++-- sources/resources/assets/eagler/glsl/core.vsh | 4 ++-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/client_version b/client_version index 4dded42..4e54388 100644 --- a/client_version +++ b/client_version @@ -1 +1 @@ -u14 \ No newline at end of file +u15 \ No newline at end of file diff --git a/patches/minecraft/net/minecraft/client/gui/GuiIngame.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiIngame.edit.java index ec7d82d..8192f64 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiIngame.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiIngame.edit.java @@ -77,7 +77,16 @@ ~ for (Score score1 : (List) arraylist1) { -> INSERT 40 : 42 @ 40 +> CHANGE 7 : 9 @ 7 : 9 + +~ this.getFontRenderer().drawString(s1, k1, k, 0xFFFFFFFF); +~ this.getFontRenderer().drawString(s2, l - this.getFontRenderer().getStringWidth(s2), k, 0xFFFFFFFF); + +> CHANGE 5 : 6 @ 5 : 6 + +~ k - this.getFontRenderer().FONT_HEIGHT, 0xFFFFFFFF); + +> INSERT 25 : 27 @ 25 + GlStateManager.enableBlend(); + GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); 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 eda0fe6..1453d73 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java @@ -8,7 +8,7 @@ public class EaglercraftVersion { /// Customize these to fit your fork: public static final String projectForkName = "EaglercraftX"; - public static final String projectForkVersion = "u14"; + public static final String projectForkVersion = "u15"; public static final String projectForkVendor = "lax1dude"; public static final String projectForkURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8"; @@ -23,7 +23,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 = "u14"; + public static final String projectOriginVersion = "u15"; public static final String projectOriginURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8"; diff --git a/sources/resources/assets/eagler/glsl/core.vsh b/sources/resources/assets/eagler/glsl/core.vsh index 6da44d0..a347435 100644 --- a/sources/resources/assets/eagler/glsl/core.vsh +++ b/sources/resources/assets/eagler/glsl/core.vsh @@ -72,7 +72,7 @@ void main() { u_textureMat4f01[2].xyw, u_textureMat4f01[3].xyw ); - vec3 v_textureTmp3f = texMat4x3 * vec4(a_texture2f, 1.0, 1.0); + vec3 v_textureTmp3f = texMat4x3 * vec4(a_texture2f, 0.0, 1.0); v_texture2f = v_textureTmp3f.xy / v_textureTmp3f.z; #endif @@ -95,7 +95,7 @@ void main() { u_textureMat4f02[2].xyw, u_textureMat4f02[3].xyw ); - vec3 v_lightmapTmp3f = texMat4x3 * vec4(a_lightmap2f, 1.0, 1.0); + vec3 v_lightmapTmp3f = texMat4x3 * vec4(a_lightmap2f, 0.0, 1.0); v_lightmap2f = v_lightmapTmp3f.xy / v_lightmapTmp3f.z; #endif