Changes placeholders

BentoBoxWorld · Apr 17, 2020 · 62edbe6 · 62edbe6
1 parent de9b54c
commit 62edbe6
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/main/java/world/bentobox/aoneblock/AOneBlock.java b/src/main/java/world/bentobox/aoneblock/AOneBlock.java
@@ -73,8 +73,10 @@ public void onEnable(){
             registerListener(listener);
             registerListener(new NoBlockHandler(this));
             // Register placeholders
-            getPlugin().getPlaceholdersManager().registerPlaceholder(this,"phase", this::getPhaseByUser);
-            getPlugin().getPlaceholdersManager().registerPlaceholder(this,"count", this::getCountByUser);
+            getPlugin().getPlaceholdersManager().registerPlaceholder(this,"visited_island_phase", this::getPhaseByUser);
+            getPlugin().getPlaceholdersManager().registerPlaceholder(this,"visited_island_count", this::getCountByUser);
+            getPlugin().getPlaceholdersManager().registerPlaceholder(this,"my_island_phase", this::getPhaseByIsland);
+            getPlugin().getPlaceholdersManager().registerPlaceholder(this,"my_island_count", this::getCountByIsland);
         } catch (IOException | InvalidConfigurationException e) {
             // Disable
             logError("AOneBlock settings could not load (oneblock.yml error)! Addon disabled.");
@@ -100,6 +102,16 @@ private String getCountByUser(User user) {
                 .orElse("");
     }
 
+    private String getPhaseByIsland(User user) {
+        Island i = getIslands().getIsland(getOverWorld(), user);
+        return i == null ? "" : getOneBlocksIsland(i).getPhaseName();
+    }
+
+    private String getCountByIsland(User user) {
+        Island i = getIslands().getIsland(getOverWorld(), user);
+        return i == null ? "" : String.valueOf(getOneBlocksIsland(i).getBlockNumber());
+    }
+
     @Override
     public void onDisable() {
         // save cache