Update for BetonQuest version: 2.0.0-DEV-450

honnisha · Nov 18, 2022 · 2bcfa21 · 2bcfa21
1 parent f08770c
commit 2bcfa21
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>honny</groupId>
     <artifactId>HonnyCompass</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
     <packaging>jar</packaging>
 
     <name>HonnyCompass</name>

diff --git a/src/main/java/honny/HonnyCompass.java b/src/main/java/honny/HonnyCompass.java
@@ -11,6 +11,7 @@
 import honny.tasks.PlayerCompassLocationsUpdater;
 import lombok.Getter;
 import org.betonquest.betonquest.BetonQuest;
+import org.betonquest.betonquest.api.profiles.Profile;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -92,9 +93,13 @@ public PlayerCompass createCompass(Player player) {
         return playerCompass;
     }
 
+    public Optional<PlayerCompass> getCompass(Profile profile) {
+        if (!compasses.containsKey(profile.getPlayer().getUniqueId())) return Optional.empty();
+        return Optional.of(compasses.get(profile.getPlayer().getUniqueId()));
+    }
+
     public Optional<PlayerCompass> getCompass(Player player) {
         if (!compasses.containsKey(player.getUniqueId())) return Optional.empty();
-
         return Optional.of(compasses.get(player.getUniqueId()));
     }
 

diff --git a/src/main/java/honny/dependings/betonquest/CompassLocations.java b/src/main/java/honny/dependings/betonquest/CompassLocations.java
@@ -1,9 +1,9 @@
 package honny.dependings.betonquest;
 
 import honny.HonnyCompass;
-import org.betonquest.betonquest.Backpack;
 import org.betonquest.betonquest.BetonQuest;
-import org.betonquest.betonquest.api.config.QuestPackage;
+import org.betonquest.betonquest.api.config.quest.QuestPackage;
+import org.betonquest.betonquest.api.profiles.Profile;
 import org.betonquest.betonquest.config.Config;
 import org.betonquest.betonquest.database.PlayerData;
 import org.betonquest.betonquest.utils.PlayerConverter;
@@ -35,7 +35,7 @@ public void reload() {
         locations.clear();
 
         for (final QuestPackage pack : Config.getPackages().values()) {
-            final String packName = pack.getPackagePath();
+            final String packName = pack.getQuestPath();
             // loop all compass locations
             final ConfigurationSection section = pack.getConfig().getConfigurationSection("compass");
             if (section != null) {
@@ -93,12 +93,11 @@ public List<CompassLocation> getLocations(Player player) {
         List<CompassLocation> compassLocations = new ArrayList<>();
         BetonQuest betonQuest = HonnyCompass.getInstance().getOptionalBetonQuest().get();
 
-        String playerID = PlayerConverter.getID(player.getName());
-        PlayerData playerData = betonQuest.getPlayerData(playerID);
+        Profile profile = PlayerConverter.getID(player);
+        PlayerData playerData = betonQuest.getPlayerData(profile);
 
         for (Map.Entry<String, CompassLocation> entry : this.locations.entrySet()) {
             if (playerData.hasTag(entry.getKey())) {
-
                 compassLocations.add(entry.getValue());
             }
         }

diff --git a/src/main/java/honny/handlers/QuestCompassTargetChangeHandler.java b/src/main/java/honny/handlers/QuestCompassTargetChangeHandler.java
@@ -3,6 +3,9 @@
 import honny.HonnyCompass;
 import honny.controllers.PlayerCompass;
 import org.betonquest.betonquest.api.QuestCompassTargetChangeEvent;
+import org.betonquest.betonquest.api.profiles.Profile;
+import org.betonquest.betonquest.database.PlayerData;
+import org.betonquest.betonquest.utils.PlayerConverter;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
@@ -12,7 +15,8 @@ public class QuestCompassTargetChangeHandler implements Listener {
     @EventHandler
     public void QuestCompassTargetChangeEvent(QuestCompassTargetChangeEvent event) {
         HonnyCompass honnyCompass = HonnyCompass.getInstance();
-        Optional<PlayerCompass> optionalPlayerCompass = honnyCompass.getCompass(event.getPlayer());
+
+        Optional<PlayerCompass> optionalPlayerCompass = honnyCompass.getCompass(event.getProfile());
         optionalPlayerCompass.ifPresent(playerCompass -> playerCompass.setTargetLocation(event.getLocation()));
     }
 }