Added test for NBT, fixed movement stop for players

Author: jamailun

dsl/src/test/resources/parsing/corrects/statements/send_nbt.uss

@@ -0,0 +1 @@
+send %caster nbt "test" = 12 for 12s;

example-plugin/src/main/java/fr/jamailun/examples/citizens/CasterTrait.java

@@ -1,6 +1,5 @@
 package fr.jamailun.examples.citizens;
 
-import fr.jamailun.examples.ExamplePlugin;
 import fr.jamailun.ultimatespellsystem.api.entities.SpellEntity;
 import fr.jamailun.ultimatespellsystem.api.spells.Spell;
 import net.citizensnpcs.api.trait.Trait;
@@ -10,10 +9,8 @@
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.player.PlayerTeleportEvent;
-import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.potion.PotionEffect;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.Optional;
 import java.util.UUID;
@@ -29,11 +26,6 @@ public void cast(Spell spell) {
         spell.castNotCancellable(this);
     }
 
-    @Override
-    public void onAttach() {
-        ExamplePlugin.info("Trait attached !");
-    }
-
     @Override
     public @NotNull UUID getUniqueId() {
         return getBukkitEntity()

plugin/src/main/java/fr/jamailun/ultimatespellsystem/extension/ExtensionLoader.java

@@ -61,7 +61,7 @@ public static void loadCallbacks(JavaPlugin plugin) {
             return;
         }
         loadedCallbacks = true;
-        UltimateSpellSystem.logInfo("Loading extension callbacks.");
+        UltimateSpellSystem.logInfo("Loading extension callbacks and listeners.");
 
         // Load elements
         loadCallback(plugin, new ProjectileLandCallbacks());
@@ -71,7 +71,7 @@ public static void loadCallbacks(JavaPlugin plugin) {
         // Load listeners
         registerEvents(plugin, new EntityMoveListener());
 
-        UltimateSpellSystem.logInfo("Loaded extension callbacks.");
+        UltimateSpellSystem.logInfo("Loaded extension callbacks and listeners.");
     }
 
     private static void loadCallback(JavaPlugin plugin, CallbackProvider<?> callbackProvider) {

plugin/src/main/java/fr/jamailun/ultimatespellsystem/extension/listeners/EntityMoveListener.java

@@ -6,6 +6,7 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
 import org.jetbrains.annotations.NotNull;
@@ -15,13 +16,20 @@
  */
 public class EntityMoveListener implements Listener {
 
-    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     void onEntityMove(@NotNull EntityMoveEvent event) {
         if(shouldHandle(event.getEntity())) {
             event.setCancelled(true);
         }
     }
 
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    void onPlayerMove(@NotNull PlayerMoveEvent event) {
+        if(shouldHandle(event.getPlayer())) {
+            event.setCancelled(true);
+        }
+    }
+
     private boolean shouldHandle(@NotNull Entity entity) {
         PersistentDataContainer nbt = entity.getPersistentDataContainer();
         Boolean value = nbt.get(UssKeys.custom("cancel-movement"), PersistentDataType.BOOLEAN);

plugin/src/main/java/fr/jamailun/ultimatespellsystem/plugin/runner/nodes/functions/SendNbtNode.java

@@ -41,6 +41,7 @@ public void run(@NotNull SpellRuntime runtime) {
         NamespacedKey key = UssKeys.custom(Objects.requireNonNull(name, "Provided name for a send-NBT cannot be null."));
         Duration duration = Objects.requireNonNull(runtime.safeEvaluate(durationRef, Duration.class), "Provided duration for a send-NBT cannot be null.");
         Object value = Objects.requireNonNull(valueRef.evaluate(runtime), "Provided value for a send-NBT cannot be null.");
+        UltimateSpellSystem.logDebug("SET NBT to " + targets + " : [" + key + "] = " + value);
 
         Consumer<PersistentDataContainer> func = switch(value) {
             case Boolean bool -> nbt -> nbt.set(key, PersistentDataType.BOOLEAN, bool);
@@ -63,4 +64,8 @@ public void run(@NotNull SpellRuntime runtime) {
         }), duration.toTicks());
     }
 
+    @Override
+    public String toString() {
+        return "SEND_NBT(" + targetRef + ", '" + nameRef + "' = " + valueRef + "; for " + durationRef + ")";
+    }
 }