Merge branch 'main' into readme

.github/workflows/build.yml

@@ -8,23 +8,25 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
-
+        uses: actions/checkout@v4
       - name: Set up GraalVM with Java 21
         uses: graalvm/setup-graalvm@v1
         with:
-          version: '21.3.0'  # Utilisez la version de GraalVM souhaitée
-          java-version: '21'
-          components: native-image  # Installe également le composant Native Image de GraalVM
+          java-version: '21'      # See 'Options' section below for all supported versions
+          distribution: 'graalvm' # See 'Options' section below for all available distributions
+          native-image-job-reports: 'true'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Maven
-        uses: actions/setup-java@v3
+        uses: graalvm/setup-graalvm@v1
         with:
-          distribution: 'graalvm'  # Spécifie que nous utilisons GraalVM
-          java-version: '21'
+          java-version: '21'      # See 'Options' section below for all supported versions
+          distribution: 'graalvm' # See 'Options' section below for all available distributions
+          native-image-job-reports: 'true'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Cache Maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -34,8 +36,10 @@ jobs:
       - name: Build with Maven
         run: mvn clean package
 
-      # Optionnel : Générer une image native avec GraalVM
-      - name: Build Native Image
-        run: |
-          mvn package -Pnative
-        if: success()  # N'exécute cette étape que si la construction précédente a réussi
+      - name: Upload release artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: release_artifacts
+          path: |
+            ${{ github.workspace }}/target/Sculk-1.0-SNAPSHOT.jar
+            ${{ github.workspace }}/target/Sculk-1.0-SNAPSHOT-jar-with-dependencies.jar

.gitignore

@@ -31,3 +31,15 @@ banned-ip.txt
 banned-players.txt
 server.properties
 .run/sculk.yml
+.run/logs/
+.run/players
+.run/plugin_data
+.run/plugins
+.run/resource_packs
+.run/worlds
+.run/banned-ip.txt
+.run/banned-players.txt
+.run/op.txt
+.run/sculk.yml
+.run/server.properties
+.run/whitelist.txt

.run/Sculk.run.xml

@@ -1,6 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Sculk" type="Application" factoryName="Application" nameIsGenerated="true">
     <option name="MAIN_CLASS_NAME" value="org.sculk.Sculk" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.run" />
     <module name="Sculk" />
     <extension name="coverage">
       <pattern>

Sculk.iml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="AdditionalModuleElements">
+    <content url="file://$MODULE_DIR$" dumb="true">
+      <excludeFolder url="file://$MODULE_DIR$/.run/logs" />
+      <excludeFolder url="file://$MODULE_DIR$/.run/players" />
+      <excludeFolder url="file://$MODULE_DIR$/.run/plugin_data" />
+      <excludeFolder url="file://$MODULE_DIR$/.run/plugins" />
+      <excludeFolder url="file://$MODULE_DIR$/.run/resource_packs" />
+      <excludeFolder url="file://$MODULE_DIR$/.run/worlds" />
+      <excludeFolder url="file://$MODULE_DIR$/.run/banned-ip.txt" />
+      <excludeFolder url="file://$MODULE_DIR$/.run/banned-players.txt" />
+      <excludeFolder url="file://$MODULE_DIR$/.run/op.txt" />
+      <excludeFolder url="file://$MODULE_DIR$/.run/sculk.yml" />
+      <excludeFolder url="file://$MODULE_DIR$/.run/server.properties" />
+      <excludeFolder url="file://$MODULE_DIR$/.run/whitelist.txt" />
+    </content>
+  </component>
+</module>

src/main/java/org/sculk/Player.java

@@ -14,11 +14,11 @@
 import java.util.UUID;
 
 /*
- *   ____             _ _              __  __ ____
- *  / ___|  ___ _   _| | | __         |  \/  |  _ \
- *  \___ \ / __| | | | | |/ /  _____  | |\/| | |_) |
- *   ___) | (__| |_| | |   <  |_____| | |  | |  __/
- *  |____/ \___|\__,_|_|_|\_\         |_|  |_|_|
+ *   ____             _ _
+ *  / ___|  ___ _   _| | | __
+ *  \___ \ / __| | | | | |/ /
+ *   ___) | (__| |_| | |   <
+ *  |____/ \___|\__,_|_|_|\_\
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by

src/main/java/org/sculk/Sculk.java

@@ -8,11 +8,11 @@
 import org.sculk.utils.TextFormat;
 
 /*
- *   ____             _ _              __  __ ____
- *  / ___|  ___ _   _| | | __         |  \/  |  _ \
- *  \___ \ / __| | | | | |/ /  _____  | |\/| | |_) |
- *   ___) | (__| |_| | |   <  |_____| | |  | |  __/
- *  |____/ \___|\__,_|_|_|\_\         |_|  |_|_|
+ *   ____             _ _
+ *  / ___|  ___ _   _| | | __
+ *  \___ \ / __| | | | | |/ /
+ *   ___) | (__| |_| | |   <
+ *  |____/ \___|\__,_|_|_|\_\
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by

src/main/java/org/sculk/SculkModule.java

@@ -8,11 +8,11 @@
 import org.sculk.event.EventManagerInterface;
 
 /*
- *   ____             _ _              __  __ ____
- *  / ___|  ___ _   _| | | __         |  \/  |  _ \
- *  \___ \ / __| | | | | |/ /  _____  | |\/| | |_) |
- *   ___) | (__| |_| | |   <  |_____| | |  | |  __/
- *  |____/ \___|\__,_|_|_|\_\         |_|  |_|_|
+ *   ____             _ _
+ *  / ___|  ___ _   _| | | __
+ *  \___ \ / __| | | | | |/ /
+ *   ___) | (__| |_| | |   <
+ *  |____/ \___|\__,_|_|_|\_\
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by

src/main/java/org/sculk/Server.java

@@ -9,6 +9,8 @@
 import org.apache.logging.log4j.Logger;
 import org.cloudburstmc.protocol.bedrock.packet.PlayerListPacket;
 import org.sculk.config.Config;
+import org.sculk.config.ServerProperties;
+import org.sculk.config.ServerPropertiesKeys;
 import org.sculk.console.TerminalConsole;
 import org.sculk.event.EventManager;
 import org.sculk.network.BedrockInterface;
@@ -28,11 +30,11 @@
 import java.util.UUID;
 
 /*
- *   ____             _ _              __  __ ____
- *  / ___|  ___ _   _| | | __         |  \/  |  _ \
- *  \___ \ / __| | | | | |/ /  _____  | |\/| | |_) |
- *   ___) | (__| |_| | |   <  |_____| | |  | |  __/
- *  |____/ \___|\__,_|_|_|\_\         |_|  |_|_|
+ *   ____             _ _
+ *  / ___|  ___ _   _| | | __
+ *  \___ \ / __| | | | | |/ /
+ *   ___) | (__| |_| | |   <
+ *  |____/ \___|\__,_|_|_|\_\
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -58,7 +60,7 @@ public class Server {
     private final Path dataPath;
     private final Path pluginDataPath;
 
-    private final Config properties;
+    private final ServerProperties properties;
     private final Config config;
     private final Config operators;
     private final Config whitelist;
@@ -69,6 +71,7 @@ public class Server {
     private final Map<SocketAddress, Player> players = new HashMap<>();
 
     private String motd;
+    private String submotd;
     private int maxPlayers;
     private String defaultGamemode;
     private UUID serverId;
@@ -96,25 +99,9 @@ public Server(Logger logger, String dataPath) {
         this.config = new Config(this.dataPath + "/sculk.yml");
 
         logger.info("Loading {}...", TextFormat.AQUA + "server.properties" + TextFormat.WHITE);
-        this.properties = new Config(this.dataPath.resolve("server.properties").toString(), Config.PROPERTIES);
-        if(!this.properties.exists("server-port")) {
-            this.properties.set("language", "English");
-            this.properties.set("motd", "A Sculk Server Software");
-            this.properties.set("server-port", 19132);
-            this.properties.set("server-ip", "0.0.0.0");
-            this.properties.set("white-list", false);
-            this.properties.set("max-players", 20);
-            this.properties.set("gamemode", "Survival");
-            this.properties.set("pvp", true);
-            this.properties.set("difficulty", 1);
-            this.properties.set("level-name", "world");
-            this.properties.set("level-seed", "");
-            this.properties.set("level-type", "DEFAULT");
-            this.properties.set("auto-save", true);
-            this.properties.set("xbox-auth", true);
-            this.properties.save();
-        }
-        this.motd = this.properties.getString("motd");
+        this.properties = new ServerProperties(this.dataPath);
+        this.motd = this.properties.get(ServerPropertiesKeys.MOTD, "A Sculk Server Software");
+        this.submotd = this.properties.get(ServerPropertiesKeys.SUB_MOTD, "Powered by Sculk");
 
         this.injector = Guice.createInjector(Stage.PRODUCTION, new SculkModule(this));
         this.eventManager = injector.getInstance(EventManager.class);
@@ -125,7 +112,7 @@ public Server(Logger logger, String dataPath) {
         this.banByName = new Config(this.dataPath.resolve("banned-players.txt").toString(), Config.ENUM);
         this.banByIp = new Config(this.dataPath.resolve("banned-ip.txt").toString(), Config.ENUM);
 
-        logger.info("Selected {} as the base language", this.properties.getString("language"));
+        logger.info("Selected {} as the base language", this.properties.get(ServerPropertiesKeys.LANGUAGE, "English"));
         logger.info("Starting Minecraft: Bedrock Edition server version {}", TextFormat.AQUA + Sculk.MINECRAFT_VERSION + TextFormat.WHITE);
 
         this.console = new TerminalConsole(this);
@@ -148,15 +135,15 @@ public void start() {
             shutdown();
         }
 
-        if(this.properties.getBoolean("xbox-auth")) {
+        if(this.properties.get(ServerPropertiesKeys.XBOX_AUTH, true)) {
             logger.info("Online mode is enable. The server will verify that players are authenticated to XboxLive.");
         } else {
             logger.info("{}Online mode is not enabled. The server no longer checks if players are authenticated to XboxLive.", TextFormat.RED);
         }
         logger.info("This server is running on version {}",TextFormat.AQUA + Sculk.CODE_VERSION);
-        logger.info("Sculk-MP is distributed undex the {}",TextFormat.AQUA + "GNU GENERAL PUBLIC LICENSE");
+        logger.info("Sculk is distributed undex the {}",TextFormat.AQUA + "GNU GENERAL PUBLIC LICENSE");
 
-        getLogger().info("Done ("+ (double) (System.currentTimeMillis() - Sculk.START_TIME) / 1000 +"s)! For help, type \"help\" or \"?");
+        getLogger().info("Done ({}s)! For help, type \"help\" or \"?", (double) (System.currentTimeMillis() - Sculk.START_TIME) / 1000);
     }
 
     public void shutdown() {
@@ -213,7 +200,7 @@ public Map<UUID, Player> getOnlinePlayers() {
         return Collections.unmodifiableMap(playerList);
     }
 
-    public Config getProperties() {
+    public ServerProperties getProperties() {
         return properties;
     }
 

src/main/java/org/sculk/config/Config.java

@@ -20,11 +20,11 @@
 import java.util.regex.Pattern;
 
 /*
- *   ____             _ _              __  __ ____
- *  / ___|  ___ _   _| | | __         |  \/  |  _ \
- *  \___ \ / __| | | | | |/ /  _____  | |\/| | |_) |
- *   ___) | (__| |_| | |   <  |_____| | |  | |  __/
- *  |____/ \___|\__,_|_|_|\_\         |_|  |_|_|
+ *   ____             _ _
+ *  / ___|  ___ _   _| | | __
+ *  \___ \ / __| | | | | |/ /
+ *   ___) | (__| |_| | |   <
+ *  |____/ \___|\__,_|_|_|\_\
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by

src/main/java/org/sculk/config/ConfigSection.java

@@ -3,11 +3,11 @@
 import java.util.*;
 
 /*
- *   ____             _ _              __  __ ____
- *  / ___|  ___ _   _| | | __         |  \/  |  _ \
- *  \___ \ / __| | | | | |/ /  _____  | |\/| | |_) |
- *   ___) | (__| |_| | |   <  |_____| | |  | |  __/
- *  |____/ \___|\__,_|_|_|\_\         |_|  |_|_|
+ *   ____             _ _
+ *  / ___|  ___ _   _| | | __
+ *  \___ \ / __| | | | | |/ /
+ *   ___) | (__| |_| | |   <
+ *  |____/ \___|\__,_|_|_|\_\
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by