Skip to content

Commit 162f04a

Browse files
committed
Add custom text color config setting
1 parent d6a71d4 commit 162f04a

File tree

9 files changed

+16
-11
lines changed

9 files changed

+16
-11
lines changed

src/main/java/org/polyfrost/polynametag/mixin/client/Mixin_ReplaceTextRendering.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
55
import com.llamalad7.mixinextras.sugar.Local;
66
import dev.deftu.omnicore.api.client.render.stack.OmniMatrixStacks;
7+
import dev.deftu.omnicore.api.color.ColorFormat;
78
import dev.deftu.omnicore.api.color.OmniColor;
89
import net.minecraft.client.gui.FontRenderer;
910
import net.minecraft.client.renderer.entity.Render;
@@ -26,7 +27,7 @@ public abstract class Mixin_ReplaceTextRendering {
2627
@Local(argsOnly = true) Entity entity
2728
) {
2829
if (PolyNametagConfig.isEnabled()) {
29-
final OmniColor color = new OmniColor(inColor).withAlpha(entity.isSneaking() ? 32 : 255);
30+
final OmniColor color = new OmniColor(ColorFormat.ARGB, PolyNametagConfig.INSTANCE.getTextColor().getArgb()).withAlpha(entity.isSneaking() ? 32 : 255);
3031
return NametagRenderer.drawNametagString(OmniMatrixStacks.create(), text, x, y, color);
3132
} else {
3233
return original.call(instance, text, x, y, inColor);

src/main/kotlin/org/polyfrost/polynametag/client/NametagRenderer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ object NametagRenderer {
1717
private val PIPELINE by lazy {
1818
OmniRenderPipelines.POSITION_COLOR_TRIANGLES
1919
.newBuilder()
20-
.setDepthTest(OmniRenderPipeline.DepthTest.DISABLED)
20+
.setDepthTest(OmniRenderPipeline.DepthTest.LESS)
2121
.setDepthMask(false)
2222
.build()
2323
}

src/main/kotlin/org/polyfrost/polynametag/client/PolyNametagConfig.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ object PolyNametagConfig :
6161
@Color(title = "Background color", description = "The color of the background")
6262
var backgroundColor = rgba(0, 0, 0, 0.247F) // 0,0,0,63
6363

64+
@Color(title = "Text color", description = "The color of the text")
65+
var textColor = rgba(0, 0, 0, 1.0F)
66+
6467
private var hasMigratedPatcher = false
6568

6669
init {

versions/1.12.2-fabric/src/main/java/org/polyfrost/polynametag/mixin/client/Mixin_ReplaceTextRendering.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
55
import com.llamalad7.mixinextras.sugar.Local;
66
import dev.deftu.omnicore.api.client.render.stack.OmniMatrixStacks;
7+
import dev.deftu.omnicore.api.color.ColorFormat;
78
import dev.deftu.omnicore.api.color.OmniColor;
8-
import dev.deftu.omnicore.api.color.OmniColors;
99
import net.minecraft.client.font.TextRenderer;
1010
import net.minecraft.client.render.entity.EntityRenderer;
1111
import net.minecraft.entity.Entity;
@@ -32,7 +32,7 @@ public abstract class Mixin_ReplaceTextRendering<T extends Entity> {
3232
@Local(argsOnly = true) Entity entity
3333
) {
3434
if (PolyNametagConfig.isEnabled()) {
35-
final OmniColor color = OmniColors.WHITE.withAlpha(entity.isSneaking() ? 32 : 255);
35+
final OmniColor color = new OmniColor(ColorFormat.ARGB, PolyNametagConfig.INSTANCE.getTextColor().getArgb()).withAlpha(entity.isSneaking() ? 32 : 255);
3636
NametagRenderer.drawNametagString(OmniMatrixStacks.create(), text, x, y, color);
3737
} else {
3838
original.call(

versions/1.16.5-fabric/src/main/java/org/polyfrost/polynametag/mixin/client/Mixin_ReplaceTextRendering.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public abstract class Mixin_ReplaceTextRendering {
2525
Text text,
2626
float x,
2727
float y,
28-
int color,
28+
int inColor,
2929
boolean shadow,
3030
Matrix4f matrix4f,
3131
VertexConsumerProvider vertexConsumerProvider,
@@ -36,14 +36,15 @@ public abstract class Mixin_ReplaceTextRendering {
3636
@Local(argsOnly = true) MatrixStack matrixStack
3737
) {
3838
if (PolyNametagConfig.isEnabled()) {
39-
return NametagRenderer.drawNametagString(OmniMatrixStacks.vanilla(matrixStack), text.getString(), x, y, new OmniColor(ColorFormat.ARGB, color));
39+
final OmniColor color = new OmniColor(ColorFormat.ARGB, PolyNametagConfig.INSTANCE.getTextColor().getArgb());
40+
return NametagRenderer.drawNametagString(OmniMatrixStacks.vanilla(matrixStack), text.getString(), x, y, color);
4041
} else {
4142
return original.call(
4243
instance,
4344
text,
4445
x,
4546
y,
46-
color,
47+
inColor,
4748
shadow,
4849
matrix4f,
4950
vertexConsumerProvider,

versions/1.20.1-fabric/src/main/java/org/polyfrost/polynametag/mixin/client/Mixin_ReplaceTextRendering.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public abstract class Mixin_ReplaceTextRendering {
3838
@Local(argsOnly = true) Entity entity
3939
) {
4040
if (PolyNametagConfig.isEnabled()) {
41-
final OmniColor color = new OmniColor(ColorFormat.ARGB, inColor).withAlpha(entity.isSneaking() ? 32 : 255);
41+
final OmniColor color = new OmniColor(ColorFormat.ARGB, PolyNametagConfig.INSTANCE.getTextColor().getArgb()).withAlpha(entity.isSneaking() ? 32 : 255);
4242
return NametagRenderer.drawNametagString(OmniMatrixStacks.vanilla(matrixStack), text.getString(), x, y, color);
4343
} else {
4444
return original.call(

versions/1.21.10-fabric/src/main/java/org/polyfrost/polynametag/mixin/client/Mixin_ReplaceTextRendering.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public abstract class Mixin_ReplaceTextRendering {
3737
) {
3838
if (PolyNametagConfig.isEnabled()) {
3939
LabelCommandStorage labelCommandStorage = (LabelCommandStorage) (Object) labelCommand;
40-
final OmniColor color = new OmniColor(ColorFormat.ARGB, inColor).withAlpha(labelCommandStorage.polynametag$isSneaking() ? 32 : 255);
40+
final OmniColor color = new OmniColor(ColorFormat.ARGB, PolyNametagConfig.INSTANCE.getTextColor().getArgb()).withAlpha(labelCommandStorage.polynametag$isSneaking() ? 32 : 255);
4141
NametagRenderer.drawNametagString(labelCommandStorage.polynametag$getMatrixStack(), text.getString(), x, y, color);
4242
} else {
4343
original.call(

versions/1.21.4-fabric/src/main/java/org/polyfrost/polynametag/mixin/client/Mixin_ReplaceTextRendering.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public abstract class Mixin_ReplaceTextRendering {
3838
@Local(argsOnly = true) EntityRenderState entityRenderState
3939
) {
4040
if (PolyNametagConfig.isEnabled()) {
41-
final OmniColor color = new OmniColor(ColorFormat.ARGB, inColor).withAlpha(entityRenderState.sneaking ? 32 : 255);
41+
final OmniColor color = new OmniColor(ColorFormat.ARGB, PolyNametagConfig.INSTANCE.getTextColor().getArgb()).withAlpha(entityRenderState.sneaking ? 32 : 255);
4242
return NametagRenderer.drawNametagString(OmniMatrixStacks.vanilla(matrices), text.getString(), x, y, color);
4343
} else {
4444
return original.call(

versions/1.21.8-fabric/src/main/java/org/polyfrost/polynametag/mixin/client/Mixin_ReplaceTextRendering.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public abstract class Mixin_ReplaceTextRendering {
3838
@Local(argsOnly = true) EntityRenderState entityRenderState
3939
) {
4040
if (PolyNametagConfig.isEnabled()) {
41-
final OmniColor color = new OmniColor(ColorFormat.ARGB, inColor).withAlpha(entityRenderState.sneaking ? 32 : 255);
41+
final OmniColor color = new OmniColor(ColorFormat.ARGB, PolyNametagConfig.INSTANCE.getTextColor().getArgb()).withAlpha(entityRenderState.sneaking ? 32 : 255);
4242
NametagRenderer.drawNametagString(OmniMatrixStacks.vanilla(matrices), text.getString(), x, y, color);
4343
} else {
4444
original.call(

0 commit comments

Comments
 (0)