Version: 1.8

.gitignore

@@ -115,3 +115,6 @@ build
 
 # Common working directory
 run/
+
+# Proto
+compile_proto.sh

build.gradle.kts

@@ -49,7 +49,7 @@ dependencies {
     implementation(project(":v1_20_R1", "reobf"))
 }
 
-var pluginVersion = "1.7.5"
+var pluginVersion = "1.8-pre2"
 
 allprojects {
     group = "dev.foxikle"
@@ -122,7 +122,7 @@ tasks {
             "apiVersion" to "1.20"
         )
         inputs.properties(props)
-        filesMatching("plugin.yml") {
+        filesMatching("paper-plugin.yml") {
             expand(props)
         }
     }
@@ -154,5 +154,3 @@ tasks.register<Javadoc>("aggregatedJavadocs") {
         }
     }
 }
-
-

core/build.gradle.kts

@@ -42,6 +42,10 @@ dependencies {
     compileOnly("org.mineskin:java-client-jsoup:3.0.6")
     compileOnly("dev.velix:imperat-bukkit:1.9.7")
     compileOnly("dev.velix:imperat-core:1.9.7")
+    compileOnly("org.mongodb:mongodb-driver-sync:5.3.0")
+    compileOnly("com.mysql:mysql-connector-j:9.1.0")
+    compileOnly("com.zaxxer:HikariCP:6.2.1")
+    compileOnly("org.spongepowered:configurate-gson:4.2.0")
 }
 
 val generateClassloader = tasks.register("generateClassloader") {

core/src/main/java/dev/foxikle/customnpcs/actions/Action.java

@@ -22,7 +22,8 @@
 
 package dev.foxikle.customnpcs.actions;
 
-import dev.foxikle.customnpcs.actions.conditions.Condition;
+import dev.foxikle.customnpcs.conditions.Condition;
+import dev.foxikle.customnpcs.conditions.Selector;
 import dev.foxikle.customnpcs.internal.CustomNPCs;
 import dev.foxikle.customnpcs.internal.interfaces.InternalNpc;
 import dev.foxikle.customnpcs.internal.utils.Utils;
@@ -51,9 +52,9 @@ public abstract class Action {
 
     private List<Condition> conditions = new ArrayList<>();
     private int delay = 0;
-    private Condition.SelectionMode mode = Condition.SelectionMode.ONE;
+    private Selector mode = Selector.ONE;
     private int cooldown = 0;
-    private Map<UUID, Instant> cooldowns = new ConcurrentHashMap<>();
+    private final Map<UUID, Instant> cooldowns = new ConcurrentHashMap<>();
 
     /**
      * Default constructor
@@ -62,7 +63,7 @@ public Action() {
 
     }
 
-    public Action(int delay, Condition.SelectionMode mode, List<Condition> conditions, int cooldown) {
+    public Action(int delay, Selector mode, List<Condition> conditions, int cooldown) {
         this.delay = delay;
         this.mode = mode;
         this.conditions = conditions;
@@ -71,11 +72,11 @@ public Action(int delay, Condition.SelectionMode mode, List<Condition> condition
 
 
     /**
-     * Deprecated, use {@link Action#Action(int, Condition.SelectionMode, List, int)}  Action}
+     * Deprecated, use {@link Action#Action(int, Selector, List, int)}  Action}
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "1.9")
-    public Action(int delay, Condition.SelectionMode mode, List<Condition> conditions) {
+    public Action(int delay, Selector mode, List<Condition> conditions) {
         this(delay, mode, conditions, 0);
     }
 
@@ -119,7 +120,7 @@ public static Action parse(@NotNull String s) {
     protected static ParseResult parseBase(String data) {
         int cooldown = parseInt(data, "cooldown");
         int delay = parseInt(data, "delay");
-        Condition.SelectionMode mode = parseEnum(data, "mode", Condition.SelectionMode.class);
+        Selector mode = parseEnum(data, "mode", Selector.class);
         List<Condition> conditions = deserializeConditions(parseString(data, "conditions"));
         return new ParseResult(delay, mode, conditions, cooldown);
     }
@@ -270,7 +271,7 @@ public boolean processConditions(Player player) {
         if (conditions == null || conditions.isEmpty()) return true; // no conditions
         Set<Boolean> results = new HashSet<>(conditions.size());
         conditions.forEach(conditional -> results.add(conditional.compute(player)));
-        return (mode == Condition.SelectionMode.ALL ? !results.contains(false) : results.contains(true));
+        return (mode == Selector.ALL ? !results.contains(false) : results.contains(true));
     }
 
     private String getConditionSerialized() {
@@ -333,13 +334,13 @@ protected String generateSerializedString(String id, Map<String, Object> params)
 
     public abstract Action clone();
 
-    protected record ParseResult(int delay, Condition.SelectionMode mode, List<Condition> conditions, int cooldown) {
+    protected record ParseResult(int delay, Selector mode, List<Condition> conditions, int cooldown) {
         /**
-         * @deprecated Use {@link ParseResult#ParseResult(int, Condition.SelectionMode, List, int)}}
+         * @deprecated Use {@link ParseResult#ParseResult(int, Selector, List, int)}}
          */
         @Deprecated
         @ApiStatus.ScheduledForRemoval(inVersion = "1.9")
-        public ParseResult(int delay, Condition.SelectionMode mode, List<Condition> conditions) {
+        public ParseResult(int delay, Selector mode, List<Condition> conditions) {
             this(delay, mode, conditions, 0);
         }
     }

core/src/main/java/dev/foxikle/customnpcs/actions/conditions/ActionAdapter.java → core/src/main/java/dev/foxikle/customnpcs/actions/ActionAdapter.java

@@ -20,14 +20,15 @@
  * SOFTWARE.
  */
 
-package dev.foxikle.customnpcs.actions.conditions;
+package dev.foxikle.customnpcs.actions;
 
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import dev.foxikle.customnpcs.actions.ActionType;
-import dev.foxikle.customnpcs.actions.LegacyAction;
+import dev.foxikle.customnpcs.conditions.Condition;
+import dev.foxikle.customnpcs.conditions.ConditionalTypeAdapter;
+import dev.foxikle.customnpcs.conditions.Selector;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -83,7 +84,7 @@ public LegacyAction read(JsonReader in) throws IOException {
         List<String> args = new ArrayList<>();
         int delay = 0;
         List<Condition> conditions = new ArrayList<>();
-        Condition.SelectionMode selectionMode = null;
+        Selector selectionMode = null;
 
 
         while (in.hasNext()) {
@@ -98,7 +99,7 @@ public LegacyAction read(JsonReader in) throws IOException {
                     in.endArray();
                 }
                 case "delay" -> delay = in.nextInt();
-                case "mode" -> selectionMode = Condition.SelectionMode.valueOf(in.nextString());
+                case "mode" -> selectionMode = Selector.valueOf(in.nextString());
                 case "conditionals" -> {
                     in.beginArray();
                     while(in.hasNext()) {

core/src/main/java/dev/foxikle/customnpcs/actions/LegacyAction.java

@@ -22,8 +22,9 @@
 
 package dev.foxikle.customnpcs.actions;
 
-import dev.foxikle.customnpcs.actions.conditions.Condition;
 import dev.foxikle.customnpcs.actions.defaultImpl.*;
+import dev.foxikle.customnpcs.conditions.Condition;
+import dev.foxikle.customnpcs.conditions.Selector;
 import dev.foxikle.customnpcs.internal.CustomNPCs;
 import lombok.Getter;
 import lombok.Setter;
@@ -51,7 +52,7 @@ public class LegacyAction {
     @Setter
     private int delay;
     @Setter
-    private Condition.SelectionMode mode;
+    private Selector mode;
 
     /**
      * <p> Creates a new Action
@@ -63,7 +64,7 @@ public class LegacyAction {
      * @param matchAll     If all the conditions must be met, or one
      * @param conditionals The conditions to apply to this action
      */
-    public LegacyAction(ActionType actionType, List<String> args, int delay, Condition.SelectionMode matchAll, List<Condition> conditionals) {
+    public LegacyAction(ActionType actionType, List<String> args, int delay, Selector matchAll, List<Condition> conditionals) {
         this.actionType = actionType;
         this.args = args;
         this.delay = delay;
@@ -75,7 +76,7 @@ private LegacyAction(String subCommand, ArrayList<String> args, int delay) {
         this.actionType = ActionType.valueOf(subCommand);
         this.args = args;
         this.delay = delay;
-        this.mode = Condition.SelectionMode.ONE;
+        this.mode = Selector.ONE;
         this.conditionals = new ArrayList<>();
     }
 
@@ -152,7 +153,7 @@ private boolean processConditions(Player player) {
 
         Set<Boolean> results = new HashSet<>(2);
         conditionals.forEach(conditional -> results.add(conditional.compute(player)));
-        return (mode == Condition.SelectionMode.ALL ? !results.contains(false) : results.contains(true));
+        return (mode == Selector.ALL ? !results.contains(false) : results.contains(true));
     }
 
     /**