Supports Folia and FancyNpcs.

toxicity188 · Dec 1, 2023 · 49ec543 · 49ec543
1 parent e7e6a5c
commit 49ec543
Show file tree

Hide file tree

Showing 70 changed files with 892 additions and 400 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/api/src/main/java/kor/toxicity/questadder/api/APIManager.java b/api/src/main/java/kor/toxicity/questadder/api/APIManager.java
@@ -96,24 +96,6 @@ public interface APIManager {
      */
     <T,R> void addFunction(@NotNull String name, @NotNull List<@NotNull Class<?>> args, @NotNull Class<T> argsClass, @NotNull Class<R> returnClass, @NotNull BiFunction<@NotNull T, @NotNull Object[], @NotNull R> function);
 
-    /**
-     * Gets NPC object from given uuid.
-     *
-     * @param uuid An entity uuid of NPC
-     * @return An object of NPC of null
-     * @since 1.0.3
-     */
-    @Nullable
-    IActualNPC getNPC(@NotNull UUID uuid);
-    /**
-     * Gets NPC object from given name.
-     *
-     * @param name A yaml key of the NPC
-     * @return An object of NPC of null
-     * @since 1.0.5
-     */
-    @Nullable
-    IActualNPC getNPC(@NotNull String name);
 
     /**
      * Gets all NPC in server.
@@ -171,11 +153,6 @@ public interface APIManager {
      * @since 1.0.7
      */
     @NotNull List<@NotNull String> getActionKeys();
-    /**
-     * @return A keys of all of loaded NPCs.
-     * @since 1.0.7
-     */
-    @NotNull List<@NotNull String> getNPCKeys();
     /**
      * @return A keys of all of loaded quest NPCs.
      * @since 1.0.7

diff --git a/api/src/main/java/kor/toxicity/questadder/api/QuestAdder.java b/api/src/main/java/kor/toxicity/questadder/api/QuestAdder.java
@@ -1,10 +1,13 @@
 package kor.toxicity.questadder.api;
 
+import kor.toxicity.questadder.api.concurrent.LazyRunnable;
 import kor.toxicity.questadder.api.mechanic.AbstractEvent;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.function.Supplier;
+
 public interface QuestAdder {
     /**
      * Get an instance of QuestAdder's bukkit plugin.
@@ -26,7 +29,7 @@ public interface QuestAdder {
      * @param runnable task
      */
 
-    void addLazyTask(@NotNull Runnable runnable); //This method is only available in custom action.
+    void addLazyTask(@NotNull LazyRunnable runnable); //This method is only available in custom action.
     @ApiStatus.Internal
     <T extends Event> void registerEvent(AbstractEvent<T> event, Class<T> clazz);
 }
diff --git a/api/src/main/java/kor/toxicity/questadder/api/concurrent/LazyRunnable.java b/api/src/main/java/kor/toxicity/questadder/api/concurrent/LazyRunnable.java
@@ -0,0 +1,32 @@
+package kor.toxicity.questadder.api.concurrent;
+
+import org.jetbrains.annotations.NotNull;
+
+public interface LazyRunnable {
+    LazyRunnable EMPTY = new LazyRunnable() {
+        @Override
+        public long getDelay() {
+            return 0;
+        }
+
+        @Override
+        public void run() {
+
+        }
+    };
+    static @NotNull LazyRunnable emptyOf(@NotNull Runnable runnable) {
+        return new LazyRunnable() {
+            @Override
+            public long getDelay() {
+                return 0;
+            }
+
+            @Override
+            public void run() {
+                runnable.run();
+            }
+        };
+    }
+    long getDelay();
+    void run();
+}
diff --git a/api/src/main/java/kor/toxicity/questadder/api/mechanic/DialogSender.java b/api/src/main/java/kor/toxicity/questadder/api/mechanic/DialogSender.java
@@ -2,13 +2,15 @@
 
 import kor.toxicity.questadder.api.gui.IGui;
 import kor.toxicity.questadder.api.util.SoundData;
+import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.function.Supplier;
+
 public interface DialogSender {
-    @Nullable
-    Entity getEntity();
+    @Nullable Supplier<Location> getLocationSupplier();
     @NotNull
     SoundData getSoundData();
     @NotNull

diff --git a/api/src/main/java/kor/toxicity/questadder/api/mechanic/IActualNPC.java b/api/src/main/java/kor/toxicity/questadder/api/mechanic/IActualNPC.java
@@ -1,9 +1,10 @@
 package kor.toxicity.questadder.api.mechanic;
 
+import kor.toxicity.questadder.api.npc.WrappedNPC;
 import net.citizensnpcs.api.npc.NPC;
 import org.jetbrains.annotations.NotNull;
 
 public interface IActualNPC extends DialogSender {
-    @NotNull NPC toCitizensNPC();
+    @NotNull WrappedNPC toUsedNPC();
     @NotNull IQuestNPC toQuestNPC();
 }
diff --git a/api/src/main/java/kor/toxicity/questadder/api/npc/CitizensNPC.java b/api/src/main/java/kor/toxicity/questadder/api/npc/CitizensNPC.java
@@ -0,0 +1,5 @@
+package kor.toxicity.questadder.api.npc;
+
+public interface CitizensNPC extends WrappedNPC {
+    int getId();
+}
diff --git a/api/src/main/java/kor/toxicity/questadder/api/npc/FancyNpcsNPC.java b/api/src/main/java/kor/toxicity/questadder/api/npc/FancyNpcsNPC.java
@@ -0,0 +1,7 @@
+package kor.toxicity.questadder.api.npc;
+
+import org.jetbrains.annotations.NotNull;
+
+public interface FancyNpcsNPC extends WrappedNPC {
+    @NotNull String getId();
+}
diff --git a/api/src/main/java/kor/toxicity/questadder/api/npc/WrappedNPC.java b/api/src/main/java/kor/toxicity/questadder/api/npc/WrappedNPC.java
@@ -0,0 +1,18 @@
+package kor.toxicity.questadder.api.npc;
+
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.UUID;
+
+public interface WrappedNPC {
+    @NotNull UUID getUUID();
+    @NotNull Object getHandle();
+    @Nullable Location getLocation();
+    @Nullable World getWorld();
+    float getEyeHeight();
+    @Nullable Entity getEntity();
+}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 val questAdderGroup = "kor.toxicity.questadder"
-val questAdderVersion = "1.1.9"
+val questAdderVersion = "1.2.0"
 
 val adventureVersion = "4.14.0"
 val platformVersion = "4.3.1"
@@ -34,6 +34,7 @@ allprojects {
         maven(url = "https://repo.bg-software.com/repository/api/")
         maven(url = "https://nexus.phoenixdevt.fr/repository/maven-public/")
         maven(url = "https://repo.oraxen.com/releases")
+        maven(url = "https://repo.fancyplugins.de/releases")
     }
 
     dependencies {

diff --git a/nms/build.gradle.kts b/nms/build.gradle.kts
@@ -1,6 +1,7 @@
 subprojects {
     dependencies {
         compileOnly(project(":platform"))
+        compileOnly(project(":scheduler"))
         compileOnly(project(":plugin"))
         compileOnly(project(":api"))
     }

diff --git a/nms/v1_17_R1/src/main/java/kor/toxicity/questadder/nms/v1_17_R1/NMSChannelImpl.kt b/nms/v1_17_R1/src/main/java/kor/toxicity/questadder/nms/v1_17_R1/NMSChannelImpl.kt
@@ -46,7 +46,7 @@ class NMSChannelImpl: NMSChannel {
             connection.send(ClientboundOpenSignEditorPacket(blockPos))
             it.signCallback = { arr ->
                 connection.send(ClientboundBlockUpdatePacket(blockPos, air))
-                QuestAdderBukkit.task {
+                QuestAdderBukkit.task(player.location) {
                     callback(arr)
                 }
             }

diff --git a/nms/v1_17_R1/src/main/java/kor/toxicity/questadder/nms/v1_17_R1/NMSImpl.kt b/nms/v1_17_R1/src/main/java/kor/toxicity/questadder/nms/v1_17_R1/NMSImpl.kt
@@ -27,6 +27,7 @@ import org.bukkit.command.CommandSender
 import org.bukkit.command.SimpleCommandMap
 import org.bukkit.craftbukkit.v1_17_R1.CraftServer
 import org.bukkit.craftbukkit.v1_17_R1.CraftWorld
+import org.bukkit.craftbukkit.v1_17_R1.entity.CraftEntity
 import org.bukkit.craftbukkit.v1_17_R1.entity.CraftItem
 import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer
 import org.bukkit.craftbukkit.v1_17_R1.help.SimpleHelpMap
@@ -260,11 +261,16 @@ class NMSImpl: NMS {
             t.setItemSlot(EquipmentSlot.HEAD, i)
             connection.send(ClientboundSetEquipmentPacket(t.id, listOf(Pair.of(EquipmentSlot.HEAD, i))))
         }
-
         override fun setText(text: Component) {
             t.customName = CraftChatMessage.fromJSON(GsonComponentSerializer.gson().serialize(text))
             sendEntityDataPacket()
         }
-
+        override fun setCustomNameVisible(boolean: Boolean) {
+            t.isCustomNameVisible = boolean
+            sendEntityDataPacket()
+        }
+    }
+    override fun getEyeHeight(entity: org.bukkit.entity.Entity): Float {
+        return (entity as CraftEntity).handle.eyeHeight
     }
 }
diff --git a/nms/v1_18_R1/src/main/java/kor/toxicity/questadder/nms/v1_18_R1/NMSChannelImpl.kt b/nms/v1_18_R1/src/main/java/kor/toxicity/questadder/nms/v1_18_R1/NMSChannelImpl.kt
@@ -46,7 +46,7 @@ class NMSChannelImpl: NMSChannel {
             connection.send(ClientboundOpenSignEditorPacket(blockPos))
             it.signCallback = { arr ->
                 connection.send(ClientboundBlockUpdatePacket(blockPos, air))
-                QuestAdderBukkit.task {
+                QuestAdderBukkit.task(player.location) {
                     callback(arr)
                 }
             }

diff --git a/nms/v1_18_R1/src/main/java/kor/toxicity/questadder/nms/v1_18_R1/NMSImpl.kt b/nms/v1_18_R1/src/main/java/kor/toxicity/questadder/nms/v1_18_R1/NMSImpl.kt
@@ -27,6 +27,7 @@ import org.bukkit.command.CommandSender
 import org.bukkit.command.SimpleCommandMap
 import org.bukkit.craftbukkit.v1_18_R1.CraftServer
 import org.bukkit.craftbukkit.v1_18_R1.CraftWorld
+import org.bukkit.craftbukkit.v1_18_R1.entity.CraftEntity
 import org.bukkit.craftbukkit.v1_18_R1.entity.CraftItem
 import org.bukkit.craftbukkit.v1_18_R1.entity.CraftPlayer
 import org.bukkit.craftbukkit.v1_18_R1.help.SimpleHelpMap
@@ -260,11 +261,16 @@ class NMSImpl: NMS {
             t.setItemSlot(EquipmentSlot.HEAD, i)
             connection.send(ClientboundSetEquipmentPacket(t.id, listOf(Pair.of(EquipmentSlot.HEAD, i))))
         }
-
         override fun setText(text: Component) {
             t.customName = CraftChatMessage.fromJSON(GsonComponentSerializer.gson().serialize(text))
             sendEntityDataPacket()
         }
-
+        override fun setCustomNameVisible(boolean: Boolean) {
+            t.isCustomNameVisible = boolean
+            sendEntityDataPacket()
+        }
+    }
+    override fun getEyeHeight(entity: org.bukkit.entity.Entity): Float {
+        return (entity as CraftEntity).handle.eyeHeight
     }
 }
diff --git a/nms/v1_18_R2/src/main/java/kor/toxicity/questadder/nms/v1_18_R2/NMSChannelImpl.kt b/nms/v1_18_R2/src/main/java/kor/toxicity/questadder/nms/v1_18_R2/NMSChannelImpl.kt
@@ -46,7 +46,7 @@ class NMSChannelImpl: NMSChannel {
             connection.send(ClientboundOpenSignEditorPacket(blockPos))
             it.signCallback = { arr ->
                 connection.send(ClientboundBlockUpdatePacket(blockPos, air))
-                QuestAdderBukkit.task {
+                QuestAdderBukkit.task(player.location) {
                     callback(arr)
                 }
             }

diff --git a/nms/v1_18_R2/src/main/java/kor/toxicity/questadder/nms/v1_18_R2/NMSImpl.kt b/nms/v1_18_R2/src/main/java/kor/toxicity/questadder/nms/v1_18_R2/NMSImpl.kt
@@ -27,6 +27,7 @@ import org.bukkit.command.CommandSender
 import org.bukkit.command.SimpleCommandMap
 import org.bukkit.craftbukkit.v1_18_R2.CraftServer
 import org.bukkit.craftbukkit.v1_18_R2.CraftWorld
+import org.bukkit.craftbukkit.v1_18_R2.entity.CraftEntity
 import org.bukkit.craftbukkit.v1_18_R2.entity.CraftItem
 import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer
 import org.bukkit.craftbukkit.v1_18_R2.help.SimpleHelpMap
@@ -260,11 +261,16 @@ class NMSImpl: NMS {
             t.setItemSlot(EquipmentSlot.HEAD, i)
             connection.send(ClientboundSetEquipmentPacket(t.id, listOf(Pair.of(EquipmentSlot.HEAD, i))))
         }
-
         override fun setText(text: Component) {
             t.customName = CraftChatMessage.fromJSON(GsonComponentSerializer.gson().serialize(text))
             sendEntityDataPacket()
         }
-
+        override fun setCustomNameVisible(boolean: Boolean) {
+            t.isCustomNameVisible = boolean
+            sendEntityDataPacket()
+        }
+    }
+    override fun getEyeHeight(entity: org.bukkit.entity.Entity): Float {
+        return (entity as CraftEntity).handle.eyeHeight
     }
 }
diff --git a/nms/v1_19_R1/src/main/java/kor/toxicity/questadder/nms/v1_19_R1/NMSChannelImpl.kt b/nms/v1_19_R1/src/main/java/kor/toxicity/questadder/nms/v1_19_R1/NMSChannelImpl.kt
@@ -46,7 +46,7 @@ class NMSChannelImpl: NMSChannel {
             connection.send(ClientboundOpenSignEditorPacket(blockPos))
             it.signCallback = { arr ->
                 connection.send(ClientboundBlockUpdatePacket(blockPos, air))
-                QuestAdderBukkit.task {
+                QuestAdderBukkit.task(player.location) {
                     callback(arr)
                 }
             }

diff --git a/nms/v1_19_R1/src/main/java/kor/toxicity/questadder/nms/v1_19_R1/NMSImpl.kt b/nms/v1_19_R1/src/main/java/kor/toxicity/questadder/nms/v1_19_R1/NMSImpl.kt
@@ -26,6 +26,7 @@ import org.bukkit.command.CommandSender
 import org.bukkit.command.SimpleCommandMap
 import org.bukkit.craftbukkit.v1_19_R1.CraftServer
 import org.bukkit.craftbukkit.v1_19_R1.CraftWorld
+import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity
 import org.bukkit.craftbukkit.v1_19_R1.entity.CraftItem
 import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer
 import org.bukkit.craftbukkit.v1_19_R1.help.SimpleHelpMap
@@ -259,11 +260,16 @@ class NMSImpl: NMS {
             t.setItemSlot(EquipmentSlot.HEAD, i)
             connection.send(ClientboundSetEquipmentPacket(t.id, listOf(Pair.of(EquipmentSlot.HEAD, i))))
         }
-
         override fun setText(text: Component) {
             t.customName = CraftChatMessage.fromJSON(GsonComponentSerializer.gson().serialize(text))
             sendEntityDataPacket()
         }
-
+        override fun setCustomNameVisible(boolean: Boolean) {
+            t.isCustomNameVisible = boolean
+            sendEntityDataPacket()
+        }
+    }
+    override fun getEyeHeight(entity: org.bukkit.entity.Entity): Float {
+        return (entity as CraftEntity).handle.eyeHeight
     }
 }
diff --git a/nms/v1_19_R2/src/main/java/kor/toxicity/questadder/nms/v1_19_R2/NMSChannelImpl.kt b/nms/v1_19_R2/src/main/java/kor/toxicity/questadder/nms/v1_19_R2/NMSChannelImpl.kt
@@ -46,7 +46,7 @@ class NMSChannelImpl: NMSChannel {
             connection.send(ClientboundOpenSignEditorPacket(blockPos))
             it.signCallback = { arr ->
                 connection.send(ClientboundBlockUpdatePacket(blockPos, air))
-                QuestAdderBukkit.task {
+                QuestAdderBukkit.task(player.location) {
                     callback(arr)
                 }
             }

diff --git a/nms/v1_19_R2/src/main/java/kor/toxicity/questadder/nms/v1_19_R2/NMSImpl.kt b/nms/v1_19_R2/src/main/java/kor/toxicity/questadder/nms/v1_19_R2/NMSImpl.kt
@@ -35,6 +35,7 @@ import org.bukkit.command.CommandSender
 import org.bukkit.command.SimpleCommandMap
 import org.bukkit.craftbukkit.v1_19_R2.CraftServer
 import org.bukkit.craftbukkit.v1_19_R2.CraftWorld
+import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity
 import org.bukkit.craftbukkit.v1_19_R2.entity.CraftItem
 import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer
 import org.bukkit.craftbukkit.v1_19_R2.help.SimpleHelpMap
@@ -273,11 +274,16 @@ class NMSImpl: NMS {
             t.setItemSlot(EquipmentSlot.HEAD, i)
             connection.send(ClientboundSetEquipmentPacket(t.id, listOf(Pair.of(EquipmentSlot.HEAD, i))))
         }
-
         override fun setText(text: Component) {
             t.customName = CraftChatMessage.fromJSON(GsonComponentSerializer.gson().serialize(text))
             sendEntityDataPacket()
         }
-
+        override fun setCustomNameVisible(boolean: Boolean) {
+            t.isCustomNameVisible = boolean
+            sendEntityDataPacket()
+        }
+    }
+    override fun getEyeHeight(entity: org.bukkit.entity.Entity): Float {
+        return (entity as CraftEntity).handle.eyeHeight
     }
 }
diff --git a/nms/v1_19_R3/src/main/java/kor/toxicity/questadder/nms/v1_19_R3/NMSChannelImpl.kt b/nms/v1_19_R3/src/main/java/kor/toxicity/questadder/nms/v1_19_R3/NMSChannelImpl.kt
@@ -46,7 +46,7 @@ class NMSChannelImpl: NMSChannel {
             connection.send(ClientboundOpenSignEditorPacket(blockPos))
             it.signCallback = { arr ->
                 connection.send(ClientboundBlockUpdatePacket(blockPos, air))
-                QuestAdderBukkit.task {
+                QuestAdderBukkit.task(player.location) {
                     callback(arr)
                 }
             }