MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removed Property Dependencies

Browse source
This commit is contained in:
Frank 2022-07-13 00:12:16 +02:00
parent 9753373429
commit 9e3ba00db8
40 changed files with 93 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/org/betterx/ui/ColorUtil.java
View file

@ -16,7 +16,6 @@ import net.minecraft.world.item.Item;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.impl.client.indigo.renderer.helper.ColorHelper;
import com.google.common.collect.Maps;
@ -267,8 +266,23 @@ public class ColorUtil {
return HSBtoRGB(FLOAT_BUFFER[0], FLOAT_BUFFER[1], FLOAT_BUFFER[2]);
}
public static int multiplyColor(int color1, int color2) {
if (color1 == -1) {
return color2;
} else if (color2 == -1) {
return color1;
}
final int alpha = ((color1 >> 24) & 0xFF) * ((color2 >> 24) & 0xFF) / 0xFF;
final int red = ((color1 >> 16) & 0xFF) * ((color2 >> 16) & 0xFF) / 0xFF;
final int green = ((color1 >> 8) & 0xFF) * ((color2 >> 8) & 0xFF) / 0xFF;
final int blue = (color1 & 0xFF) * (color2 & 0xFF) / 0xFF;
return (alpha << 24) | (red << 16) | (green << 8) | blue;
}
public static int applyTint(int color, int tint) {
return colorBrigtness(ColorHelper.multiplyColor(color, tint), 1.5F);
return colorBrigtness(multiplyColor(color, tint), 1.5F);
}
public static int colorDistance(int color1, int color2) {