Reformatting and dependency cleanup

build.gradle.kts

@@ -17,14 +17,13 @@ allprojects {
     }
 
     dependencies {
-        //compileOnly("io.papermc.paper:paper-api:1.19.4-R0.1-SNAPSHOT")
-        compileOnly("org.spigotmc", "spigot-api", "1.19.4-R0.1-SNAPSHOT")
-        compileOnly("org.jetbrains", "annotations", "24.0.1")
-        testImplementation("org.spigotmc", "spigot-api", "1.19.4-R0.1-SNAPSHOT")
-        testImplementation("com.github.seeseemelk", "MockBukkit-v1.19", "2.29.0")
-        testImplementation(platform("org.junit:junit-bom:5.9.2"))
-        testImplementation("org.junit.jupiter:junit-jupiter")
-        testImplementation("org.junit.jupiter:junit-jupiter-params")
+        val libs = rootProject.libs
+        val testlibs = rootProject.testlibs
+        compileOnly(libs.spigot.latest)
+        compileOnly(libs.jetbrains.annotations)
+        testImplementation(libs.spigot.latest)
+        testImplementation(testlibs.mockbuckit)
+        testImplementation(testlibs.bundles.junit)
     }
 
     tasks {

core/build.gradle.kts

@@ -4,7 +4,5 @@ plugins{
 
 dependencies{
     api(project(":nodes"))
-    api("de.eldoria.jacksonbukkit", "paper", "1.2.0")
-    api("de.eldoria.util", "items", "2.0.0-DEV")
-    api("de.eldoria.util", "jackson-configuration", "2.0.0-DEV")
+    api(libs.bundles.eldoria.utilities)
 }

core/src/main/java/de/eldoria/bloodnight/configuration/worlds/NightSelection.java

@@ -7,11 +7,10 @@
 import java.util.Map;
 
 public class NightSelection {
-    private NightSelectionType current = NightSelectionType.INTERVAL;
-
     Map<NightSelectionType, NightSelectionCheck> settings = new HashMap<>() {{
         for (NightSelectionType value : NightSelectionType.values()) {
             put(value, value.create());
         }
     }};
+    private final NightSelectionType current = NightSelectionType.INTERVAL;
 }

core/src/main/java/de/eldoria/bloodnight/configuration/worlds/nightselection/type/MoonPhase.java

@@ -5,7 +5,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class MoonPhase  implements NightSelectionCheck {
+public class MoonPhase implements NightSelectionCheck {
     Map<MoonPhaseType, Integer> probability = new HashMap<>() {{
         put(MoonPhaseType.FULL_MOON, 0);
         put(MoonPhaseType.WANING_GIBBOUS, 10);

core/src/main/java/de/eldoria/bloodnight/editor/EditorPayload.java

@@ -4,9 +4,9 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import de.eldoria.bloodnight.items.ItemRegistry;
-import de.eldoria.bloodnight.mobs.MobRegistry;
 import de.eldoria.bloodnight.mob.meta.Drops;
 import de.eldoria.bloodnight.mob.serialization.EditorSerialization;
+import de.eldoria.bloodnight.mobs.MobRegistry;
 import de.eldoria.bloodnight.nodes.registry.meta.NodeRegistration;
 import de.eldoria.jacksonbukkit.JacksonPaper;
 

core/src/main/java/de/eldoria/bloodnight/mob/CustomMob.java

@@ -6,5 +6,6 @@
 import de.eldoria.bloodnight.mob.meta.Extension;
 import de.eldoria.bloodnight.nodes.container.NodeContainer;
 
-public record CustomMob(String id, Equipment equipment, Attributes attributes, NodeContainer nodes, Drops drops, Extension extension) {
+public record CustomMob(String id, Equipment equipment, Attributes attributes, NodeContainer nodes, Drops drops,
+                        Extension extension) {
 }

core/src/main/java/de/eldoria/bloodnight/mob/serialization/deserializer/PotionEffectTypeDeserializer.java

@@ -2,7 +2,7 @@
 
 import org.bukkit.potion.PotionEffectType;
 
-public class PotionEffectTypeDeserializer extends BaseAttributeDeserializer<PotionEffectType>{
+public class PotionEffectTypeDeserializer extends BaseAttributeDeserializer<PotionEffectType> {
     @Override
     protected String id(PotionEffectType value) {
         return Integer.toHexString(value.getKey().hashCode());

core/src/main/java/de/eldoria/bloodnight/mob/serialization/serializer/BaseAttributeSerializer.java

@@ -8,7 +8,7 @@
 import java.io.IOException;
 
 public abstract class BaseAttributeSerializer<T> extends JsonSerializer<T> {
-        @Override
+    @Override
     public void serialize(T value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
         gen.writeObject(new NamedAttribute(String.valueOf(id(value)), name(value)));
     }

core/src/main/java/de/eldoria/bloodnight/mob/serialization/serializer/PotionEffectTypeSerializer.java

@@ -2,7 +2,7 @@
 
 import org.bukkit.potion.PotionEffectType;
 
-public class PotionEffectTypeSerializer extends BaseAttributeSerializer<PotionEffectType>{
+public class PotionEffectTypeSerializer extends BaseAttributeSerializer<PotionEffectType> {
     @Override
     public String id(PotionEffectType value) {
         return Integer.toHexString(value.getKey().hashCode());

core/src/main/java/de/eldoria/bloodnight/mob/serialization/wrapper/ItemStackWrapper.java

@@ -11,7 +11,9 @@
 import java.util.List;
 import java.util.Map;
 
-public record ItemStackWrapper(Material type, @JsonSerialize(keyUsing = EnchantmentHashSerializer.class) Map<Enchantment, Integer> enchantments, String displayName,
+public record ItemStackWrapper(Material type,
+                               @JsonSerialize(keyUsing = EnchantmentHashSerializer.class) Map<Enchantment, Integer> enchantments,
+                               String displayName,
                                List<String> lore) {
     public static ItemStackWrapper of(ItemStack stack) {
         Material type = stack.getType();

nodes/build.gradle.kts

@@ -3,11 +3,7 @@ plugins{
 }
 
 dependencies {
-    api(platform("com.fasterxml.jackson:jackson-bom:2.14.2"))
-    api("com.fasterxml.jackson.core", "jackson-core")
-    api("com.fasterxml.jackson.core","jackson-databind")
-    api("com.fasterxml.jackson.core","jackson-annotations")
+    api(libs.bundles.jackson.lite)
 
-    testImplementation("com.fasterxml.jackson.core", "jackson-core")
-    testImplementation("com.fasterxml.jackson.core","jackson-databind")
+    testImplementation(libs.bundles.jackson.lite)
 }

nodes/src/main/java/de/eldoria/bloodnight/nodes/action/impl/PrintNode.java

@@ -2,15 +2,15 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import de.eldoria.bloodnight.nodes.meta.Categories;
-import de.eldoria.bloodnight.nodes.meta.DataType;
-import de.eldoria.bloodnight.nodes.meta.Fields;
-import de.eldoria.bloodnight.nodes.container.NodeContainer;
 import de.eldoria.bloodnight.nodes.action.ActionNode;
 import de.eldoria.bloodnight.nodes.annotations.Input;
 import de.eldoria.bloodnight.nodes.annotations.Meta;
 import de.eldoria.bloodnight.nodes.base.io.Edge;
 import de.eldoria.bloodnight.nodes.base.io.EditorMeta;
+import de.eldoria.bloodnight.nodes.container.NodeContainer;
+import de.eldoria.bloodnight.nodes.meta.Categories;
+import de.eldoria.bloodnight.nodes.meta.DataType;
+import de.eldoria.bloodnight.nodes.meta.Fields;
 
 import java.util.Map;
 

nodes/src/main/java/de/eldoria/bloodnight/nodes/annotations/Execution.java

@@ -15,6 +15,7 @@
 public @interface Execution {
     /**
      * Unique name of the output execution field
+     *
      * @return string
      */
     String value();

nodes/src/main/java/de/eldoria/bloodnight/nodes/annotations/Executions.java

@@ -13,6 +13,7 @@
 public @interface Executions {
     /**
      * Array of execution fields
+     *
      * @return execution fields
      */
     Execution[] value();

nodes/src/main/java/de/eldoria/bloodnight/nodes/annotations/Input.java

@@ -18,18 +18,21 @@
 public @interface Input {
     /**
      * Unique name of the input field
+     *
      * @return name
      */
     String name();
 
     /**
      * Type of the input field
+     *
      * @return type
      */
     DataType type();
 
     /**
      * Structure of the input type.
+     *
      * @return structure
      */
     DataStruct struct() default DataStruct.SINGLE;

nodes/src/main/java/de/eldoria/bloodnight/nodes/annotations/Meta.java

@@ -29,6 +29,7 @@
 
     /**
      * The node category inside their type
+     *
      * @return category name
      */
     String category() default Categories.DEFAULT;

nodes/src/main/java/de/eldoria/bloodnight/nodes/base/Node.java

@@ -37,13 +37,6 @@
 @JsonPropertyOrder(alphabetic = true)
 @JsonIgnoreProperties({"nodeClass"})
 public sealed abstract class Node permits ExecutableNode, ProviderNode, TransformNode, ValueNode {
-    @JsonIgnore
-    private MethodHandle constructorHandle;
-    @JsonIgnore
-    private NodeContainer container;
-    @JsonSerialize
-    @JsonProperty(defaultValue = "-1")
-    private int id = -1;
     // Only serialize edges
     @JsonSerialize(using = InputContainerSerializer.class)
     private final InputContainer input;
@@ -52,6 +45,13 @@ public sealed abstract class Node permits ExecutableNode, ProviderNode, Transfor
     private final OutputContainer output;
     @JsonSerialize
     private final EditorMeta meta;
+    @JsonIgnore
+    private MethodHandle constructorHandle;
+    @JsonIgnore
+    private NodeContainer container;
+    @JsonSerialize
+    @JsonProperty(defaultValue = "-1")
+    private int id = -1;
 
     public Node(Map<String, Edge> input, EditorMeta meta) {
         this.input = new InputContainer(MetadataReader.readInputs(this.getClass()), input);

nodes/src/main/java/de/eldoria/bloodnight/nodes/base/execution/ExecutableChainNode.java

@@ -1,13 +1,13 @@
 package de.eldoria.bloodnight.nodes.base.execution;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import de.eldoria.bloodnight.nodes.meta.MetadataReader;
-import de.eldoria.bloodnight.nodes.container.NodeContainer;
 import de.eldoria.bloodnight.nodes.annotations.Execution;
 import de.eldoria.bloodnight.nodes.base.io.Edge;
 import de.eldoria.bloodnight.nodes.base.io.EditorMeta;
 import de.eldoria.bloodnight.nodes.base.io.ExecutionContainer;
+import de.eldoria.bloodnight.nodes.container.NodeContainer;
 import de.eldoria.bloodnight.nodes.controlflow.ControlFlowNode;
+import de.eldoria.bloodnight.nodes.meta.MetadataReader;
 import de.eldoria.bloodnight.nodes.trigger.TriggerNode;
 import de.eldoria.bloodnight.util.Checks;
 
@@ -20,7 +20,7 @@
  * Nodes of this type require at least one {@link Execution} annotation.
  * <p>
  * An execution node can have an "unlimited" number of execution fields.
- *
+ * <p>
  * See {@link ControlFlowNode} and {@link TriggerNode} for implementation details.
  *
  * @param <T> type of node

nodes/src/main/java/de/eldoria/bloodnight/nodes/base/execution/ExecutableNode.java

@@ -1,20 +1,20 @@
 package de.eldoria.bloodnight.nodes.base.execution;
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import de.eldoria.bloodnight.nodes.container.NodeContainer;
 import de.eldoria.bloodnight.nodes.action.ActionNode;
 import de.eldoria.bloodnight.nodes.base.Node;
 import de.eldoria.bloodnight.nodes.base.io.Edge;
 import de.eldoria.bloodnight.nodes.base.io.EditorMeta;
+import de.eldoria.bloodnight.nodes.container.NodeContainer;
 
 import java.util.Map;
 
 /**
  * A node which is executable.
  * <p>
- *
+ * <p>
  * An {@link ExecutableNode} is placed at the end of an execution chain, which consists of {@link ExecutableChainNode}s.
- *
+ * <p>
  * See {@link ActionNode} and {@link ExecutableChainNode} for implementation details.
  */
 @JsonPropertyOrder(alphabetic = true)

nodes/src/main/java/de/eldoria/bloodnight/nodes/base/io/EditorMeta.java

@@ -6,9 +6,8 @@
 /**
  * Class holding meta information about the node itself like the position in the editor.
  *
- *
  * @param position position of the node inside the editor
- * @param comment a comment about the node
+ * @param comment  a comment about the node
  */
 public record EditorMeta(@NotNull Vec2D position, @Nullable String comment) {
 }

nodes/src/main/java/de/eldoria/bloodnight/nodes/base/io/ExecutionContainer.java

@@ -3,10 +3,10 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import de.eldoria.bloodnight.nodes.meta.MetadataReader;
-import de.eldoria.bloodnight.nodes.container.NodeContainer;
 import de.eldoria.bloodnight.nodes.annotations.Execution;
 import de.eldoria.bloodnight.nodes.base.execution.ExecutableNode;
+import de.eldoria.bloodnight.nodes.container.NodeContainer;
+import de.eldoria.bloodnight.nodes.meta.MetadataReader;
 
 import java.util.Collection;
 import java.util.Collections;

nodes/src/main/java/de/eldoria/bloodnight/nodes/base/io/InputContainer.java

@@ -1,10 +1,10 @@
 package de.eldoria.bloodnight.nodes.base.io;
 
-import de.eldoria.bloodnight.nodes.meta.DataType;
-import de.eldoria.bloodnight.nodes.meta.MetadataReader;
-import de.eldoria.bloodnight.nodes.container.NodeContainer;
 import de.eldoria.bloodnight.nodes.annotations.Input;
 import de.eldoria.bloodnight.nodes.annotations.Output;
+import de.eldoria.bloodnight.nodes.container.NodeContainer;
+import de.eldoria.bloodnight.nodes.meta.DataType;
+import de.eldoria.bloodnight.nodes.meta.MetadataReader;
 import de.eldoria.bloodnight.util.Checks;
 import de.eldoria.bloodnight.util.Numbers;
 

nodes/src/main/java/de/eldoria/bloodnight/nodes/base/io/OutputContainer.java

@@ -1,8 +1,8 @@
 package de.eldoria.bloodnight.nodes.base.io;
 
+import de.eldoria.bloodnight.nodes.annotations.Output;
 import de.eldoria.bloodnight.nodes.meta.DataType;
 import de.eldoria.bloodnight.nodes.meta.MetadataReader;
-import de.eldoria.bloodnight.nodes.annotations.Output;
 
 import java.util.Collections;
 import java.util.HashMap;

nodes/src/main/java/de/eldoria/bloodnight/nodes/container/NodeContainer.java

@@ -73,7 +73,7 @@ public NodeContainer copy() {
         return nodeContainer;
     }
 
-    public void inject(ContainerMeta meta){
+    public void inject(ContainerMeta meta) {
         this.meta = meta;
     }
 

nodes/src/main/java/de/eldoria/bloodnight/nodes/controlflow/ControlFlowNode.java

@@ -4,8 +4,8 @@
 import de.eldoria.bloodnight.nodes.base.io.Edge;
 import de.eldoria.bloodnight.nodes.base.io.EditorMeta;
 import de.eldoria.bloodnight.nodes.controlflow.impl.BatchNode;
-import de.eldoria.bloodnight.nodes.controlflow.impl.ForEachNode;
 import de.eldoria.bloodnight.nodes.controlflow.impl.BranchNode;
+import de.eldoria.bloodnight.nodes.controlflow.impl.ForEachNode;
 
 import java.util.Map;
 

nodes/src/main/java/de/eldoria/bloodnight/nodes/controlflow/impl/BatchNode.java

@@ -2,15 +2,15 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import de.eldoria.bloodnight.nodes.meta.DataType;
-import de.eldoria.bloodnight.nodes.meta.Fields;
-import de.eldoria.bloodnight.nodes.container.NodeContainer;
 import de.eldoria.bloodnight.nodes.annotations.Execution;
 import de.eldoria.bloodnight.nodes.annotations.Input;
 import de.eldoria.bloodnight.nodes.annotations.Meta;
 import de.eldoria.bloodnight.nodes.base.io.Edge;
 import de.eldoria.bloodnight.nodes.base.io.EditorMeta;
+import de.eldoria.bloodnight.nodes.container.NodeContainer;
 import de.eldoria.bloodnight.nodes.controlflow.ControlFlowNode;
+import de.eldoria.bloodnight.nodes.meta.DataType;
+import de.eldoria.bloodnight.nodes.meta.Fields;
 
 import java.util.Map;
 

nodes/src/main/java/de/eldoria/bloodnight/nodes/controlflow/impl/BranchNode.java

@@ -2,15 +2,15 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import de.eldoria.bloodnight.nodes.meta.DataType;
-import de.eldoria.bloodnight.nodes.meta.Fields;
-import de.eldoria.bloodnight.nodes.container.NodeContainer;
 import de.eldoria.bloodnight.nodes.annotations.Execution;
 import de.eldoria.bloodnight.nodes.annotations.Input;
 import de.eldoria.bloodnight.nodes.annotations.Meta;
 import de.eldoria.bloodnight.nodes.base.io.Edge;
 import de.eldoria.bloodnight.nodes.base.io.EditorMeta;
+import de.eldoria.bloodnight.nodes.container.NodeContainer;
 import de.eldoria.bloodnight.nodes.controlflow.ControlFlowNode;
+import de.eldoria.bloodnight.nodes.meta.DataType;
+import de.eldoria.bloodnight.nodes.meta.Fields;
 
 import java.util.Map;
 

nodes/src/main/java/de/eldoria/bloodnight/nodes/controlflow/impl/ForEachNode.java

@@ -2,16 +2,16 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import de.eldoria.bloodnight.nodes.meta.DataStruct;
-import de.eldoria.bloodnight.nodes.meta.DataType;
-import de.eldoria.bloodnight.nodes.meta.Fields;
-import de.eldoria.bloodnight.nodes.container.NodeContainer;
 import de.eldoria.bloodnight.nodes.annotations.Input;
 import de.eldoria.bloodnight.nodes.annotations.Meta;
 import de.eldoria.bloodnight.nodes.annotations.Output;
 import de.eldoria.bloodnight.nodes.base.io.Edge;
 import de.eldoria.bloodnight.nodes.base.io.EditorMeta;
+import de.eldoria.bloodnight.nodes.container.NodeContainer;
 import de.eldoria.bloodnight.nodes.controlflow.ControlFlowNode;
+import de.eldoria.bloodnight.nodes.meta.DataStruct;
+import de.eldoria.bloodnight.nodes.meta.DataType;
+import de.eldoria.bloodnight.nodes.meta.Fields;
 
 import java.util.Collection;
 import java.util.Map;