Protocol update

.gitattributes

@@ -1,14 +1 @@
-# Auto detect text files and perform LF normalization
-*.java text=auto eol=lf
-*.xml text=auto eol=lf
-*.json text=auto eol=lf
-*.md text=auto eol=lf
-*.yml text=auto eol=lf
-*.ini text=auto eol=lf
-*.txt text=auto eol=lf
-*.bat text=auto eol=lf
-*.gradle text=auto eol=lf
-*.sh text=auto eol=lf
-*.html text=auto eol=lf
-*.properties text=auto eol=lf
-*.cmd text=auto eol=lf
+* text=auto eol=lf

pom.xml

@@ -83,6 +83,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.cloudburstmc</groupId>
+            <artifactId>cloudburst-api</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+
         <!-- Terminal -->
         <dependency>
             <groupId>net.minecrell</groupId>

src/main/java/co/aikar/timings/Timings.java

@@ -25,12 +25,12 @@
 
 import com.nukkitx.protocol.bedrock.BedrockPacket;
 import lombok.extern.log4j.Log4j2;
-import org.cloudburstmc.server.Server;
+import org.cloudburstmc.api.plugin.PluginContainer;
+import org.cloudburstmc.server.CloudServer;
 import org.cloudburstmc.server.blockentity.BlockEntity;
 import org.cloudburstmc.server.command.Command;
 import org.cloudburstmc.server.entity.EntityType;
 import org.cloudburstmc.server.event.Event;
-import org.cloudburstmc.server.plugin.PluginContainer;
 import org.cloudburstmc.server.scheduler.PluginTask;
 import org.cloudburstmc.server.scheduler.TaskHandler;
 
@@ -86,13 +86,13 @@ public final class Timings {
     public static final Timing permissionDefaultTimer;
 
     static {
-        setTimingsEnabled(Server.getInstance().getConfig().getTimings().isEnabled());
-        setVerboseEnabled(Server.getInstance().getConfig().getTimings().isVerbose());
-        setHistoryInterval(Server.getInstance().getConfig().getTimings().getHistoryInterval());
-        setHistoryLength(Server.getInstance().getConfig().getTimings().getHistoryLength());
+        setTimingsEnabled(CloudServer.getInstance().getConfig().getTimings().isEnabled());
+        setVerboseEnabled(CloudServer.getInstance().getConfig().getTimings().isVerbose());
+        setHistoryInterval(CloudServer.getInstance().getConfig().getTimings().getHistoryInterval());
+        setHistoryLength(CloudServer.getInstance().getConfig().getTimings().getHistoryLength());
 
-        privacy = Server.getInstance().getConfig().getTimings().isPrivacy();
-        ignoredConfigSections.addAll(Server.getInstance().getConfig().getTimings().getIgnore());
+        privacy = CloudServer.getInstance().getConfig().getTimings().isPrivacy();
+        ignoredConfigSections.addAll(CloudServer.getInstance().getConfig().getTimings().getIgnore());
 
         log.debug("Timings: \n" +
                 "Enabled - " + isTimingsEnabled() + "\n" +
@@ -182,7 +182,7 @@ public static void setHistoryLength(int length) {
         //For special cases of servers with special permission to bypass the max.
         //This max helps keep data file sizes reasonable for processing on Aikar's Timing parser side.
         //Setting this will not help you bypass the max unless Aikar has added an exception on the API side.
-        if (Server.getInstance().getConfig().getTimings().isBypassMax()) {
+        if (CloudServer.getInstance().getConfig().getTimings().isBypassMax()) {
             maxLength = Integer.MAX_VALUE;
         }
 

src/main/java/co/aikar/timings/TimingsExport.java

@@ -27,7 +27,7 @@
 import lombok.extern.log4j.Log4j2;
 import org.apache.logging.log4j.Level;
 import org.cloudburstmc.server.Bootstrap;
-import org.cloudburstmc.server.Server;
+import org.cloudburstmc.server.CloudServer;
 import org.cloudburstmc.server.command.CommandSender;
 import org.cloudburstmc.server.command.ConsoleCommandSender;
 import org.cloudburstmc.server.locale.TranslationContainer;
@@ -66,16 +66,16 @@ private TimingsExport(CommandSender sender, ObjectNode out, TimingsHistory[] his
      */
     public static void reportTimings(CommandSender sender) {
         ObjectNode out = Bootstrap.JSON_MAPPER.createObjectNode();
-        out.put("version", Server.getInstance().getVersion());
-        out.put("maxplayers", Server.getInstance().getMaxPlayers());
+        out.put("version", CloudServer.getInstance().getVersion());
+        out.put("maxplayers", CloudServer.getInstance().getMaxPlayers());
         out.put("start", TimingsManager.timingStart / 1000);
         out.put("end", System.currentTimeMillis() / 1000);
         out.put("sampletime", (System.currentTimeMillis() - TimingsManager.timingStart) / 1000);
 
         if (!Timings.isPrivacy()) {
-            out.put("server", Server.getInstance().getName());
-            out.put("motd", Server.getInstance().getMotd());
-            out.put("online-mode", Server.getInstance().getConfig().isXboxAuth());
+            out.put("server", CloudServer.getInstance().getName());
+            out.put("motd", CloudServer.getInstance().getMotd());
+            out.put("online-mode", CloudServer.getInstance().getConfig().isXboxAuth());
             out.put("icon", ""); //"data:image/png;base64,"
         }
 
@@ -123,7 +123,7 @@ public static void reportTimings(CommandSender sender) {
         out.set("idmap", idmap);
 
         //Information about loaded plugins
-        out.set("plugins", JsonUtil.mapToObject(Server.getInstance().getPluginManager().getAllPlugins(), (plugin) -> {
+        out.set("plugins", JsonUtil.mapToObject(CloudServer.getInstance().getPluginManager().getAllPlugins(), (plugin) -> {
             ObjectNode jsonPlugin = Bootstrap.JSON_MAPPER.createObjectNode();
             jsonPlugin.put("version", plugin.getDescription().getVersion());
 
@@ -136,7 +136,7 @@ public static void reportTimings(CommandSender sender) {
         //Information on the users Config
         ObjectNode config = Bootstrap.JSON_MAPPER.createObjectNode();
         if (!Timings.getIgnoredConfigSections().contains("all")) {
-            final ObjectNode rootNode = Server.getInstance().getConfig().getCloudburstYaml().getRootNode();
+            final ObjectNode rootNode = CloudServer.getInstance().getConfig().getCloudburstYaml().getRootNode();
             Timings.getIgnoredConfigSections().forEach(rootNode::remove);
             config.set("cloudburst", rootNode);
         } else {
@@ -193,7 +193,7 @@ public void run() {
         try {
             HttpURLConnection con = (HttpURLConnection) new URL("http://timings.aikar.co/post").openConnection();
             con.setDoOutput(true);
-            con.setRequestProperty("User-Agent", "Cloudburst/" + Server.getInstance().getName() + "/" + InetAddress.getLocalHost().getHostName());
+            con.setRequestProperty("User-Agent", "Cloudburst/" + CloudServer.getInstance().getName() + "/" + InetAddress.getLocalHost().getHostName());
             con.setRequestMethod("POST");
             con.setInstanceFollowRedirects(false);
 
@@ -214,23 +214,23 @@ public void run() {
             String location = con.getHeaderField("Location");
             this.sender.sendMessage(new TranslationContainer("cloudburst.command.timings.timingsLocation", location));
             if (!(this.sender instanceof ConsoleCommandSender)) {
-                log.info(Server.getInstance().getLanguage().translate("cloudburst.command.timings.timingsLocation", location));
+                log.info(CloudServer.getInstance().getLanguage().translate("cloudburst.command.timings.timingsLocation", location));
             }
 
             if (response != null && !response.isEmpty()) {
-                log.info(Server.getInstance().getLanguage().translate("cloudburst.command.timings.timingsResponse", response));
+                log.info(CloudServer.getInstance().getLanguage().translate("cloudburst.command.timings.timingsResponse", response));
             }
 
-            File timingFolder = new File(Server.getInstance().getDataPath() + File.separator + "timings");
+            File timingFolder = new File(CloudServer.getInstance().getDataPath() + File.separator + "timings");
             timingFolder.mkdirs();
             String fileName = timingFolder + File.separator + new SimpleDateFormat("'timings-'yyyy-MM-dd-hh-mm'.txt'").format(new Date());
 
             FileWriter writer = new FileWriter(fileName);
-            writer.write(Server.getInstance().getLanguage().translate("cloudburst.command.timings.timingsLocation", location) + "\n\n");
+            writer.write(CloudServer.getInstance().getLanguage().translate("cloudburst.command.timings.timingsLocation", location) + "\n\n");
             writer.write(Bootstrap.JSON_MAPPER.writerWithDefaultPrettyPrinter().writeValueAsString(this.out));
             writer.close();
 
-            log.info(Server.getInstance().getLanguage().translate("cloudburst.command.timings.timingsWrite", fileName));
+            log.info(CloudServer.getInstance().getLanguage().translate("cloudburst.command.timings.timingsWrite", fileName));
         } catch (IOException exception) {
             this.sender.sendMessage(TextFormat.RED + "" + new TranslationContainer("cloudburst.command.timings.reportError"));
             if (response != null) {

src/main/java/co/aikar/timings/TimingsHistory.java

@@ -27,7 +27,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.val;
 import org.cloudburstmc.server.Bootstrap;
-import org.cloudburstmc.server.Server;
+import org.cloudburstmc.server.CloudServer;
 import org.cloudburstmc.server.blockentity.BlockEntity;
 import org.cloudburstmc.server.entity.Entity;
 import org.cloudburstmc.server.level.Level;
@@ -96,7 +96,7 @@ public class TimingsHistory {
         final Map<Identifier, AtomicInteger> entityCounts = new HashMap<>();
         final Map<Identifier, AtomicInteger> blockEntityCounts = new HashMap<>();
         // Information about all loaded entities/block entities
-        for (Level level : Server.getInstance().getLevels()) {
+        for (Level level : CloudServer.getInstance().getLevels()) {
             ArrayNode jsonLevel = Bootstrap.JSON_MAPPER.createArrayNode();
             for (Chunk chunk : level.getChunks()) {
                 entityCounts.clear();
@@ -214,7 +214,7 @@ private static class PingRecord {
         final double avg;
 
         PingRecord() {
-            final Collection<Player> onlinePlayers = Server.getInstance().getOnlinePlayers().values();
+            final Collection<Player> onlinePlayers = CloudServer.getInstance().getOnlinePlayers().values();
             int totalPing = 0;
             for (Player player : onlinePlayers) {
                 totalPing += player.getPing();

src/main/java/co/aikar/timings/TimingsManager.java

@@ -23,7 +23,7 @@
  */
 package co.aikar.timings;
 
-import org.cloudburstmc.server.Server;
+import org.cloudburstmc.server.CloudServer;
 
 import java.util.*;
 
@@ -64,7 +64,7 @@ static void tick() {
                 }
             }
 
-            TimingsHistory.playerTicks += Server.getInstance().getOnlinePlayers().size();
+            TimingsHistory.playerTicks += CloudServer.getInstance().getOnlinePlayers().size();
             TimingsHistory.timedTicks++;
         }
     }

src/main/java/org/cloudburstmc/server/Achievement.java

@@ -30,10 +30,10 @@ public static boolean broadcast(Player player, String achievementId) {
         if (!achievements.containsKey(achievementId)) {
             return false;
         }
-        String translation = Server.getInstance().getLanguage().translate("chat.type.achievement", player.getDisplayName(), TextFormat.GREEN + achievements.get(achievementId).getMessage() + TextFormat.RESET);
+        String translation = CloudServer.getInstance().getLanguage().translate("chat.type.achievement", player.getDisplayName(), TextFormat.GREEN + achievements.get(achievementId).getMessage() + TextFormat.RESET);
 
-        if (Server.getInstance().getConfig().isAnnouncePlayerAchievements()) {
-            Server.getInstance().broadcastMessage(translation);
+        if (CloudServer.getInstance().getConfig().isAnnouncePlayerAchievements()) {
+            CloudServer.getInstance().broadcastMessage(translation);
         } else {
             player.sendMessage(translation);
         }
@@ -62,10 +62,10 @@ public String getMessage() {
     }
 
     public void broadcast(Player player) {
-        String translation = Server.getInstance().getLanguage().translate("chat.type.achievement", player.getDisplayName(), TextFormat.GREEN + this.getMessage(), null);
+        String translation = CloudServer.getInstance().getLanguage().translate("chat.type.achievement", player.getDisplayName(), TextFormat.GREEN + this.getMessage(), null);
 
-        if (Server.getInstance().getConfig().isAnnouncePlayerAchievements()) {
-            Server.getInstance().broadcastMessage(translation);
+        if (CloudServer.getInstance().getConfig().isAnnouncePlayerAchievements()) {
+            CloudServer.getInstance().broadcastMessage(translation);
         } else {
             player.sendMessage(translation);
         }

src/main/java/org/cloudburstmc/server/AdventureSettings.java

@@ -61,7 +61,7 @@ public void update() {
         pk.setPlayerPermission((player.isOp() && !player.isSpectator() ? PlayerPermission.OPERATOR : PlayerPermission.MEMBER));
         pk.setUniqueEntityId(player.getUniqueId());
 
-        Server.broadcastPacket(player.getViewers(), pk);
+        CloudServer.broadcastPacket(player.getViewers(), pk);
         player.sendPacket(pk);
 
         player.resetInAirTicks();

src/main/java/org/cloudburstmc/server/Bootstrap.java

@@ -40,7 +40,7 @@
  */
 
 /**
- * The entry point of Cloudburst Server.
+ * The entry point of Cloudburst CloudServer.
  */
 @Log4j2
 public class Bootstrap {
@@ -141,7 +141,7 @@ public static void main(String[] args) {
 
         String language = options.valueOf(languageSpec);
 
-        Server server = new Server(dataPath, pluginPath, levelPath, language);
+        CloudServer server = new CloudServer(dataPath, pluginPath, levelPath, language);
 
         try {
             if (TITLE) {
@@ -153,7 +153,7 @@ public static void main(String[] args) {
         }
 
         if (TITLE) {
-            System.out.print((char) 0x1b + "]0;Stopping Server..." + (char) 0x07);
+            System.out.print((char) 0x1b + "]0;Stopping CloudServer..." + (char) 0x07);
         }
         log.info("Stopping other threads");