This commit is contained in:
Bella 2020-01-22 19:36:05 -05:00
parent d8197e2db5
commit 61908bb886
1 changed files with 38 additions and 8 deletions

View File

@ -5,6 +5,7 @@ import me.zeroeightsix.kami.module.Module;
import me.zeroeightsix.kami.setting.Setting;
import me.zeroeightsix.kami.setting.Settings;
import me.zeroeightsix.kami.util.bewwawho.InfoCalculator;
import me.zeroeightsix.kami.util.zeroeightysix.ColourUtils;
import net.minecraft.client.Minecraft;
import java.util.ArrayList;
@ -26,11 +27,17 @@ public class InfoOverlay extends Module {
public Setting<Boolean> durability = register(Settings.b("Durability", true));
public Setting<Boolean> memory = register(Settings.b("Memory", false));
public Setting<SpeedUnit> speedUnit = register(Settings.e("Speed Unit", SpeedUnit.KmH));
public Setting<ColourCode> firstColour = register(Settings.e("First Colour", ColourCode.WHITE));
public Setting<ColourCode> secondColour = register(Settings.e("Second Colour", ColourCode.BLUE));
public enum SpeedUnit {
MpS, KmH
}
private enum ColourCode {
BLACK, DARK_BLUE, DARK_GREEN, DARK_AQUA, DARK_RED, DARK_PURPLE, GOLD, GREY, DARK_GREY, BLUE, GREEN, AQUA, RED, LIGHT_PURPLE, YELLOW, WHITE
}
public boolean useUnitKmH() {
return speedUnit.getValue().equals(SpeedUnit.KmH);
}
@ -43,31 +50,54 @@ 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;
default: return "";
}
}
public ArrayList<String> infoContents() {
ArrayList<String> infoContents = new ArrayList<>();
if (version.getValue()) {
infoContents.add(KamiMod.colour + "b" + KamiMod.KAMI_KANJI + KamiMod.colour + "3 " + KamiMod.MODVER);
infoContents.add(textColour(firstColour.getValue()) + KamiMod.KAMI_KANJI + textColour(secondColour.getValue()) + " " + KamiMod.MODVER);
}
if (username.getValue()) {
infoContents.add(KamiMod.colour + "bWelcome" + KamiMod.colour + "3 " + mc.player.getName() + "!");
infoContents.add(textColour(firstColour.getValue()) + "Welcome " + textColour(secondColour.getValue()) + " " + mc.player.getName() + "!");
}
if (tps.getValue()) {
infoContents.add(KamiMod.colour + "b" + InfoCalculator.tps() + KamiMod.colour + "3 tps");
infoContents.add(textColour(firstColour.getValue()) + InfoCalculator.tps() + textColour(secondColour.getValue()) + " tps");
}
if (fps.getValue()) {
infoContents.add(KamiMod.colour + "b" + Minecraft.debugFPS + KamiMod.colour + "3 fps");
infoContents.add(textColour(firstColour.getValue()) + Minecraft.debugFPS + textColour(secondColour.getValue()) + " fps");
}
if (speed.getValue()) {
infoContents.add(KamiMod.colour + "b" + InfoCalculator.speed() + KamiMod.colour + "3 " + unitType(speedUnit.getValue()));
infoContents.add(textColour(firstColour.getValue()) + InfoCalculator.speed() + textColour(secondColour.getValue()) + " " + unitType(speedUnit.getValue()));
}
if (ping.getValue()) {
infoContents.add(KamiMod.colour + "b" + InfoCalculator.ping() + KamiMod.colour + "3 ms");
infoContents.add(textColour(firstColour.getValue()) + InfoCalculator.ping() + textColour(secondColour.getValue()) + " ms");
}
if (durability.getValue()) {
infoContents.add(KamiMod.colour + "b" + InfoCalculator.dura() + KamiMod.colour + "3 dura");
infoContents.add(textColour(firstColour.getValue()) + InfoCalculator.dura() + textColour(secondColour.getValue()) + " dura");
}
if (memory.getValue()) {
infoContents.add(KamiMod.colour + "b" + InfoCalculator.memory() + KamiMod.colour + "3mB free");
infoContents.add(textColour(firstColour.getValue()) + InfoCalculator.memory() + textColour(secondColour.getValue()) + "mB free");
}
return infoContents;
}