Skip to content

GH-973 Rename and restructure placeholders configuration classes #1225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vLuckyyy merged 3 commits into from
Dec 6, 2025
+42 −29
Merged

GH-973 Rename and restructure placeholders configuration classes #1225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86cc040
refactor: Rename and restructure placeholders configuration classes
ChudziudgiToJa Oct 28, 2025
d593d4e
Merge branch 'master' into refactor-placeholders
vLuckyyy Dec 6, 2025
792cc65
Remove "online_count" placeholder from PlaceholdersConfig.
vLuckyyy Dec 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions ...ain/java/com/eternalcode/core/configuration/implementation/PlaceholdersConfiguration.java
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions .../src/main/java/com/eternalcode/core/configuration/implementation/PluginConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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")
Expand Down
24 changes: 24 additions & 0 deletions eternalcore-core/src/main/java/com/eternalcode/core/placeholder/PlaceholdersConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
}
7 changes: 7 additions & 0 deletions eternalcore-core/src/main/java/com/eternalcode/core/placeholder/PlaceholdersSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.eternalcode.core.placeholder;

import java.util.Map;

public interface PlaceholdersSettings {
Copy link
Contributor

@imDMK imDMK Oct 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think an interface isn’t needed here. This is just a placeholders config, and at this point, I’m overengineering it.

Map<String, String> placeholders();
}
7 changes: 3 additions & 4 deletions eternalcore-core/src/main/java/com/eternalcode/core/placeholder/PlaceholdersSetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 + "}")));
}
}

Expand Down