diff --git a/pom.xml b/pom.xml
index 557fc959..5fa89a3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.eu.habbo
Habbo
- 2.2.2
+ 2.3.0
UTF-8
@@ -79,7 +79,11 @@
central
- http://repo1.maven.org/maven2/
+ https://repo1.maven.org/maven2/
+
+
+ mvnrepo
+ https://mvnrepository.com/
@@ -91,6 +95,14 @@
4.1.36.Final
+
+
+ org.fusesource.jansi
+ jansi
+ 1.18
+
+
+
io.netty
netty-codec-http
@@ -182,4 +194,12 @@
+
+
+
+ internal.repo
+ Internal repo
+ file:///home/thara/testesb/in
+
+
\ No newline at end of file
diff --git a/src/main/java/com/eu/habbo/Emulator.java b/src/main/java/com/eu/habbo/Emulator.java
index 4ea10616..e82431ca 100644
--- a/src/main/java/com/eu/habbo/Emulator.java
+++ b/src/main/java/com/eu/habbo/Emulator.java
@@ -17,6 +17,7 @@ import com.eu.habbo.plugin.events.emulator.EmulatorStartShutdownEvent;
import com.eu.habbo.plugin.events.emulator.EmulatorStoppedEvent;
import com.eu.habbo.threading.ThreadPooling;
import com.eu.habbo.util.imager.badges.BadgeImager;
+import org.fusesource.jansi.AnsiConsole;
import java.io.*;
import java.security.MessageDigest;
@@ -28,27 +29,30 @@ import java.util.Random;
public final class Emulator {
+
public final static int MAJOR = 2;
-
-
public final static int MINOR = 3;
-
-
public final static int BUILD = 0;
+ public static final String ANSI_RED = "\u001B[31m";
+ public static final String ANSI_BLUE = "\u001B[34m";
+ public static final String ANSI_PURPLE = "\u001B[35m";
+ public static final String ANSI_WHITE = "\u001B[37m";
+ public static final String ANSI_YELLOW = "\u001B[33m";
public final static String PREVIEW = "RC-1";
public static final String version = "Arcturus Morningstar" + " " + MAJOR + "." + MINOR + "." + BUILD + " " + PREVIEW;
private static final String logo =
+ "\n" +
+ "███╗ ███╗ ██████╗ ██████╗ ███╗ ██╗██╗███╗ ██╗ ██████╗ ███████╗████████╗ █████╗ ██████╗ \n" +
+ "████╗ ████║██╔═══██╗██╔══██╗████╗ ██║██║████╗ ██║██╔════╝ ██╔════╝╚══██╔══╝██╔══██╗██╔══██╗\n" +
+ "██╔████╔██║██║ ██║██████╔╝██╔██╗ ██║██║██╔██╗ ██║██║ ███╗███████╗ ██║ ███████║██████╔╝\n" +
+ "██║╚██╔╝██║██║ ██║██╔══██╗██║╚██╗██║██║██║╚██╗██║██║ ██║╚════██║ ██║ ██╔══██║██╔══██╗\n" +
+ "██║ ╚═╝ ██║╚██████╔╝██║ ██║██║ ╚████║██║██║ ╚████║╚██████╔╝███████║ ██║ ██║ ██║██║ ██║\n" +
+ "╚═╝ ╚═╝ ╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═══╝╚═╝╚═╝ ╚═══╝ ╚═════╝ ╚══════╝ ╚═╝ ╚═╝ ╚═╝╚═╝ ╚═╝\n" +
+ " ";
- " \n" +
- " __ ___ _ A R C T U R U S __ \n" +
- " / |/ /___ _________ (_)___ ____ ______/ /_____ ______ \n" +
- " / /|_/ / __ \\/ ___/ __ \\/ / __ \\/ __ `/ ___/ __/ __ `/ ___/ \n" +
- " / / / / /_/ / / / / / / / / / / /_/ (__ ) /_/ /_/ / / \n" +
- "/_/ /_/\\____/_/ /_/ /_/_/_/ /_/\\__, /____/\\__/\\__,_/_/ \n" +
- " /____/ \n" ;
public static String build = "";
public static boolean isReady = false;
public static boolean isShuttingDown = false;
@@ -81,14 +85,18 @@ public final class Emulator {
public static void main(String[] args) throws Exception {
try {
+ AnsiConsole.systemInstall();
Locale.setDefault(new Locale("en"));
-
setBuild();
Emulator.stopped = false;
ConsoleCommand.load();
Emulator.logging = new Logging();
- Emulator.getLogging().logStart("\r" + Emulator.logo +
- " Build: " + build + "\n");
+ System.out.println(ANSI_PURPLE + logo );
+ System.out.println(ANSI_WHITE + "This project is for educational purposes only. This Emulator is an open-source fork of Arcturus created by TheGeneral.");
+ System.out.println(ANSI_BLUE + "[VERSION] " + ANSI_WHITE + version);
+ System.out.println(ANSI_RED + "[BUILD] " + ANSI_WHITE + build + "\n");
+ System.out.println(ANSI_YELLOW + "[KREWS] " + ANSI_WHITE + "Remember to sign up your hotel to join our toplist beta at https://bit.ly/2NN0rxq" );
+ System.out.println(ANSI_YELLOW + "[KREWS] " + ANSI_WHITE + "Join our discord at https://discord.gg/syuqgN" + "\n");
random = new Random();
long startTime = System.nanoTime();
@@ -119,7 +127,6 @@ public final class Emulator {
Emulator.getLogging().logStart("Memory: " + (runtime.totalMemory() - runtime.freeMemory()) / (1024 * 1024) + "/" + (runtime.freeMemory()) / (1024 * 1024) + "MB");
Emulator.debugging = Emulator.getConfig().getBoolean("debug.mode");
-
if (debugging) {
Emulator.getLogging().logDebugLine("Debugging Enabled!");
}
@@ -134,10 +141,6 @@ public final class Emulator {
Emulator.getThreading().run(() -> {
- Emulator.getLogging().logStart("Please note, Arcturus Emulator is a project by TheGeneral, we take no credit for the original work, and only the work we have continued. If you'd like to support the project, join our discord at: ");
- Emulator.getLogging().logStart("https://discord.gg/syuqgN");
- Emulator.getLogging().logStart("Please report bugs on our git at Krews.org.");
- System.out.println("Waiting for commands: ");
}, 1500);
BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
@@ -189,6 +192,7 @@ public final class Emulator {
}
private static void dispose() {
+
Emulator.getThreading().setCanAdd(false);
Emulator.isShuttingDown = true;
Emulator.isReady = false;
@@ -245,16 +249,17 @@ public final class Emulator {
Emulator.gameServer.stop();
} catch (Exception e) {
}
-
Emulator.getLogging().logShutdownLine("Stopped Arcturus Emulator " + version + "...");
if (Emulator.database != null) {
Emulator.getDatabase().dispose();
}
Emulator.stopped = true;
+ AnsiConsole.systemUninstall();
try {
if (Emulator.threading != null)
+
Emulator.threading.shutDown();
} catch (Exception e) {
}