Added PlaceholderAPI support, code cleanup

- Configuration -> Config
- Added MissingConfigValueException

Author: imDMK

doublejump-api/src/main/java/com/github/imdmk/doublejump/DoubleJumpApi.java

@@ -1,6 +1,6 @@
 package com.github.imdmk.doublejump;
 
-import com.github.imdmk.doublejump.configuration.ConfigurationManager;
+import com.github.imdmk.doublejump.config.ConfigManager;
 import com.github.imdmk.doublejump.jump.cache.JumpPlayerCache;
 import com.github.imdmk.doublejump.jump.feature.restriction.RestrictionChecker;
 import com.github.imdmk.doublejump.jump.feature.visual.repository.JumpVisualCache;
@@ -23,17 +23,17 @@
 public interface DoubleJumpApi {
 
     /**
-     * Retrieves the {@link ConfigurationManager} responsible for loading,
+     * Retrieves the {@link ConfigManager} responsible for loading,
      * parsing, and providing access to all plugin configuration files.
      * <p>
      * This manager provides methods to obtain current configuration values
      * and supports dynamic reloads if implemented.
      * </p>
      *
-     * @return a non-null instance of {@link ConfigurationManager} used by the plugin.
+     * @return a non-null instance of {@link ConfigManager} used by the plugin.
      */
     @NotNull
-    ConfigurationManager getConfigurationManager();
+    ConfigManager getConfigurationManager();
 
     /**
      * Returns the {@link JumpPlayerCache} containing runtime data for all active players

doublejump-api/src/main/java/com/github/imdmk/doublejump/config/ConfigLoadException.java

@@ -0,0 +1,15 @@
+package com.github.imdmk.doublejump.config;
+
+public final class ConfigLoadException extends RuntimeException {
+    public ConfigLoadException(Throwable cause) {
+        super("Failed to load configuration", cause);
+    }
+
+    public ConfigLoadException(String message) {
+        super(message);
+    }
+
+    public ConfigLoadException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

…/configuration/ConfigurationManager.java …dmk/doublejump/config/ConfigManager.javadoublejump-api/src/main/java/com/github/imdmk/doublejump/configuration/ConfigurationManager.java renamed to doublejump-api/src/main/java/com/github/imdmk/doublejump/config/ConfigManager.java doublejump-api/src/main/java/com/github/imdmk/doublejump/configuration/ConfigurationManager.java renamed to doublejump-api/src/main/java/com/github/imdmk/doublejump/config/ConfigManager.java

@@ -1,6 +1,5 @@
-package com.github.imdmk.doublejump.configuration;
+package com.github.imdmk.doublejump.config;
 
-import eu.okaeri.configs.ConfigManager;
 import eu.okaeri.configs.OkaeriConfig;
 import eu.okaeri.configs.exception.OkaeriException;
 import eu.okaeri.configs.yaml.snakeyaml.YamlSnakeYamlConfigurer;
@@ -29,15 +28,15 @@
  * Supports asynchronous reload of all configs and tracks created config instances.
  * </p>
  */
-public final class ConfigurationManager {
+public final class ConfigManager {
 
     private final Set<ConfigSection> configs = ConcurrentHashMap.newKeySet();
 
     private final Logger logger;
     private final File dataFolder;
     private final ExecutorService executor;
 
-    public ConfigurationManager(@NotNull Logger logger, @NotNull File dataFolder) {
+    public ConfigManager(@NotNull Logger logger, @NotNull File dataFolder) {
         this.logger = Objects.requireNonNull(logger, "logger cannot be null");
         this.dataFolder = Objects.requireNonNull(dataFolder, "dataFolder cannot be null");
         this.executor = Executors.newSingleThreadExecutor();
@@ -54,7 +53,7 @@ public ConfigurationManager(@NotNull Logger logger, @NotNull File dataFolder) {
      * @return the created and loaded configuration instance
      */
     public <T extends ConfigSection> T create(@NotNull Class<T> config) {
-        T configFile = ConfigManager.create(config);
+        T configFile = eu.okaeri.configs.ConfigManager.create(config);
         String fileName = configFile.getFileName();
 
         if (fileName.isEmpty()) {
@@ -121,15 +120,15 @@ private void loadAll() {
      * If loading fails, logs the error and throws a runtime exception.
      *
      * @param config the configuration instance to load, must not be null
-     * @throws ConfigurationLoadException if an error occurs during loading
+     * @throws ConfigLoadException if an error occurs during loading
      */
     public void load(@NotNull OkaeriConfig config) {
         try {
             config.load(true);
         }
         catch (OkaeriException exception) {
             this.logger.log(Level.SEVERE, "Failed to load config: " + config.getClass().getSimpleName(), exception);
-            throw new ConfigurationLoadException(exception);
+            throw new ConfigLoadException(exception);
         }
     }
 

…blejump/configuration/ConfigSection.java …dmk/doublejump/config/ConfigSection.javadoublejump-api/src/main/java/com/github/imdmk/doublejump/configuration/ConfigSection.java renamed to doublejump-api/src/main/java/com/github/imdmk/doublejump/config/ConfigSection.java doublejump-api/src/main/java/com/github/imdmk/doublejump/configuration/ConfigSection.java renamed to doublejump-api/src/main/java/com/github/imdmk/doublejump/config/ConfigSection.java

@@ -1,4 +1,4 @@
-package com.github.imdmk.doublejump.configuration;
+package com.github.imdmk.doublejump.config;
 
 import eu.okaeri.configs.OkaeriConfig;
 import eu.okaeri.configs.exception.OkaeriException;

…ump/configuration/CustomRepresenter.java …doublejump/config/CustomRepresenter.javadoublejump-api/src/main/java/com/github/imdmk/doublejump/configuration/CustomRepresenter.java renamed to doublejump-api/src/main/java/com/github/imdmk/doublejump/config/CustomRepresenter.java doublejump-api/src/main/java/com/github/imdmk/doublejump/configuration/CustomRepresenter.java renamed to doublejump-api/src/main/java/com/github/imdmk/doublejump/config/CustomRepresenter.java

@@ -1,4 +1,4 @@
-package com.github.imdmk.doublejump.configuration;
+package com.github.imdmk.doublejump.config;
 
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.nodes.Node;

doublejump-api/src/main/java/com/github/imdmk/doublejump/configuration/ConfigurationLoadException.java

@@ -0,0 +1,17 @@
+package com.github.imdmk.doublejump.event;
+
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Interface representing a caller that can trigger Bukkit events.
+ */
+public interface EventCaller {
+
+    /**
+     * Calls (fires) the given Bukkit event.
+     *
+     * @param event the event to be called; must not be null
+     */
+    void callEvent(@NotNull Event event);
+}

doublejump-api/src/main/java/com/github/imdmk/doublejump/event/EventCaller.java

@@ -40,10 +40,10 @@ public class JumpPlayer {
     private boolean jumpAllowed = true;
 
     /**
-     * Timestamp of the player's last performed jump.
+     * Timestamp of the player's performed jump delay.
      * Used for applying cooldowns and delay-based restrictions.
      */
-    private Instant lastJump;
+    private Instant nextAllowedJump;
 
     /**
      * The last restriction reason that was notified to the player.
@@ -154,21 +154,23 @@ public void setJumpAllowed(boolean jumpAllowed) {
     }
 
     /**
-     * Gets the timestamp of the player's last jump, if present.
+     * Gets the timestamp indicating when the player is next allowed to perform a jump.
+     * This value is used to enforce cooldowns between jumps.
      *
-     * @return an optional containing the last jump time, or empty if not set
+     * @return an optional containing the next allowed jump time, or empty if not set
      */
-    public Optional<Instant> getLastJump() {
-        return Optional.ofNullable(this.lastJump);
+    public Optional<Instant> getNextAllowedJump() {
+        return Optional.ofNullable(this.nextAllowedJump);
     }
 
     /**
-     * Sets the timestamp of the player's last jump.
+     * Sets the timestamp after which the player is allowed to perform the next jump.
+     * This is typically used to apply a cooldown delay.
      *
-     * @param lastJump the time the last jump occurred
+     * @param nextAllowedJump the time after which jumping is allowed again; may be null to clear
      */
-    public void setLastJump(@Nullable Instant lastJump) {
-        this.lastJump = lastJump;
+    public void setNextAllowedJump(@Nullable Instant nextAllowedJump) {
+        this.nextAllowedJump = nextAllowedJump;
     }
 
     /**
@@ -255,7 +257,7 @@ public String toString() {
                 ", activationType=" + this.activationType +
                 ", active=" + this.active +
                 ", jumpAllowed=" + this.jumpAllowed +
-                ", lastJump=" + this.lastJump +
+                ", nextAllowedJump=" + this.nextAllowedJump +
                 ", lastNotifiedReason=" + this.lastNotifiedReason +
                 ", jumpProperties=" + this.jumpVelocity +
                 '}';

doublejump-api/src/main/java/com/github/imdmk/doublejump/jump/JumpPlayer.java

@@ -29,15 +29,24 @@ public final class DoubleJumpEvent extends Event implements Cancellable {
      * @param jumpPlayer     The JumpPlayer data associated with the player.
      * @param jumpVelocity The jump properties (boosts) applied during this double jump.
      */
-    public DoubleJumpEvent(
-            final @NotNull Player player,
-            final @NotNull JumpPlayer jumpPlayer,
-            final @NotNull JumpVelocity jumpVelocity) {
+    public DoubleJumpEvent(final @NotNull Player player, final @NotNull JumpPlayer jumpPlayer, final @NotNull JumpVelocity jumpVelocity) {
         this.player = player;
         this.jumpPlayer = jumpPlayer;
         this.jumpVelocity = jumpVelocity;
     }
 
+    /**
+     * Constructs a new DoubleJumpEvent.
+     *
+     * @param player         The player who performed the double jump.
+     * @param jumpPlayer     The JumpPlayer data associated with the player.
+     */
+    public DoubleJumpEvent(final @NotNull Player player, final @NotNull JumpPlayer jumpPlayer) {
+        this.player = player;
+        this.jumpPlayer = jumpPlayer;
+        this.jumpVelocity = jumpPlayer.getJumpVelocity();
+    }
+
     @Override
     public @NotNull HandlerList getHandlers() {
         return HANDLERS;
@@ -75,7 +84,7 @@ public DoubleJumpEvent(
      *
      * @return The DoubleJumpProperties instance.
      */
-    public @NotNull JumpVelocity getJumpProperties() {
+    public @NotNull JumpVelocity getJumpVelocity() {
         return this.jumpVelocity;
     }
 
@@ -84,7 +93,7 @@ public DoubleJumpEvent(
      *
      * @param jumpVelocity The new jump properties.
      */
-    public void setJumpProperties(final @NotNull JumpVelocity jumpVelocity) {
+    public void setJumpVelocity(@NotNull JumpVelocity jumpVelocity) {
         this.jumpVelocity = jumpVelocity;
     }
 
@@ -94,7 +103,7 @@ public boolean isCancelled() {
     }
 
     @Override
-    public void setCancelled(final boolean cancel) {
+    public void setCancelled(boolean cancel) {
         this.cancelled = cancel;
     }
 }

doublejump-api/src/main/java/com/github/imdmk/doublejump/jump/event/DoubleJumpEvent.java

@@ -10,14 +10,16 @@ version = "1.0.0"
 repositories {
     maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") // SpigotMC
     maven("https://repo.eternalcode.pl/releases") // EternalCode
-    maven("https://maven.enginehub.org/repo/") //World Guard API
+    maven("https://maven.enginehub.org/repo/") // World Guard API
+    maven("https://repo.extendedclip.com/releases/") // Placeholder API
 }
 
 dependencies {
     implementation(project(":doublejump-api"))
 
     compileOnly("org.spigotmc:spigot-api:1.17-R0.1-SNAPSHOT")
     compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.9")
+    compileOnly("me.clip:placeholderapi:2.11.6")
 
     implementation("com.zaxxer:HikariCP:6.2.1")
     implementation("com.j256.ormlite:ormlite-jdbc:6.1")
@@ -46,7 +48,7 @@ bukkit {
     author = "imDMK"
     description = "Game-changing double jump mechanics. Feels native. Lag-free performance."
     website = "https://github.com/imDMK/DoubleJump"
-    softDepend = listOf("WorldGuard")
+    softDepend = listOf("WorldGuard", "PlaceholderAPI")
 }
 
 tasks.withType<ShadowJar> {