QRF Updates

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>edu.whimc</groupId>
     <artifactId>WHIMC-OverworldAgent</artifactId>
-    <version>2.1.0</version>
+    <version>2.2.1</version>
     <name>WHIMC Overworld Agent</name>
     <description>Defines overworld agent traits</description>
 
@@ -14,12 +14,14 @@
         <repository>
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+            <releases><enabled>false</enabled></releases>
+            <snapshots><enabled>true</enabled></snapshots>
         </repository>
         <repository>
             <id>playpro-repo</id>
             <url>https://maven.playpro.com</url>
         </repository>
-        <!-- Maven repo for Holographic Displays -->
+        <!-- Maven repo for Holographic Displays and Quests -->
         <repository>
             <id>codemc-repo</id>
             <url>https://repo.codemc.io/repository/maven-public/</url>
@@ -33,11 +35,6 @@
             <id>dmulloy2-repo</id>
             <url>https://repo.dmulloy2.net/repository/public/</url>
         </repository>
-        <!-- Maven repo for Quests -->
-        <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
-        </repository>
         <!--Maven repo for world guard -->
         <repository>
             <id>papermc</id>
@@ -68,7 +65,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.13.2-R0.1-SNAPSHOT</version>
+            <version>1.18.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -92,30 +89,30 @@
         <dependency>
             <groupId>net.citizensnpcs</groupId>
             <artifactId>citizens-main</artifactId>
-            <version>2.0.31-SNAPSHOT</version>
+            <version>2.0.33-SNAPSHOT</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
         <!-- Add ProtocolLib to the build-->
         <dependency>
-            <groupId>com.comphenix.protocol</groupId>
+            <groupId>net.dmulloy2</groupId>
             <artifactId>ProtocolLib</artifactId>
-            <version>4.8.0</version>
+            <version>5.3.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <artifactId>edu.whimc</artifactId>
             <groupId>WHIMC-ScienceTools</groupId>
             <scope>system</scope>
             <version>2.4.4</version>
-            <systemPath>${pom.basedir}/lib/WHIMC-ScienceTools-2.4.4.jar</systemPath>
+            <systemPath>${pom.basedir}/lib/WHIMC-ScienceTools-2.4.11.jar</systemPath>
         </dependency>
         <dependency>
             <artifactId>edu.whimc</artifactId>
             <groupId>WHIMC-Observations</groupId>
             <scope>system</scope>
-            <version>2.5.0</version>
-            <systemPath>${pom.basedir}/lib/WHIMC-Observations-2.5.0.jar</systemPath>
+            <version>2.6.3</version>
+            <systemPath>${pom.basedir}/lib/WHIMC-Observations-2.6.3.jar</systemPath>
         </dependency>
         <dependency>
             <artifactId>edu.whimc</artifactId>
@@ -133,9 +130,9 @@
         </dependency>
         <!-- Add Quests to the build -->
         <dependency>
-            <groupId>com.github.PikaMug.Quests</groupId>
-            <artifactId>quests-main</artifactId>
-            <version>4.0.8</version>
+            <groupId>me.pikamug.quests</groupId>
+            <artifactId>quests-api</artifactId>
+            <version>5.0.0-rc.3</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

src/main/java/edu/whimc/overworld_agent/commands/subcommands/DestroyAgentsCommand.java

@@ -3,6 +3,8 @@
 import edu.whimc.overworld_agent.OverworldAgent;
 import edu.whimc.overworld_agent.commands.AbstractSubCommand;
 import net.citizensnpcs.api.npc.NPC;
+import net.citizensnpcs.api.npc.NPCRegistry;
+import net.citizensnpcs.api.CitizensAPI;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -35,26 +37,42 @@ protected boolean onCommand(CommandSender sender, String[] args) {
             return true;
         }
         String playerName = args[0];
-        if (playerName.equalsIgnoreCase(ALL)){
-            for (Map.Entry<String,NPC> entry : npcs.entrySet()){
-                NPC npc = entry.getValue();
-                npc.destroy();
+        if (playerName.equalsIgnoreCase(ALL)) {
+            if (npcs.isEmpty()) {
+                sender.sendMessage("There are no agents to destroy.");
+                return true;
             }
-            plugin.removeAgents();
-            sender.sendMessage("All agents were destroyed");
-        } else {
-            if(Bukkit.getPlayer(playerName) != null){
-                NPC npc = npcs.get(playerName);
-                if(npc != null) {
-                    npc.destroy();
-                    plugin.removeAgent(playerName);
-                    sender.sendMessage(npc.getName() + " was destroyed");
-                } else {
-                    sender.sendMessage("Player does not have an agent");
+
+            for (NPC npc : new ArrayList<>(npcs.values())) {
+                if (npc == null) continue;
+
+                if (npc.isSpawned()) {
+                    npc.despawn();
                 }
+                npc.destroy();
             }
+
+            plugin.removeAgents();
+            sender.sendMessage("All agents were destroyed.");
+            return true;
         }
 
+        // Single player destroy - we do NOT require the player to be online
+        NPC npc = npcs.get(playerName);
+
+        if (npc == null) {
+            sender.sendMessage("Player " + playerName + " does not have an agent.");
+            return true;
+        }
+
+        if (npc.isSpawned()) {
+            npc.despawn();
+        }
+
+        npc.destroy();
+        plugin.removeAgent(playerName);
+
+        sender.sendMessage(npc.getName() + " was destroyed.");
         return true;
     }
 

src/main/java/edu/whimc/overworld_agent/dialoguetemplate/Dialogue.java

@@ -10,9 +10,9 @@
 import edu.whimc.overworld_agent.utils.Utils;
 import edu.whimc.sciencetools.models.sciencetool.ScienceTool;
 import edu.whimc.sciencetools.models.sciencetool.ScienceToolMeasureEvent;
-import me.blackvein.quests.Objective;
-import me.blackvein.quests.Quest;
-import me.blackvein.quests.Quests;
+//import me.blackvein.quests.Objective;
+//import me.blackvein.quests.Quest;
+//import me.blackvein.quests.Quests;
 import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.trait.FollowTrait;

src/main/java/edu/whimc/overworld_agent/dialoguetemplate/SignMenuFactory.java

@@ -6,6 +6,7 @@
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.wrappers.BlockPosition;
+import java.lang.reflect.InvocationTargetException;
 import edu.whimc.overworld_agent.utils.Utils;
 import java.util.Map;
 import java.util.UUID;
@@ -17,7 +18,6 @@
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
@@ -98,7 +98,7 @@ public void open(Player player) {
             location = player.getLocation();
             location.setY(location.getBlockY() - 4);
 
-            player.sendBlockChange(location, Material.SIGN.createBlockData());
+            player.sendBlockChange(location, Material.OAK_SIGN.createBlockData());
             player.sendSignChange(
                     location,
                     text.stream().map(Utils::color).collect(Collectors.toList()).toArray(new String[4])
@@ -107,11 +107,7 @@ public void open(Player player) {
             PacketContainer openSign = ProtocolLibrary.getProtocolManager().createPacket(PacketType.Play.Server.OPEN_SIGN_EDITOR);
             BlockPosition position = new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ());
             openSign.getBlockPositionModifier().write(0, position);
-            try {
-                ProtocolLibrary.getProtocolManager().sendServerPacket(player, openSign);
-            } catch (InvocationTargetException exception) {
-                exception.printStackTrace();
-            }
+            ProtocolLibrary.getProtocolManager().sendServerPacket(player, openSign);
 
             inputs.put(player.getUniqueId(), this);
         }