Use constant for white color hexcode

Sturmlilie · May 18, 2020 · a204799 · a204799
1 parent aa6f663
commit a204799
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/src/main/java/li/cil/tis3d/client/render/font/AbstractFontRenderer.java b/src/main/java/li/cil/tis3d/client/render/font/AbstractFontRenderer.java
@@ -3,6 +3,7 @@
 import com.mojang.blaze3d.platform.GlStateManager;
 import li.cil.tis3d.api.util.RenderLayerAccess;
 import li.cil.tis3d.api.util.RenderUtil;
+import li.cil.tis3d.util.ColorUtils;
 import it.unimi.dsi.fastutil.ints.Int2IntMap;
 import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
 import net.minecraft.client.MinecraftClient;
@@ -72,7 +73,7 @@ public void drawString(final CharSequence value, final int maxChars) {
     public void drawString(final MatrixStack.Entry matrices, final VertexConsumer vc,
                            int light, int overlay,
                            final CharSequence value) {
-        drawString(matrices, vc, light, overlay, 0xFFFFFFFF, value, value.length());
+        drawString(matrices, vc, light, overlay, ColorUtils.WHITE, value, value.length());
     }
 
     public void drawString(final MatrixStack.Entry matrices, final VertexConsumer vc,
@@ -84,7 +85,7 @@ public void drawString(final MatrixStack.Entry matrices, final VertexConsumer vc
     public void drawString(final MatrixStack.Entry matrices, final VertexConsumer vc,
                            int light, int overlay,
                            final CharSequence value, final int maxChars) {
-        drawString(matrices, vc, light, overlay, 0xFFFFFFFF, value, maxChars);
+        drawString(matrices, vc, light, overlay, ColorUtils.WHITE, value, maxChars);
     }
 
     public void drawString(final MatrixStack.Entry matrices, final VertexConsumer vc,

diff --git a/src/main/java/li/cil/tis3d/common/module/ExecutionModule.java b/src/main/java/li/cil/tis3d/common/module/ExecutionModule.java
@@ -18,6 +18,7 @@
 import li.cil.tis3d.common.module.execution.MachineState;
 import li.cil.tis3d.common.module.execution.compiler.Compiler;
 import li.cil.tis3d.common.module.execution.compiler.ParseException;
+import li.cil.tis3d.util.ColorUtils;
 import li.cil.tis3d.util.EnumUtils;
 import li.cil.tis3d.util.NBTIds;
 import net.fabricmc.api.EnvType;
@@ -393,7 +394,7 @@ private void renderState(final MatrixStack matrices, final VertexConsumerProvide
         final int page = currentLine / maxLines;
         final int offset = page * maxLines;
 
-        int color = 0xFFFFFFFF;
+        int color = ColorUtils.WHITE;
         int currentLineBgColor = color;
         // Some bookkeeping so we can draw the current-line background
         // at the correct y offset later
@@ -413,7 +414,7 @@ private void renderState(final MatrixStack matrices, final VertexConsumerProvide
 
                 color = 0xFF000000;
             } else {
-                color = 0xFFFFFFFF;
+                color = ColorUtils.WHITE;
             }
 
             fontRenderer.drawString(matrices.peek(), vcFont, light, overlay,
@@ -428,7 +429,7 @@ private void renderState(final MatrixStack matrices, final VertexConsumerProvide
 
         final VertexConsumer vcColor = vcp.getBuffer(RenderLayer.getSolid());
         drawLine(matrices.peek(), vcColor, light, overlay,
-                 0xFFFFFFFF, 1);
+                 ColorUtils.WHITE, 1);
 
         if (currentLineOffset != -1) {
             // Draw current line marker behind text

diff --git a/src/main/java/li/cil/tis3d/common/module/KeypadModule.java b/src/main/java/li/cil/tis3d/common/module/KeypadModule.java
@@ -7,6 +7,7 @@
 import li.cil.tis3d.api.prefab.module.AbstractModuleWithRotation;
 import li.cil.tis3d.api.util.RenderUtil;
 import li.cil.tis3d.client.init.Textures;
+import li.cil.tis3d.util.ColorUtils;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.render.RenderLayer;
@@ -291,6 +292,6 @@ private void drawButtonOverlay(final MatrixStack matrices, final VertexConsumer
         matrices.translate(0, 0, 0.005f / 2);
         RenderUtil.drawColorQuad(matrices.peek(), vcColor,
                                  x - delta, y - delta, w + 2*delta, h + 2*delta,
-                                 0xFFFFFFFF, light, overlay);
+                                 ColorUtils.WHITE, light, overlay);
     }
 }
diff --git a/src/main/java/li/cil/tis3d/common/module/TerminalModule.java b/src/main/java/li/cil/tis3d/common/module/TerminalModule.java
@@ -13,6 +13,7 @@
 import li.cil.tis3d.client.init.Textures;
 import li.cil.tis3d.client.render.font.AbstractFontRenderer;
 import li.cil.tis3d.client.render.font.NormalFontRenderer;
+import li.cil.tis3d.util.ColorUtils;
 import li.cil.tis3d.util.NBTIds;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -347,7 +348,7 @@ private void renderInput(final MatrixStack matrices, final VertexConsumer vcFont
                              final VertexConsumerProvider vcp,
                              final int light, final int overlay,
                              final AbstractFontRenderer fontRenderer, final int textWidth) {
-        int color = 0xFFFFFFFF;
+        int color = ColorUtils.WHITE;
 
         matrices.translate(0, 4, 0);
 

diff --git a/src/main/java/li/cil/tis3d/util/ColorUtils.java b/src/main/java/li/cil/tis3d/util/ColorUtils.java
@@ -23,6 +23,8 @@ public final class ColorUtils {
         0xFF000000  // 15: Black
     };
 
+    public static final int WHITE = COLORS[0];
+
     /**
      * Get an ARGB color value for the dye color with the specified index.
      *
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,8 @@ public final class ColorUtils { @@
 xFF000000  // 15: Black
         };
+        public static final int WHITE = COLORS[0];
         /**
          * Get an ARGB color value for the dye color with the specified index.
          *
@@ Expand Down @@