🔥 Made compatible with 1.21+

ZorgBtw · Dec 28, 2024 · 339c7b4 · 339c7b4
1 parent 3e24489
commit 339c7b4
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 73 deletions.
diff --git a/...c/main/java/fr/zorg/bungeesk/bukkit/skript/expressions/bungeeconn/ExprLastConnection.java b/...c/main/java/fr/zorg/bungeesk/bukkit/skript/expressions/bungeeconn/ExprLastConnection.java
@@ -10,7 +10,7 @@
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.util.Kleenean;
-import fr.zorg.bungeesk.bukkit.skript.scopes.ScopeConnectToServer;
+import fr.zorg.bungeesk.bukkit.skript.sections.SecConnectToServer;
 import fr.zorg.bungeesk.bukkit.utils.ClientBuilder;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
@@ -38,7 +38,7 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 
     @Override
     protected ClientBuilder[] get(Event e) {
-        return new ClientBuilder[]{ScopeConnectToServer.builder};
+        return new ClientBuilder[]{SecConnectToServer.builder};
     }
 
     @Override

diff --git a/.../java/fr/zorg/bungeesk/bukkit/skript/expressions/serverbuilder/ExprLastServerBuilder.java b/.../java/fr/zorg/bungeesk/bukkit/skript/expressions/serverbuilder/ExprLastServerBuilder.java
@@ -10,7 +10,7 @@
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.util.Kleenean;
-import fr.zorg.bungeesk.bukkit.skript.scopes.ScopeCreateBungeeServer;
+import fr.zorg.bungeesk.bukkit.skript.sections.SecCreateBungeeServer;
 import fr.zorg.bungeesk.common.entities.BungeeServerBuilder;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
@@ -38,7 +38,7 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 
     @Override
     protected BungeeServerBuilder[] get(Event e) {
-        return new BungeeServerBuilder[]{ScopeCreateBungeeServer.builder};
+        return new BungeeServerBuilder[]{SecCreateBungeeServer.builder};
     }
 
     @Override

diff --git a/BungeeSK/src/main/java/fr/zorg/bungeesk/bukkit/skript/scopes/ScopeCreateBungeeServer.java b/BungeeSK/src/main/java/fr/zorg/bungeesk/bukkit/skript/scopes/ScopeCreateBungeeServer.java
diff --git a/...t/skript/scopes/ScopeConnectToServer.java → ...t/skript/sections/SecConnectToServer.java b/...t/skript/scopes/ScopeConnectToServer.java → ...t/skript/sections/SecConnectToServer.java
@@ -1,20 +1,18 @@
-package fr.zorg.bungeesk.bukkit.skript.scopes;
+package fr.zorg.bungeesk.bukkit.skript.sections;
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.config.SectionNode;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.doc.Since;
-import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.SkriptParser;
-import ch.njol.skript.log.SkriptLogger;
+import ch.njol.skript.lang.*;
 import ch.njol.util.Kleenean;
 import fr.zorg.bungeesk.bukkit.utils.ClientBuilder;
-import fr.zorg.bungeesk.bukkit.utils.EffectSection;
 import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
 
-import java.io.IOException;
+import java.util.List;
 
 @Name("Connect to server")
 @Description("This scope allows you to connect to your bungeecord server easily !")
@@ -25,38 +23,33 @@
         "\t\tset port of connection to 20000\n" +
         "\t\tset password of connection to \"abcd\"\n" +
         "\tstart new connection with connection")
-public class ScopeConnectToServer extends EffectSection {
+public class SecConnectToServer extends EffectSection {
 
     public static ClientBuilder builder;
 
     static {
-        Skript.registerCondition(ScopeConnectToServer.class, "(create|init) new bungee connection");
+        Skript.registerSection(SecConnectToServer.class, "(create|init) new bungee connection");
     }
 
     @Override
-    public boolean init(Expression<?>[] expressions, int i, Kleenean kleenean, SkriptParser.ParseResult parseResult) {
-        if (super.checkIfCondition() || !super.hasSection())
+    public boolean init(Expression<?>[] expressions, int i, Kleenean kleenean, SkriptParser.ParseResult parseResult, @Nullable SectionNode sectionNode, @Nullable List<TriggerItem> list) {
+        if (!super.hasSection()) {
+            Skript.error("You must have a section after the create new bungee connection section");
             return false;
-
-        loadSection(true);
-        SectionNode topNode = (SectionNode) SkriptLogger.getNode();
-
+        }
+        assert sectionNode != null;
+        super.loadOptionalCode(sectionNode);
         return true;
     }
 
     @Override
-    protected void execute(Event e) throws IOException {
+    protected @Nullable TriggerItem walk(Event event) {
         builder = new ClientBuilder();
-        super.runSection(e);
+        return super.walk(event, true);
     }
 
     @Override
-    public String toString(Event event, boolean b) {
+    public String toString(@Nullable Event event, boolean b) {
         return "create new bungee connection";
     }
-
-    public static ClientBuilder getBuilder() {
-        return builder;
-    }
-
 }
diff --git a/BungeeSK/src/main/java/fr/zorg/bungeesk/bukkit/skript/sections/SecCreateBungeeServer.java b/BungeeSK/src/main/java/fr/zorg/bungeesk/bukkit/skript/sections/SecCreateBungeeServer.java
@@ -0,0 +1,49 @@
+package fr.zorg.bungeesk.bukkit.skript.sections;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.config.SectionNode;
+import ch.njol.skript.lang.EffectSection;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser;
+import ch.njol.skript.lang.TriggerItem;
+import ch.njol.skript.log.SkriptLogger;
+import ch.njol.util.Kleenean;
+import fr.zorg.bungeesk.common.entities.BungeeServerBuilder;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.IOException;
+import java.util.List;
+
+public class SecCreateBungeeServer extends EffectSection {
+
+    public static BungeeServerBuilder builder;
+
+    static {
+        Skript.registerSection(SecCreateBungeeServer.class, "create new bungee server");
+    }
+
+    @Override
+    public boolean init(Expression<?>[] expressions, int i, Kleenean kleenean, SkriptParser.ParseResult parseResult, @Nullable SectionNode sectionNode, @Nullable List<TriggerItem> list) {
+        if (!super.hasSection()) {
+            Skript.error("You must have a section after the create new bungee server section");
+            return false;
+        }
+
+        assert sectionNode != null;
+        super.loadOptionalCode(sectionNode);
+        return true;
+    }
+
+    @Override
+    protected @Nullable TriggerItem walk(Event event) {
+        builder = new BungeeServerBuilder();
+        return super.walk(event, true);
+    }
+
+    @Override
+    public String toString(Event e, boolean debug) {
+        return "create new bungee server from scratch";
+    }
+
+}
diff --git a/build.gradle b/build.gradle
@@ -20,8 +20,7 @@ repositories {
 }
 
 dependencies {
-    //implementation project(":BungeeSK")
-    implementation project(path: ":VelocitySK", configuration: "shadow")
+    implementation project(path: ":VelocitySK", configuration: "shadow") //BungeeSK already included inside VelocitySK
 }
 
 [compileJava, compileTestJava]*.options*.encoding = "UTF-8"