diff --git a/backend/src/main/java/net/momirealms/customnameplates/backend/placeholder/PlaceholderManagerImpl.java b/backend/src/main/java/net/momirealms/customnameplates/backend/placeholder/PlaceholderManagerImpl.java index 9626454..0d7ccde 100644 --- a/backend/src/main/java/net/momirealms/customnameplates/backend/placeholder/PlaceholderManagerImpl.java +++ b/backend/src/main/java/net/momirealms/customnameplates/backend/placeholder/PlaceholderManagerImpl.java @@ -114,7 +114,15 @@ public class PlaceholderManagerImpl implements PlaceholderManager { } private void loadNestNameplatePlaceholders() { - if (!ConfigManager.nameplateModule()) return; + if (!ConfigManager.nameplateModule()) { + this.registerPlayerPlaceholder("%np_tag-image%", (player -> "Please remove %np_tag-image% if you have disabled nameplates module")); + this.registerPlayerPlaceholder("%rel_np_tag-image%", (player -> "Please remove %rel_np_tag-image% if you have disabled nameplates module")); + this.registerPlayerPlaceholder("%np_tag-text%", (player -> "Please remove %np_tag-text% if you have disabled nameplates module")); + this.registerPlayerPlaceholder("%rel_np_tag-text%", (player -> "Please remove %rel_np_tag-text% if you have disabled nameplates module")); + this.registerPlayerPlaceholder("%np_tag%", (player -> "Please remove %np_tag% if you have disabled nameplates module")); + this.registerPlayerPlaceholder("%rel_np_tag%", (player -> "Please remove %rel_np_tag% if you have disabled nameplates module")); + return; + } PreParsedDynamicText nameTag = new PreParsedDynamicText(plugin.getNameplateManager().playerNameTag()); Placeholder placeholder1 = this.registerPlayerPlaceholder("%np_tag-image%", (player -> { String equippedNameplate = player.equippedNameplate(); diff --git a/backend/src/main/java/net/momirealms/customnameplates/backend/requirement/AbstractRequirementManager.java b/backend/src/main/java/net/momirealms/customnameplates/backend/requirement/AbstractRequirementManager.java index 66ea3e0..c977bd9 100644 --- a/backend/src/main/java/net/momirealms/customnameplates/backend/requirement/AbstractRequirementManager.java +++ b/backend/src/main/java/net/momirealms/customnameplates/backend/requirement/AbstractRequirementManager.java @@ -124,8 +124,8 @@ public abstract class AbstractRequirementManager implements RequirementManager { this.registerRequirement((args, interval) -> { Section section = ConfigUtils.safeCast(args, Section.class); if (section == null) return Requirement.empty(); - PreParsedDynamicText dynamicText1 = new PreParsedDynamicText(section.getString("value1", ""), true); - String regex = section.getString("value2", ""); + PreParsedDynamicText dynamicText1 = new PreParsedDynamicText(section.getString("papi", ""), true); + String regex = section.getString("regex", ""); return new RegexRequirement(interval, dynamicText1, regex); }, "regex"); this.registerRequirement((args, interval) -> { diff --git a/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/scheduler/impl/BukkitExecutor.java b/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/scheduler/impl/BukkitExecutor.java index a5b164e..1f0e038 100644 --- a/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/scheduler/impl/BukkitExecutor.java +++ b/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/scheduler/impl/BukkitExecutor.java @@ -25,7 +25,6 @@ package net.momirealms.customnameplates.bukkit.scheduler.impl; -import net.momirealms.customnameplates.common.plugin.scheduler.DummyTask; import net.momirealms.customnameplates.common.plugin.scheduler.RegionExecutor; import net.momirealms.customnameplates.common.plugin.scheduler.SchedulerTask; import org.bukkit.Bukkit;