RepoMirrors
/
kami-blue
mirror of https://github.com/kami-blue/client
1
0
Fork 1
Code Issues Releases Wiki Activity

close #417

This commit is contained in:
Bella 2020-01-28 12:54:35 -05:00
parent 141ec32db1
commit 8a29ac5cdb
2 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/me/zeroeightsix/kami/module/modules/gui/InfoOverlay.java
View File

@ -7,6 +7,7 @@ import me.zeroeightsix.kami.setting.Settings;
import me.zeroeightsix.kami.util.ColourUtils;
import me.zeroeightsix.kami.util.InfoCalculator;
import net.minecraft.client.Minecraft;
import net.minecraft.util.text.TextFormatting;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@ -91,22 +92,22 @@ public class InfoOverlay extends Module {
private String textColour(ColourCode c) {
switch (c) {
case BLACK: return ColourUtils.ColourCodesMinecraft.BLACK_CC;
case DARK_BLUE: return ColourUtils.ColourCodesMinecraft.DARK_BLUE_CC;
case DARK_GREEN: return ColourUtils.ColourCodesMinecraft.DARK_GREEN_CC;
case DARK_AQUA: return ColourUtils.ColourCodesMinecraft.DARK_AQUA_CC;
case DARK_RED: return ColourUtils.ColourCodesMinecraft.DARK_RED_CC;
case DARK_PURPLE: return ColourUtils.ColourCodesMinecraft.DARK_PURPLE_CC;
case GOLD: return ColourUtils.ColourCodesMinecraft.GOLD_CC;
case GREY: return ColourUtils.ColourCodesMinecraft.GREY_CC;
case DARK_GREY: return ColourUtils.ColourCodesMinecraft.DARK_GREY_CC;
case BLUE: return ColourUtils.ColourCodesMinecraft.BLUE_CC;
case GREEN: return ColourUtils.ColourCodesMinecraft.GREEN_CC;
case AQUA: return ColourUtils.ColourCodesMinecraft.AQUA_CC;
case RED: return ColourUtils.ColourCodesMinecraft.RED_CC;
case LIGHT_PURPLE: return ColourUtils.ColourCodesMinecraft.LIGHT_PURPLE_CC;
case YELLOW: return ColourUtils.ColourCodesMinecraft.YELLOW_CC;
case WHITE: return ColourUtils.ColourCodesMinecraft.WHITE_CC;
case BLACK: return TextFormatting.BLACK.toString();
case DARK_BLUE: return TextFormatting.DARK_BLUE.toString();
case DARK_GREEN: return TextFormatting.DARK_GREEN.toString();
case DARK_AQUA: return TextFormatting.DARK_AQUA.toString();
case DARK_RED: return TextFormatting.DARK_RED.toString();
case DARK_PURPLE: return TextFormatting.DARK_PURPLE.toString();
case GOLD: return TextFormatting.GOLD.toString();
case GREY: return TextFormatting.GRAY.toString();
case DARK_GREY: return TextFormatting.DARK_GRAY.toString();
case BLUE: return TextFormatting.BLUE.toString();
case GREEN: return TextFormatting.GREEN.toString();
case AQUA: return TextFormatting.AQUA.toString();
case RED: return TextFormatting.RED.toString();
case LIGHT_PURPLE: return TextFormatting.LIGHT_PURPLE.toString();
case YELLOW: return TextFormatting.YELLOW.toString();
case WHITE: return TextFormatting.WHITE.toString();
default: return "";
}
}

17
src/main/java/me/zeroeightsix/kami/util/ColourUtils.java
View File

@ -301,6 +301,7 @@ public class ColourUtils {
/**
* @author S-B99 22/01/20
* https://minecraft.gamepedia.com/Formatting_codes#Color_codes
* For strings please see TextFormatting.COLOUR.toString();
*/
public static class ColourCodesMinecraft {
public final static int BLACK = toRGBA(0, 0, 0, 255);
@ -319,22 +320,6 @@ public class ColourUtils {
public final static int LIGHT_PURPLE = toRGBA(255, 85, 255, 255);
public final static int YELLOW = toRGBA(255, 255, 85, 255);
public final static int WHITE = toRGBA(255, 255, 255, 255);
public final static String BLACK_CC = KamiMod.colour + "0";
public final static String DARK_BLUE_CC = KamiMod.colour + "1";
public final static String DARK_GREEN_CC = KamiMod.colour + "2";
public final static String DARK_AQUA_CC = KamiMod.colour + "3";
public final static String DARK_RED_CC = KamiMod.colour + "4";
public final static String DARK_PURPLE_CC = KamiMod.colour + "5";
public final static String GOLD_CC = KamiMod.colour + "6";
public final static String GREY_CC = KamiMod.colour + "7";
public final static String DARK_GREY_CC = KamiMod.colour + "8";
public final static String BLUE_CC = KamiMod.colour + "9";
public final static String GREEN_CC = KamiMod.colour + "a";
public final static String AQUA_CC = KamiMod.colour + "b";
public final static String RED_CC = KamiMod.colour + "c";
public final static String LIGHT_PURPLE_CC = KamiMod.colour + "d";
public final static String YELLOW_CC = KamiMod.colour + "e";
public final static String WHITE_CC = KamiMod.colour + "f";
}
public static final int changeAlpha(int origColor, int userInputedAlpha) {