From 71384733d69b1245eac5970bcf45aadbbca73594 Mon Sep 17 00:00:00 2001 From: hsgamer Date: Fri, 31 Jan 2025 22:54:51 +0700 Subject: [PATCH] remove MiniPlaceholders hook Will make a separated plugin instead --- spigot/plugin/pom.xml | 19 ------- .../topper/spigot/plugin/hook/HookSystem.java | 4 -- .../MiniPlaceholderValueProvider.java | 43 --------------- .../MiniPlaceholdersHook.java | 54 ------------------- spigot/plugin/src/main/resources/plugin.yml | 1 - 5 files changed, 121 deletions(-) delete mode 100644 spigot/plugin/src/main/java/me/hsgamer/topper/spigot/plugin/hook/miniplaceholders/MiniPlaceholderValueProvider.java delete mode 100644 spigot/plugin/src/main/java/me/hsgamer/topper/spigot/plugin/hook/miniplaceholders/MiniPlaceholdersHook.java diff --git a/spigot/plugin/pom.xml b/spigot/plugin/pom.xml index 357aaefe..69fa0a29 100644 --- a/spigot/plugin/pom.xml +++ b/spigot/plugin/pom.xml @@ -90,10 +90,6 @@ placeholderapi https://repo.extendedclip.com/releases/ - - papermc - https://repo.papermc.io/repository/maven-public/ - @@ -199,20 +195,5 @@ 2.11.6 provided - - io.github.miniplaceholders - miniplaceholders-api - 2.2.3 - provided - - - - - - io.papermc.paper - paper-api - 1.19.4-R0.1-SNAPSHOT - provided - \ No newline at end of file diff --git a/spigot/plugin/src/main/java/me/hsgamer/topper/spigot/plugin/hook/HookSystem.java b/spigot/plugin/src/main/java/me/hsgamer/topper/spigot/plugin/hook/HookSystem.java index 85f2d295..4aceaa6f 100644 --- a/spigot/plugin/src/main/java/me/hsgamer/topper/spigot/plugin/hook/HookSystem.java +++ b/spigot/plugin/src/main/java/me/hsgamer/topper/spigot/plugin/hook/HookSystem.java @@ -2,7 +2,6 @@ import io.github.projectunified.minelib.plugin.base.Loadable; import me.hsgamer.topper.spigot.plugin.TopperPlugin; -import me.hsgamer.topper.spigot.plugin.hook.miniplaceholders.MiniPlaceholdersHook; import me.hsgamer.topper.spigot.plugin.hook.placeholderapi.PlaceholderAPIHook; import java.util.ArrayList; @@ -24,9 +23,6 @@ private void registerHooks() { if (isPluginLoaded("PlaceholderAPI")) { hooks.add(new PlaceholderAPIHook(instance)); } - if (isPluginLoaded("MiniPlaceholders")) { - hooks.add(new MiniPlaceholdersHook(instance)); - } } @Override diff --git a/spigot/plugin/src/main/java/me/hsgamer/topper/spigot/plugin/hook/miniplaceholders/MiniPlaceholderValueProvider.java b/spigot/plugin/src/main/java/me/hsgamer/topper/spigot/plugin/hook/miniplaceholders/MiniPlaceholderValueProvider.java deleted file mode 100644 index 610b782f..00000000 --- a/spigot/plugin/src/main/java/me/hsgamer/topper/spigot/plugin/hook/miniplaceholders/MiniPlaceholderValueProvider.java +++ /dev/null @@ -1,43 +0,0 @@ -package me.hsgamer.topper.spigot.plugin.hook.miniplaceholders; - -import io.github.miniplaceholders.api.MiniPlaceholders; -import me.hsgamer.topper.spigot.plugin.TopperPlugin; -import me.hsgamer.topper.spigot.plugin.holder.provider.NumberStringValueProvider; -import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.minimessage.MiniMessage; -import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; -import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; -import org.bukkit.entity.Player; - -import java.util.Map; -import java.util.Optional; -import java.util.UUID; - -public class MiniPlaceholderValueProvider extends NumberStringValueProvider { - private final String placeholder; - - public MiniPlaceholderValueProvider(TopperPlugin plugin, Map map) { - super(plugin, map); - placeholder = Optional.ofNullable(map.get("placeholder")).map(Object::toString).orElse(""); - } - - @Override - protected String getDisplayName() { - return placeholder; - } - - @Override - protected Optional getString(UUID uuid) { - Player player = plugin.getServer().getPlayer(uuid); - if (player == null) { - return Optional.empty(); - } - - TagResolver resolver = MiniPlaceholders.getAudiencePlaceholders(player); - - Component component = MiniMessage.miniMessage().deserialize(placeholder, resolver); - String parsed = PlainTextComponentSerializer.plainText().serialize(component).trim(); - - return Optional.of(parsed); - } -} diff --git a/spigot/plugin/src/main/java/me/hsgamer/topper/spigot/plugin/hook/miniplaceholders/MiniPlaceholdersHook.java b/spigot/plugin/src/main/java/me/hsgamer/topper/spigot/plugin/hook/miniplaceholders/MiniPlaceholdersHook.java deleted file mode 100644 index f3b9f07c..00000000 --- a/spigot/plugin/src/main/java/me/hsgamer/topper/spigot/plugin/hook/miniplaceholders/MiniPlaceholdersHook.java +++ /dev/null @@ -1,54 +0,0 @@ -package me.hsgamer.topper.spigot.plugin.hook.miniplaceholders; - -import io.github.miniplaceholders.api.Expansion; -import io.github.miniplaceholders.api.utils.TagsUtils; -import io.github.projectunified.minelib.plugin.base.Loadable; -import me.hsgamer.topper.spigot.plugin.TopperPlugin; -import me.hsgamer.topper.spigot.plugin.builder.ValueProviderBuilder; -import me.hsgamer.topper.spigot.plugin.manager.TopQueryManager; -import net.kyori.adventure.text.minimessage.tag.Tag; -import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.Nullable; - -import java.util.function.BiFunction; - -public class MiniPlaceholdersHook implements Loadable { - private final TopperPlugin plugin; - private final Expansion expansion; - - public MiniPlaceholdersHook(TopperPlugin plugin) { - this.plugin = plugin; - - BiFunction<@Nullable Player, ArgumentQueue, Tag> queryFunction = (player, queue) -> { - String query = queue.popOr("You need to specify the query").value(); - String result = plugin.get(TopQueryManager.class).get(player, query); - if (result == null) { - return TagsUtils.EMPTY_TAG; - } else { - return TagsUtils.staticTag(result); - } - }; - - this.expansion = Expansion.builder("topper") - .globalPlaceholder("global", (queue, context) -> queryFunction.apply(null, queue)) - .filter(Player.class) - .audiencePlaceholder("player", (audience, queue, ctx) -> queryFunction.apply((Player) audience, queue)) - .build(); - } - - @Override - public void load() { - plugin.get(ValueProviderBuilder.class).register(map -> new MiniPlaceholderValueProvider(plugin, map), "miniplaceholders"); - } - - @Override - public void enable() { - expansion.register(); - } - - @Override - public void disable() { - expansion.unregister(); - } -} diff --git a/spigot/plugin/src/main/resources/plugin.yml b/spigot/plugin/src/main/resources/plugin.yml index 4569c049..3ee695eb 100644 --- a/spigot/plugin/src/main/resources/plugin.yml +++ b/spigot/plugin/src/main/resources/plugin.yml @@ -4,5 +4,4 @@ main: me.hsgamer.topper.spigot.plugin.TopperPlugin api-version: 1.13 softdepend: - PlaceholderAPI - - MiniPlaceholders folia-supported: true