Merge pull request #12 from LewMC/folia-support

Add Folia support.
LewMC · May 29, 2024 · bc7eab4 · bc7eab4
2 parents b0a1f95 + 373af5d
commit bc7eab4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
   <groupId>net.lewmc</groupId>
   <artifactId>kryptonite</artifactId>
   <name>Kryptonite</name>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <build>
     <resources>
       <resource>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>net.lewmc</groupId>
     <artifactId>kryptonite</artifactId>
-    <version>1.2.0</version>
+    <version>1.3.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Kryptonite</name>

diff --git a/src/main/java/net/lewmc/kryptonite/Kryptonite.java b/src/main/java/net/lewmc/kryptonite/Kryptonite.java
@@ -18,7 +18,9 @@ public enum Software {
         CRAFTBUKKIT,
         PAPER,
         SPIGOT,
-        PURPUR, PUFFERFISH
+        FOLIA,
+        PURPUR,
+        PUFFERFISH
     }
     public Software server = Software.UNKNOWN;
 
@@ -87,6 +89,9 @@ private void checkSoftware() {
         } else if (this.getServer().getName().equals("Paper")) {
             this.server = Software.PAPER;
             this.log.info("Detected server jar: Paper.");
+        } else if (this.getServer().getName().equals("Folia")) {
+            this.server = Software.FOLIA;
+            this.log.info("Detected server jar: Folia.");
         } else if (this.getServer().getName().equals("Purpur")) {
             this.server = Software.PURPUR;
             this.log.info("Detected server jar: Purpur.");

diff --git a/src/main/java/net/lewmc/kryptonite/utils/SoftwareUtil.java b/src/main/java/net/lewmc/kryptonite/utils/SoftwareUtil.java
@@ -13,6 +13,7 @@ public boolean isCraftBukkit() {
         if (this.plugin.server == Kryptonite.Software.CRAFTBUKKIT) { return true; }
         if (this.plugin.server == Kryptonite.Software.SPIGOT) { return true; }
         if (this.plugin.server == Kryptonite.Software.PAPER) { return true; }
+        if (this.plugin.server == Kryptonite.Software.FOLIA) { return true; }
         if (this.plugin.server == Kryptonite.Software.PURPUR) { return true; }
         if (this.plugin.server == Kryptonite.Software.PUFFERFISH) { return true; }
 
@@ -22,6 +23,7 @@ public boolean isCraftBukkit() {
     public boolean isSpigot() {
         if (this.plugin.server == Kryptonite.Software.SPIGOT) { return true; }
         if (this.plugin.server == Kryptonite.Software.PAPER) { return true; }
+        if (this.plugin.server == Kryptonite.Software.FOLIA) { return true; }
         if (this.plugin.server == Kryptonite.Software.PURPUR) { return true; }
         if (this.plugin.server == Kryptonite.Software.PUFFERFISH) { return true; }
 
@@ -30,6 +32,7 @@ public boolean isSpigot() {
 
     public boolean isPaper() {
         if (this.plugin.server == Kryptonite.Software.PAPER) { return true; }
+        if (this.plugin.server == Kryptonite.Software.FOLIA) { return true; }
         if (this.plugin.server == Kryptonite.Software.PURPUR) { return true; }
         if (this.plugin.server == Kryptonite.Software.PUFFERFISH) { return true; }
 

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -18,4 +18,5 @@ commands:
   edb:
     description: Exploit Database
     usage: /<command>
-    aliases: ['exploit']
+    aliases: ['exploit']
+folia-supported: true