GH-973 Rename and restructure placeholders configuration classes (#1225)

* refactor: Rename and restructure placeholders configuration classes

* Remove "online_count" placeholder from PlaceholdersConfig.

---------

Co-authored-by: Martin Sulikowski <vluckyyy.biznes@gmail.com>

Author: ChudziudgiToJa

eternalcore-core/src/main/java/com/eternalcode/core/configuration/implementation/PlaceholdersConfiguration.java

@@ -47,6 +47,8 @@
 import com.eternalcode.core.feature.warp.WarpSettings;
 import com.eternalcode.core.injector.annotations.Bean;
 import com.eternalcode.core.injector.annotations.component.ConfigurationFile;
+import com.eternalcode.core.placeholder.PlaceholdersConfig;
+import com.eternalcode.core.placeholder.PlaceholdersSettings;
 import com.eternalcode.core.translation.TranslationConfig;
 import com.eternalcode.core.translation.TranslationSettings;
 import eu.okaeri.configs.OkaeriConfig;
@@ -79,6 +81,12 @@ public class PluginConfiguration extends AbstractConfigurationFile {
     @Comment("# Choose the preferred language for all messages and interactions in the plugin.")
     TranslationConfig language = new TranslationConfig();
 
+    @Bean(proxied = PlaceholdersSettings.class)
+    @Comment("")
+    @Comment("# Placeholders Configuration")
+    @Comment("# Settings that define various placeholders used across the plugin")
+    PlaceholdersConfig placeholders = new PlaceholdersConfig();
+
     @Bean(proxied = DatabaseSettings.class)
     @Comment("")
     @Comment("# Database Configuration")

eternalcore-core/src/main/java/com/eternalcode/core/configuration/implementation/PluginConfiguration.java

@@ -0,0 +1,24 @@
+package com.eternalcode.core.placeholder;
+
+import eu.okaeri.configs.OkaeriConfig;
+import eu.okaeri.configs.annotation.Comment;
+import lombok.Getter;
+import lombok.experimental.Accessors;
+
+import java.util.Map;
+
+
+@Getter
+@Accessors(fluent = true)
+public class PlaceholdersConfig extends OkaeriConfig implements PlaceholdersSettings {
+
+    @Comment("# Map of available placeholders and their default values")
+    public Map<String, String> placeholders = Map.of(
+        "prefix", "&7"
+    );
+
+    @Override
+    public Map<String, String> placeholders() {
+        return placeholders;
+    }
+}

eternalcore-core/src/main/java/com/eternalcode/core/placeholder/PlaceholdersConfig.java

@@ -0,0 +1,7 @@
+package com.eternalcode.core.placeholder;
+
+import java.util.Map;
+
+public interface PlaceholdersSettings {
+    Map<String, String> placeholders();
+}

eternalcore-core/src/main/java/com/eternalcode/core/placeholder/PlaceholdersSettings.java

@@ -3,7 +3,6 @@
 import com.eternalcode.annotations.scan.placeholder.PlaceholdersDocs;
 import com.eternalcode.annotations.scan.placeholder.PlaceholdersDocs.Entry;
 import com.eternalcode.annotations.scan.placeholder.PlaceholdersDocs.Entry.Type;
-import com.eternalcode.core.configuration.implementation.PlaceholdersConfiguration;
 import com.eternalcode.core.feature.vanish.VanishService;
 import com.eternalcode.core.injector.annotations.component.Controller;
 import com.eternalcode.core.publish.event.EternalInitializeEvent;
@@ -24,9 +23,9 @@
 class PlaceholdersSetup {
 
     @Subscribe(EternalInitializeEvent.class)
-    void setUp(PlaceholderRegistry placeholders, PlaceholdersConfiguration config) {
-        for (String key : config.placeholders.keySet()) {
-            placeholders.register(Placeholder.of(key, player -> config.placeholders.getOrDefault(key, "{" + key + "}")));
+    void setUp(PlaceholderRegistry placeholders, PlaceholdersSettings config) {
+        for (String key : config.placeholders().keySet()) {
+            placeholders.register(Placeholder.of(key, player -> config.placeholders().getOrDefault(key, "{" + key + "}")));
         }
     }