diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/ClientBlockStateColorCache.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/ClientBlockStateColorCache.java index 3179b7522..c8b929091 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/ClientBlockStateColorCache.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/ClientBlockStateColorCache.java @@ -324,12 +324,12 @@ public class ClientBlockStateColorCache if (count == 0) { // this block is entirely transparent - tempColor = ColorUtil.rgbToInt(0, 255, 255, 255); + tempColor = ColorUtil.argbToInt(0, 255, 255, 255); } else { // determine the average color - tempColor = ColorUtil.rgbToInt( + tempColor = ColorUtil.argbToInt( alpha / count, linearToSrgb((float) (red / (double) alpha)), linearToSrgb((float) (green / (double) alpha)), @@ -337,10 +337,10 @@ public class ClientBlockStateColorCache } //check if not missing texture - if (tempColor == ColorUtil.rgbToInt(255, 182, 0, 182)) + if (tempColor == ColorUtil.argbToInt(255, 182, 0, 182)) { //make it not render at all - tempColor = ColorUtil.rgbToInt(0, 255, 255, 255); + tempColor = ColorUtil.argbToInt(0, 255, 255, 255); } return tempColor; } diff --git a/coreSubProjects b/coreSubProjects index 59767c807..fd794cd55 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 59767c807b1193c184aed7b82baf55337e6ad786 +Subproject commit fd794cd55d874e89a988989f5cad61a1e2599140