diff --git a/src/main/java/xyz/jpenilla/pluginbase/legacy/PluginBase.java b/src/main/java/xyz/jpenilla/pluginbase/legacy/PluginBase.java index aafa1d3..410436b 100644 --- a/src/main/java/xyz/jpenilla/pluginbase/legacy/PluginBase.java +++ b/src/main/java/xyz/jpenilla/pluginbase/legacy/PluginBase.java @@ -3,13 +3,10 @@ package xyz.jpenilla.pluginbase.legacy; import io.papermc.paper.threadedregions.RegionizedServerInitEvent; import net.kyori.adventure.platform.bukkit.BukkitAudiences; import net.kyori.adventure.text.minimessage.MiniMessage; -import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; import org.jspecify.annotations.NonNull; -import org.jspecify.annotations.Nullable; -import xyz.jpenilla.pluginbase.legacy.compatability.PlaceholderAPIHook; import java.nio.file.Path; import java.util.Queue; @@ -17,7 +14,6 @@ import java.util.concurrent.ConcurrentLinkedQueue; public abstract class PluginBase extends JavaPlugin { private static PluginBase instance; - private PlaceholderAPIHook placeholderApi = null; private BukkitAudiences audiences; private final MiniMessage miniMessage; private Path dataPath; @@ -40,10 +36,6 @@ public abstract class PluginBase extends JavaPlugin { this.dataPath = this.getDataFolder().toPath(); this.audiences = BukkitAudiences.create(this); - this.checkForPlaceholderApi(); - // In case the softdepend is missing... - this.initTasks.add(this::checkForPlaceholderApi); - this.enable(); } @@ -61,18 +53,6 @@ public abstract class PluginBase extends JavaPlugin { public abstract void disable(); - private void checkForPlaceholderApi() { - if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) { - this.placeholderApi = new PlaceholderAPIHook(); - } else { - this.placeholderApi = null; - } - } - - public @Nullable PlaceholderAPIHook placeholderApi() { - return this.placeholderApi; - } - public @NonNull BukkitAudiences audiences() { return this.audiences; } diff --git a/src/main/java/xyz/jpenilla/pluginbase/legacy/compatability/PlaceholderAPIHook.java b/src/main/java/xyz/jpenilla/pluginbase/legacy/compatability/PlaceholderAPIHook.java deleted file mode 100644 index 9985fae..0000000 --- a/src/main/java/xyz/jpenilla/pluginbase/legacy/compatability/PlaceholderAPIHook.java +++ /dev/null @@ -1,12 +0,0 @@ -package xyz.jpenilla.pluginbase.legacy.compatability; - -import me.clip.placeholderapi.PlaceholderAPI; -import org.bukkit.entity.Player; -import org.jspecify.annotations.NullMarked; - -@NullMarked -public final class PlaceholderAPIHook { - public String replacePlaceholders(final Player player, final String msg) { - return PlaceholderAPI.setPlaceholders(player, msg); - } -}