Added placeholder settings (#26).

imDMK · Feb 23, 2024 · 42da56b · 42da56b
1 parent fc6e1ac
commit 42da56b
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 8 deletions.
diff --git a/doublejump-core/src/main/java/com/github/imdmk/doublejump/DoubleJump.java b/doublejump-core/src/main/java/com/github/imdmk/doublejump/DoubleJump.java
@@ -149,9 +149,9 @@ public DoubleJump(Plugin plugin) {
 
             Stream.of(
                     new JumpPlayerDelayPlaceholder(pluginDescriptionFile, this.jumpPlayerManager),
-                    new JumpPlayerIsDelayPlaceholder(pluginDescriptionFile, this.jumpPlayerManager),
+                    new JumpPlayerIsDelayPlaceholder(pluginDescriptionFile, this.pluginConfiguration.placeholderSettings, this.jumpPlayerManager),
                     new JumpPlayerRegenerationDelayPlaceholder(pluginDescriptionFile, this.jumpPlayerManager),
-                    new JumpPlayerHasJumpsPlaceholder(pluginDescriptionFile, this.jumpPlayerManager),
+                    new JumpPlayerHasJumpsPlaceholder(pluginDescriptionFile, this.pluginConfiguration.placeholderSettings, this.jumpPlayerManager),
                     new JumpPlayerJumpsLimitPlaceholder(pluginDescriptionFile, this.jumpPlayerManager),
                     new JumpPlayerJumpsPlaceholder(pluginDescriptionFile, this.jumpPlayerManager),
                     new JumpPlayerStreakPlaceholder(pluginDescriptionFile, this.jumpPlayerManager)

diff --git a/...in/java/com/github/imdmk/doublejump/configuration/implementation/PluginConfiguration.java b/...in/java/com/github/imdmk/doublejump/configuration/implementation/PluginConfiguration.java
@@ -3,6 +3,7 @@
 import com.github.imdmk.doublejump.command.CommandSettings;
 import com.github.imdmk.doublejump.jump.JumpSettings;
 import com.github.imdmk.doublejump.notification.configuration.NotificationSettings;
+import com.github.imdmk.doublejump.placeholder.PlaceholderSettings;
 import eu.okaeri.configs.OkaeriConfig;
 import eu.okaeri.configs.annotation.Comment;
 import eu.okaeri.configs.annotation.Header;
@@ -37,4 +38,7 @@ public class PluginConfiguration extends OkaeriConfig {
 
     @Comment({"# ", "# Notification settings", "# "})
     public NotificationSettings notificationSettings = new NotificationSettings();
+
+    @Comment({"# ", "# Placeholder settings", "# "})
+    public PlaceholderSettings placeholderSettings = new PlaceholderSettings();
 }
diff --git a/...java/com/github/imdmk/doublejump/jump/placeholder/delay/JumpPlayerIsDelayPlaceholder.java b/...java/com/github/imdmk/doublejump/jump/placeholder/delay/JumpPlayerIsDelayPlaceholder.java
@@ -2,6 +2,7 @@
 
 import com.github.imdmk.doublejump.jump.JumpPlayer;
 import com.github.imdmk.doublejump.jump.JumpPlayerManager;
+import com.github.imdmk.doublejump.placeholder.PlaceholderSettings;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.plugin.PluginDescriptionFile;
@@ -13,10 +14,12 @@
 public class JumpPlayerIsDelayPlaceholder extends PlaceholderExpansion {
 
     private final PluginDescriptionFile pluginDescriptionFile;
+    private final PlaceholderSettings placeholderSettings;
     private final JumpPlayerManager jumpPlayerManager;
 
-    public JumpPlayerIsDelayPlaceholder(PluginDescriptionFile pluginDescriptionFile, JumpPlayerManager jumpPlayerManager) {
+    public JumpPlayerIsDelayPlaceholder(PluginDescriptionFile pluginDescriptionFile, PlaceholderSettings placeholderSettings, JumpPlayerManager jumpPlayerManager) {
         this.pluginDescriptionFile = pluginDescriptionFile;
+        this.placeholderSettings = placeholderSettings;
         this.jumpPlayerManager = jumpPlayerManager;
     }
 
@@ -45,7 +48,7 @@ public JumpPlayerIsDelayPlaceholder(PluginDescriptionFile pluginDescriptionFile,
 
         return jumpPlayerOptional
                 .map(JumpPlayer::isDelay)
-                .map(aBoolean -> aBoolean ? "yes" : "no")
+                .map(aBoolean -> aBoolean ? this.placeholderSettings.whenTrueMessage : this.placeholderSettings.whenFalseMessage)
                 .orElse(null);
     }
 }
diff --git a/...ava/com/github/imdmk/doublejump/jump/placeholder/jumps/JumpPlayerHasJumpsPlaceholder.java b/...ava/com/github/imdmk/doublejump/jump/placeholder/jumps/JumpPlayerHasJumpsPlaceholder.java
@@ -2,6 +2,7 @@
 
 import com.github.imdmk.doublejump.jump.JumpPlayer;
 import com.github.imdmk.doublejump.jump.JumpPlayerManager;
+import com.github.imdmk.doublejump.placeholder.PlaceholderSettings;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.plugin.PluginDescriptionFile;
@@ -13,10 +14,12 @@
 public class JumpPlayerHasJumpsPlaceholder extends PlaceholderExpansion {
 
     private final PluginDescriptionFile pluginDescriptionFile;
+    private final PlaceholderSettings placeholderSettings;
     private final JumpPlayerManager jumpPlayerManager;
 
-    public JumpPlayerHasJumpsPlaceholder(PluginDescriptionFile pluginDescriptionFile, JumpPlayerManager jumpPlayerManager) {
+    public JumpPlayerHasJumpsPlaceholder(PluginDescriptionFile pluginDescriptionFile, PlaceholderSettings placeholderSettings, JumpPlayerManager jumpPlayerManager) {
         this.pluginDescriptionFile = pluginDescriptionFile;
+        this.placeholderSettings = placeholderSettings;
         this.jumpPlayerManager = jumpPlayerManager;
     }
 
@@ -45,7 +48,7 @@ public JumpPlayerHasJumpsPlaceholder(PluginDescriptionFile pluginDescriptionFile
 
         return jumpPlayerOptional
                 .map(JumpPlayer::hasJumps)
-                .map(aBoolean -> aBoolean ? "yes" : "no")
+                .map(aBoolean -> aBoolean ? this.placeholderSettings.whenTrueMessage : this.placeholderSettings.whenFalseMessage)
                 .orElse(null);
     }
 }
diff --git a/doublejump-core/src/main/java/com/github/imdmk/doublejump/jump/sound/JumpSoundService.java b/doublejump-core/src/main/java/com/github/imdmk/doublejump/jump/sound/JumpSoundService.java
@@ -1,8 +1,6 @@
 package com.github.imdmk.doublejump.jump.sound;
 
 import com.github.imdmk.doublejump.configuration.implementation.PluginConfiguration;
-import com.github.imdmk.doublejump.jump.JumpSettings;
-import com.github.imdmk.doublejump.placeholder.PlaceholderRegistry;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 

diff --git a/...ejump-core/src/main/java/com/github/imdmk/doublejump/placeholder/PlaceholderSettings.java b/...ejump-core/src/main/java/com/github/imdmk/doublejump/placeholder/PlaceholderSettings.java
@@ -0,0 +1,23 @@
+package com.github.imdmk.doublejump.placeholder;
+
+import eu.okaeri.configs.OkaeriConfig;
+import eu.okaeri.configs.annotation.Comment;
+
+public class PlaceholderSettings extends OkaeriConfig {
+
+    @Comment({
+            "# Message shown after using the placeholder if it returns true.",
+            "# Example:",
+            "# whenTrueMessage: 'Available'",
+            "# Placeholder 'jump-player-is-delay' will return 'Available' when player doesn't have delay"
+    })
+    public String whenTrueMessage = "yes";
+
+    @Comment({
+            "# Message shown after using the placeholder if it returns false.",
+            "# Example:",
+            "# whenFalseMessage: 'Cooldown'",
+            "# Placeholder 'jump-player-is-delay' will return 'Cooldown' when player have delay"
+    })
+    public String whenFalseMessage = "no";
+}