todo on combineRGB

Zorbatron · Zorbatron · commit 6456ed6f8925 · 2025-12-08T18:46:07.000-05:00
diff --git a/src/main/java/gregtech/api/util/GTUtility.java b/src/main/java/gregtech/api/util/GTUtility.java
@@ -1009,11 +1009,13 @@ public static long scaleVoltage(long voltage, int workingTier) {
         return Math.min(voltage, GTValues.VA[workingTier]);
     }
 
+    // TODO: remove once ColorUtil from pr 2858 is merged
     public static int combineRGB(@Range(from = 0, to = 255) int r, @Range(from = 0, to = 255) int g,
                                  @Range(from = 0, to = 255) int b) {
         return (r << 16) | (g << 8) | b;
     }
 
+    // TODO: remove once ColorUtil from pr 2858 is merged
     public static int combineRGB(@Range(from = 0, to = 255) int a, @Range(from = 0, to = 255) int r,
                                  @Range(from = 0, to = 255) int g, @Range(from = 0, to = 255) int b) {
         return (a << 24) | (r << 16) | (g << 8) | b;

Original file line number	Diff line number	Diff line change
`@@ -1009,11 +1009,13 @@ public static long scaleVoltage(long voltage, int workingTier) {`
`1009`	`1009`	`return Math.min(voltage, GTValues.VA[workingTier]);`
`1010`	`1010`	`}`
`1011`	`1011`
	`1012`	`+ // TODO: remove once ColorUtil from pr 2858 is merged`
`1012`	`1013`	`public static int combineRGB(@Range(from = 0, to = 255) int r, @Range(from = 0, to = 255) int g,`
`1013`	`1014`	`@Range(from = 0, to = 255) int b) {`
`1014`	`1015`	`return (r << 16) \| (g << 8) \| b;`
`1015`	`1016`	`}`
`1016`	`1017`
	`1018`	`+ // TODO: remove once ColorUtil from pr 2858 is merged`
`1017`	`1019`	`public static int combineRGB(@Range(from = 0, to = 255) int a, @Range(from = 0, to = 255) int r,`
`1018`	`1020`	`@Range(from = 0, to = 255) int g, @Range(from = 0, to = 255) int b) {`
`1019`	`1021`	`return (a << 24) \| (r << 16) \| (g << 8) \| b;`