wip

bedwars-plugin/pom.xml

@@ -352,6 +352,19 @@
             <version>1.18-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>dev.andrei1058.bedwars.platform.master</groupId>
+            <artifactId>server_platform_master</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <!--        <dependency>-->
+<!--            <groupId>dev.andrei1058.bedwars.platform.master</groupId>-->
+<!--            <artifactId>server_platform_master</artifactId>-->
+<!--            <version>24.8-SNAPSHOT</version>-->
+<!--            <scope>compile</scope>-->
+<!--        </dependency>-->
     </dependencies>
 
     <build>

bedwars-plugin/src/main/java/com/andrei1058/bedwars/BedWars.java

@@ -81,6 +81,7 @@
 import com.andrei1058.bedwars.support.vipfeatures.VipListeners;
 import com.andrei1058.vipfeatures.api.IVipFeatures;
 import com.andrei1058.vipfeatures.api.MiniGameAlreadyRegistered;
+import dev.andrei1058.bedwars.platform.master.ServerPlatformManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -676,7 +677,8 @@ public static void debug(String message) {
     }
 
     public static String getForCurrentVersion(String v18, String v12, String v13) {
-        switch (getServerVersion()) {
+//        switch (getServerVersion()) {
+        switch (ServerPlatformManager.getServerVersion()) {
             case "v1_8_R3":
                 return v18;
             case "v1_12_R1":
@@ -744,13 +746,13 @@ public static void setLobbyWorld(String lobbyWorld) {
      *
      * @since v0.6.5beta
      */
+    @Deprecated(forRemoval = true)
     public static String getServerVersion() {
         if (null == version) {
             version = Bukkit.getServer().getClass().getName().split("\\.")[3];
             if (version.equals("CraftServer")) {
                 // todo it is probably PAPER, find out how to get nms version
             }
-
         }
         return version;
     }

pom.xml

@@ -117,6 +117,10 @@
         <module>versionsupport_v1_20_R4</module>
         <module>versionsupport_v1_21_R1</module>
         <module>versionsupport_nms_cmn1</module>
+        <module>server_platform</module>
+        <module>server_platform/server_platform_master</module>
+        <module>server_platform/server_platform_common</module>
+        <module>server_platform/server_platform_spigot</module>
     </modules>
 
     <distributionManagement>

server_platform/pom.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.andrei1058.bedwars</groupId>
+        <artifactId>BedWars1058</artifactId>
+        <version>24.8-SNAPSHOT</version>
+    </parent>
+
+    <groupId>dev.andrei1058.bedwars.platform</groupId>
+    <artifactId>server_platform</artifactId>
+    <packaging>pom</packaging>
+
+    <properties>
+        <maven.compiler.source>22</maven.compiler.source>
+        <maven.compiler.target>22</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>

server_platform/server_platform_common/pom.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>dev.andrei1058.bedwars.platform</groupId>
+        <artifactId>server_platform</artifactId>
+        <version>24.8-SNAPSHOT</version>
+    </parent>
+
+    <groupId>dev.andrei1058.bedwars.platform.common</groupId>
+    <artifactId>server_platform_common</artifactId>
+
+    <properties>
+        <maven.compiler.source>22</maven.compiler.source>
+        <maven.compiler.target>22</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>

server_platform/server_platform_common/src/main/java/ServerPlatform.java

@@ -0,0 +1,2 @@
+public interface ServerPlatform {
+}

server_platform/server_platform_master/pom.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>dev.andrei1058.bedwars.platform</groupId>
+        <artifactId>server_platform</artifactId>
+        <version>24.8-SNAPSHOT</version>
+    </parent>
+
+    <groupId>dev.andrei1058.bedwars.platform.master</groupId>
+    <artifactId>server_platform_master</artifactId>
+
+    <properties>
+        <maven.compiler.source>22</maven.compiler.source>
+        <maven.compiler.target>22</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot</artifactId>
+            <version>1.8.8-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+</project>

server_platform/server_platform_master/src/main/java/dev/andrei1058/bedwars/platform/master/PlatformLoader.java

@@ -0,0 +1,4 @@
+package dev.andrei1058.bedwars.platform.master;
+
+public interface PlatformLoader {
+}

server_platform/server_platform_master/src/main/java/dev/andrei1058/bedwars/platform/master/ServerPlatformManager.java

@@ -0,0 +1,23 @@
+package dev.andrei1058.bedwars.platform.master;
+
+import org.bukkit.Bukkit;
+
+// Loads the server platform logic based on server jar at runtime
+public class ServerPlatformManager {
+
+    private static String version;
+
+    public static String getServerVersion() {
+        if (null == version) {
+            version = Bukkit.getServer().getClass().getName().split("\\.")[3];
+            if (version.equals("CraftServer")) {
+                // it is probably PAPER
+                String bukkitVersion = Bukkit.getServer().getBukkitVersion();
+                if (bukkitVersion.startsWith("1.21")) {
+                    // todo test me
+                }
+            }
+        }
+        return version;
+    }
+}

server_platform/server_platform_spigot/pom.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>dev.andrei1058.bedwars.platform</groupId>
+        <artifactId>server_platform</artifactId>
+        <version>24.8-SNAPSHOT</version>
+    </parent>
+
+    <groupId>dev.andrei1058.bedwars.platform.spigot</groupId>
+    <artifactId>server_platform_spigot</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>server_platform_spigot_common</module>
+        <module>server_platform_sever_v1_8_R3</module>
+    </modules>
+
+    <properties>
+        <maven.compiler.source>22</maven.compiler.source>
+        <maven.compiler.target>22</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>

server_platform/server_platform_spigot/server_platform_sever_v1_8_R3/pom.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>dev.andrei1058.bedwars.platform.spigot</groupId>
+        <artifactId>server_platform_spigot</artifactId>
+        <version>24.8-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>server_platform_sever_v1_8_R3</artifactId>
+
+    <properties>
+        <maven.compiler.source>22</maven.compiler.source>
+        <maven.compiler.target>22</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>

server_platform/server_platform_spigot/server_platform_spigot_common/pom.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>dev.andrei1058.bedwars.platform.spigot</groupId>
+        <artifactId>server_platform_spigot</artifactId>
+        <version>24.8-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>server_platform_spigot_common</artifactId>
+
+    <properties>
+        <maven.compiler.source>22</maven.compiler.source>
+        <maven.compiler.target>22</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>dev.andrei1058.bedwars.platform.common</groupId>
+            <artifactId>server_platform_common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

server_platform/server_platform_spigot/server_platform_spigot_common/src/main/java/SpigotPlatformCommon.java

@@ -0,0 +1,2 @@
+public interface SpigotPlatformCommon {
+}