Skip to content

Commit ba682f4

Browse files
terminalsinterminalsin
committed
chore(obfuscator): more ui changes + warning for low memory amounts
1 parent e2d972b commit ba682f4

3 files changed

Lines changed: 105 additions & 3 deletions

File tree

‎obfuscator/src/main/java/dev/skidfuscator/obfuscator/command/ObfuscateCommand.java‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22

33
import dev.skidfuscator.obfuscator.Skidfuscator;
44
import dev.skidfuscator.obfuscator.SkidfuscatorSession;
5+
import dev.skidfuscator.obfuscator.util.ConsoleColors;
56
import dev.skidfuscator.obfuscator.util.MiscUtil;
67
import picocli.CommandLine;
78

89
import java.io.File;
10+
import java.text.DateFormat;
911
import java.time.Instant;
1012
import java.util.Date;
1113
import java.util.concurrent.Callable;
@@ -83,10 +85,25 @@ public Integer call() {
8385
+ String.format("%-19.19s", freeMemory + "mb");
8486

8587
final long maxMemory = Math.round(Runtime.getRuntime().maxMemory() / 1E6);
86-
final String topMemory =
88+
final String memoryString = (maxMemory == Long.MAX_VALUE
89+
? ConsoleColors.GREEN + "no limit"
90+
: maxMemory + "mb"
91+
);
92+
String topMemory =
8793
String.format("%19.19s", "Max Memory:")
8894
+ " "
89-
+ String.format("%-19.19s", (maxMemory == Long.MAX_VALUE ? "no limit" : maxMemory) + "mb");
95+
+ String.format("%-19.19s",
96+
memoryString + (maxMemory > 1500 ? "" : " ⚠️")
97+
);
98+
99+
topMemory = MiscUtil.replaceColor(
100+
topMemory,
101+
memoryString,
102+
maxMemory > 1500 ? ConsoleColors.GREEN_BRIGHT : ConsoleColors.RED_BRIGHT
103+
);
104+
// slight fix for thing
105+
topMemory = topMemory.replace("⚠️", "⚠️ ");
106+
90107
final String[] logo = new String[] {
91108
"",
92109
" /$$$$$$ /$$ /$$ /$$ /$$$$$$ /$$",
@@ -104,7 +121,8 @@ public Integer call() {
104121
" │ " + topMemory + " │",
105122
" └───────────────────────────────────────────┘",
106123
"",
107-
" Author: Ghast Version: 2.0.2 Today: " + new Date(Instant.now().toEpochMilli()).toGMTString(),
124+
" Author: Ghast Version: 2.0.2 Today: "
125+
+ DateFormat.getDateTimeInstance().format(new Date(Instant.now().toEpochMilli())),
108126
""
109127
};
110128

‎obfuscator/src/main/java/dev/skidfuscator/obfuscator/util/ConsoleColors.java‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
package dev.skidfuscator.obfuscator.util;
2+
3+
public class ConsoleColors {
4+
// Reset
5+
public static final String RESET = "\033[0m"; // Text Reset
6+
7+
// Regular Colors
8+
public static final String BLACK = "\033[0;30m"; // BLACK
9+
public static final String RED = "\033[0;31m"; // RED
10+
public static final String GREEN = "\033[0;32m"; // GREEN
11+
public static final String YELLOW = "\033[0;33m"; // YELLOW
12+
public static final String BLUE = "\033[0;34m"; // BLUE
13+
public static final String PURPLE = "\033[0;35m"; // PURPLE
14+
public static final String CYAN = "\033[0;36m"; // CYAN
15+
public static final String WHITE = "\033[0;37m"; // WHITE
16+
17+
// Bold
18+
public static final String BLACK_BOLD = "\033[1;30m"; // BLACK
19+
public static final String RED_BOLD = "\033[1;31m"; // RED
20+
public static final String GREEN_BOLD = "\033[1;32m"; // GREEN
21+
public static final String YELLOW_BOLD = "\033[1;33m"; // YELLOW
22+
public static final String BLUE_BOLD = "\033[1;34m"; // BLUE
23+
public static final String PURPLE_BOLD = "\033[1;35m"; // PURPLE
24+
public static final String CYAN_BOLD = "\033[1;36m"; // CYAN
25+
public static final String WHITE_BOLD = "\033[1;37m"; // WHITE
26+
27+
// Underline
28+
public static final String BLACK_UNDERLINED = "\033[4;30m"; // BLACK
29+
public static final String RED_UNDERLINED = "\033[4;31m"; // RED
30+
public static final String GREEN_UNDERLINED = "\033[4;32m"; // GREEN
31+
public static final String YELLOW_UNDERLINED = "\033[4;33m"; // YELLOW
32+
public static final String BLUE_UNDERLINED = "\033[4;34m"; // BLUE
33+
public static final String PURPLE_UNDERLINED = "\033[4;35m"; // PURPLE
34+
public static final String CYAN_UNDERLINED = "\033[4;36m"; // CYAN
35+
public static final String WHITE_UNDERLINED = "\033[4;37m"; // WHITE
36+
37+
// Background
38+
public static final String BLACK_BACKGROUND = "\033[40m"; // BLACK
39+
public static final String RED_BACKGROUND = "\033[41m"; // RED
40+
public static final String GREEN_BACKGROUND = "\033[42m"; // GREEN
41+
public static final String YELLOW_BACKGROUND = "\033[43m"; // YELLOW
42+
public static final String BLUE_BACKGROUND = "\033[44m"; // BLUE
43+
public static final String PURPLE_BACKGROUND = "\033[45m"; // PURPLE
44+
public static final String CYAN_BACKGROUND = "\033[46m"; // CYAN
45+
public static final String WHITE_BACKGROUND = "\033[47m"; // WHITE
46+
47+
// High Intensity
48+
public static final String BLACK_BRIGHT = "\033[0;90m"; // BLACK
49+
public static final String RED_BRIGHT = "\033[0;91m"; // RED
50+
public static final String GREEN_BRIGHT = "\033[0;92m"; // GREEN
51+
public static final String YELLOW_BRIGHT = "\033[0;93m"; // YELLOW
52+
public static final String BLUE_BRIGHT = "\033[0;94m"; // BLUE
53+
public static final String PURPLE_BRIGHT = "\033[0;95m"; // PURPLE
54+
public static final String CYAN_BRIGHT = "\033[0;96m"; // CYAN
55+
public static final String WHITE_BRIGHT = "\033[0;97m"; // WHITE
56+
57+
// Bold High Intensity
58+
public static final String BLACK_BOLD_BRIGHT = "\033[1;90m"; // BLACK
59+
public static final String RED_BOLD_BRIGHT = "\033[1;91m"; // RED
60+
public static final String GREEN_BOLD_BRIGHT = "\033[1;92m"; // GREEN
61+
public static final String YELLOW_BOLD_BRIGHT = "\033[1;93m";// YELLOW
62+
public static final String BLUE_BOLD_BRIGHT = "\033[1;94m"; // BLUE
63+
public static final String PURPLE_BOLD_BRIGHT = "\033[1;95m";// PURPLE
64+
public static final String CYAN_BOLD_BRIGHT = "\033[1;96m"; // CYAN
65+
public static final String WHITE_BOLD_BRIGHT = "\033[1;97m"; // WHITE
66+
67+
// High Intensity backgrounds
68+
public static final String BLACK_BACKGROUND_BRIGHT = "\033[0;100m";// BLACK
69+
public static final String RED_BACKGROUND_BRIGHT = "\033[0;101m";// RED
70+
public static final String GREEN_BACKGROUND_BRIGHT = "\033[0;102m";// GREEN
71+
public static final String YELLOW_BACKGROUND_BRIGHT = "\033[0;103m";// YELLOW
72+
public static final String BLUE_BACKGROUND_BRIGHT = "\033[0;104m";// BLUE
73+
public static final String PURPLE_BACKGROUND_BRIGHT = "\033[0;105m"; // PURPLE
74+
public static final String CYAN_BACKGROUND_BRIGHT = "\033[0;106m"; // CYAN
75+
public static final String WHITE_BACKGROUND_BRIGHT = "\033[0;107m"; // WHITE
76+
}

‎obfuscator/src/main/java/dev/skidfuscator/obfuscator/util/MiscUtil.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@ public String fixedLengthString(String string, int length) {
2828
return String.format("%1$"+length+ "s", string);
2929
}
3030

31+
public String appendColor(final String string, final String color) {
32+
return color + string + "\033[0m" /* reset color ansi*/;
33+
}
34+
35+
public String replaceColor(final String string, final String replace, final String color) {
36+
return string.replace(replace, color + replace + "\033[0m" /* reset color ansi*/);
37+
}
38+
3139
public int getJavaVersion() {
3240
String version = System.getProperty("java.version");
3341
if(version.startsWith("1.")) {

0 commit comments

Comments
 (0)