moved the JsonElementCommandNode system to the commands module

Author: WizardlyBump17

commands/build.gradle.kts

@@ -1,9 +1,12 @@
 val annotations = "26.0.1"
+val gson = "2.13.2"
 
 dependencies {
     implementation("org.jetbrains:annotations:${annotations}")
     implementation(project(":objects"))
     implementation(project(":utils"))
 
+    implementation("com.google.code.gson:gson:${gson}")
+
     testImplementation("org.jetbrains:annotations:${annotations}")
 }

…JsonElementMethodCommandNodeFactory.java …JsonElementMethodCommandNodeFactory.javacore/src/main/java/com/wizardlybump17/wlib/command/extractor/method/factory/JsonElementMethodCommandNodeFactory.java renamed to commands/src/main/java/com/wizardlybump17/wlib/command/extractor/method/factory/object/JsonElementMethodCommandNodeFactory.java core/src/main/java/com/wizardlybump17/wlib/command/extractor/method/factory/JsonElementMethodCommandNodeFactory.java renamed to commands/src/main/java/com/wizardlybump17/wlib/command/extractor/method/factory/object/JsonElementMethodCommandNodeFactory.java

@@ -1,12 +1,13 @@
-package com.wizardlybump17.wlib.command.extractor.method.factory;
+package com.wizardlybump17.wlib.command.extractor.method.factory.object;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.wizardlybump17.wlib.command.annotation.Command;
 import com.wizardlybump17.wlib.command.annotation.NonNullInput;
-import com.wizardlybump17.wlib.command.input.AllowedJsonElementInputs;
+import com.wizardlybump17.wlib.command.extractor.method.factory.MethodCommandNodeFactory;
+import com.wizardlybump17.wlib.command.input.AllowedInputs;
 import com.wizardlybump17.wlib.command.node.CommandNode;
-import com.wizardlybump17.wlib.command.node.JsonElementCommandNode;
+import com.wizardlybump17.wlib.command.node.object.JsonElementCommandNode;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -27,7 +28,7 @@ public JsonElementMethodCommandNodeFactory(@NotNull Gson gson) {
         return new JsonElementCommandNode(
                 name,
                 root == null ? List.of() : List.of(root),
-                parameter.isAnnotationPresent(NonNullInput.class) ? AllowedJsonElementInputs.anyNotNull() : AllowedJsonElementInputs.anyNullable(),
+                parameter.isAnnotationPresent(NonNullInput.class) ? AllowedInputs.anyNotNull() : AllowedInputs.anyNullable(),
                 null,
                 null,
                 null,

…command/node/JsonElementCommandNode.java …/node/object/JsonElementCommandNode.javacore/src/main/java/com/wizardlybump17/wlib/command/node/JsonElementCommandNode.java renamed to commands/src/main/java/com/wizardlybump17/wlib/command/node/object/JsonElementCommandNode.java core/src/main/java/com/wizardlybump17/wlib/command/node/JsonElementCommandNode.java renamed to commands/src/main/java/com/wizardlybump17/wlib/command/node/object/JsonElementCommandNode.java

@@ -1,17 +1,19 @@
-package com.wizardlybump17.wlib.command.node;
+package com.wizardlybump17.wlib.command.node.object;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonSyntaxException;
 import com.wizardlybump17.wlib.command.exception.InputParsingException;
 import com.wizardlybump17.wlib.command.executor.CommandNodeExecutor;
 import com.wizardlybump17.wlib.command.input.AllowedInputs;
+import com.wizardlybump17.wlib.command.node.CommandNode;
 import com.wizardlybump17.wlib.command.suggestion.Suggester;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
+//TODO: test
 public class JsonElementCommandNode extends CommandNode<JsonElement> {
 
     private final @NotNull Gson gson;

…and/suggestion/JsonElementSuggester.java …gestion/object/JsonElementSuggester.javacore/src/main/java/com/wizardlybump17/wlib/command/suggestion/JsonElementSuggester.java renamed to commands/src/main/java/com/wizardlybump17/wlib/command/suggestion/object/JsonElementSuggester.java core/src/main/java/com/wizardlybump17/wlib/command/suggestion/JsonElementSuggester.java renamed to commands/src/main/java/com/wizardlybump17/wlib/command/suggestion/object/JsonElementSuggester.java

@@ -1,9 +1,11 @@
-package com.wizardlybump17.wlib.command.suggestion;
+package com.wizardlybump17.wlib.command.suggestion.object;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.wizardlybump17.wlib.command.node.CommandNode;
 import com.wizardlybump17.wlib.command.sender.CommandSender;
+import com.wizardlybump17.wlib.command.suggestion.AbstractValuesSuggester;
+import com.wizardlybump17.wlib.command.suggestion.Suggester;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Unmodifiable;
 

core/src/main/java/com/wizardlybump17/wlib/WLib.java

@@ -4,9 +4,9 @@
 import com.google.gson.GsonBuilder;
 import com.wizardlybump17.wlib.command.WLibCommandExecutor;
 import com.wizardlybump17.wlib.command.extractor.method.MethodCommandExtractor;
-import com.wizardlybump17.wlib.command.extractor.method.factory.JsonElementMethodCommandNodeFactory;
 import com.wizardlybump17.wlib.command.extractor.method.factory.OfflinePlayerMethodCommandNodeFactory;
 import com.wizardlybump17.wlib.command.extractor.method.factory.PlayerMethodCommandNodeFactory;
+import com.wizardlybump17.wlib.command.extractor.method.factory.object.JsonElementMethodCommandNodeFactory;
 import com.wizardlybump17.wlib.command.listener.BukkitCommandManagerListener;
 import com.wizardlybump17.wlib.command.manager.CommandManager;
 import com.wizardlybump17.wlib.command.registry.MethodCommandNodeFactoryRegistry;