From a8bc4d8de548ab9063e5932b1837040cc3f538d0 Mon Sep 17 00:00:00 2001 From: XiaoMoMi <972454774@qq.com> Date: Mon, 22 Apr 2024 01:14:48 +0800 Subject: [PATCH] update shaders --- .../api/mechanic/placeholder/BackGroundText.java | 2 +- build.gradle.kts | 2 +- .../paper/mechanic/pack/ResourcePackManagerImpl.java | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/api/src/main/java/net/momirealms/customnameplates/api/mechanic/placeholder/BackGroundText.java b/api/src/main/java/net/momirealms/customnameplates/api/mechanic/placeholder/BackGroundText.java index fe5b3de..255b1c5 100644 --- a/api/src/main/java/net/momirealms/customnameplates/api/mechanic/placeholder/BackGroundText.java +++ b/api/src/main/java/net/momirealms/customnameplates/api/mechanic/placeholder/BackGroundText.java @@ -50,7 +50,7 @@ public class BackGroundText { if (parsed.equals("")) return ""; int parsedWidth = FontUtils.getTextWidth(parsed); String bg = FontUtils.surroundNameplateFont(backGround.getBackGroundImage(parsedWidth)); - return (removeShadow ? "<#FFFEFD>" + bg + "" : bg)+ parsed; + return (removeShadow ? "<#FDFEFF>" + bg + "" : bg)+ parsed; } public static Builder builder() { diff --git a/build.gradle.kts b/build.gradle.kts index 6a561c7..350fdd4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ plugins { allprojects { - version = "2.3.3.8" + version = "2.3.3.9" apply() apply(plugin = "java") diff --git a/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/pack/ResourcePackManagerImpl.java b/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/pack/ResourcePackManagerImpl.java index 9f4ad53..e77a986 100644 --- a/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/pack/ResourcePackManagerImpl.java +++ b/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/pack/ResourcePackManagerImpl.java @@ -523,13 +523,19 @@ public class ResourcePackManagerImpl implements ResourcePackManager { " vertex.y += 1;\n" + " vertex.x += 1;\n" + " gl_Position = ProjMat * ModelViewMat * vertex;\n" + + " } else if (Color.xyz == vec3(253., 254., 255.) / 255.) {\n" + + " vertexColor = Color*texelFetch(Sampler2, UV2 / 16, 0);\n" + + " vertex.y += 1;\n" + + " vertex.x += 1;\n" + + " vertex.z -= 0.002;\n" + + " gl_Position = ProjMat * ModelViewMat * vertex;\n" + " } else if (Color.xyz == vec3(254., 254., 254.) / 255.) {\n" + " vertexColor = Color*texelFetch(Sampler2, UV2 / 16, 0);\n" + " vertex.z -= 0.001;\n" + " gl_Position = ProjMat * ModelViewMat * vertex;\n" + " } else if (Color.xyz == vec3(253., 254., 254.) / 255.) {\n" + " vertexColor = Color*texelFetch(Sampler2, UV2 / 16, 0);\n" + - " vertex.z -= 0.0011;\n" + + " vertex.z -= 0.0015;\n" + " gl_Position = ProjMat * ModelViewMat * vertex;\n" + " } else {\n" + " vertexColor = Color*texelFetch(Sampler2, UV2 / 16, 0);\n" +