From a04ae272868023fc45cdb9c97ec06269bf725cb8 Mon Sep 17 00:00:00 2001 From: ArikSquad <75741608+ArikSquad@users.noreply.github.com> Date: Fri, 31 Jan 2025 18:07:12 +0200 Subject: [PATCH] feat: Initial AbeoVanish support --- paper/pom.xml | 15 +++++- .../eu/mikart/animvanish/AnimVanishPaper.java | 48 ++++++++++--------- .../animvanish/hooks/impl/AbeoVanishHook.java | 29 +++++++++++ paper/src/main/resources/paper-plugin.yml | 4 ++ spigot/pom.xml | 8 +--- spigot/src/main/resources/plugin.yml | 1 + 6 files changed, 74 insertions(+), 31 deletions(-) create mode 100644 paper/src/main/java/eu/mikart/animvanish/hooks/impl/AbeoVanishHook.java diff --git a/paper/pom.xml b/paper/pom.xml index a325aff..0a60d85 100644 --- a/paper/pom.xml +++ b/paper/pom.xml @@ -94,6 +94,12 @@ papermc https://repo.papermc.io/repository/maven-public/ + + + + mikart-repository + https://maven.mikart.eu/snapshots + @@ -112,11 +118,18 @@ 1.1.1 + + eu.mikart.abeovanish + abeovanish-paper + 0.0.1 + provided + + dev.jorel commandapi-bukkit-shade-mojang-mapped - 9.5.3 + 9.7.0 compile diff --git a/paper/src/main/java/eu/mikart/animvanish/AnimVanishPaper.java b/paper/src/main/java/eu/mikart/animvanish/AnimVanishPaper.java index d9fcbef..317cb7b 100644 --- a/paper/src/main/java/eu/mikart/animvanish/AnimVanishPaper.java +++ b/paper/src/main/java/eu/mikart/animvanish/AnimVanishPaper.java @@ -3,6 +3,7 @@ import dev.jorel.commandapi.CommandAPI; import dev.jorel.commandapi.CommandAPIBukkitConfig; import eu.mikart.animvanish.effects.impl.TntEffect; +import eu.mikart.animvanish.hooks.impl.AbeoVanishHook; import lombok.NoArgsConstructor; import net.kyori.adventure.audience.Audience; import org.bukkit.entity.Player; @@ -13,28 +14,29 @@ @NoArgsConstructor public class AnimVanishPaper extends AnimVanishBukkit { - @Override - public void onLoad() { - CommandAPI.onLoad(new CommandAPIBukkitConfig(this).shouldHookPaperReload(true).silentLogs(true)); - } - - @Override - @NotNull - public Audience getAudience(@NotNull UUID user) { - final Player player = getServer().getPlayer(user); - return player == null || !player.isOnline() ? Audience.empty() : player; - } - - @Override - public void loadPlatform() { - CommandAPI.onEnable(); - areCommandsInitialized = true; - getEffectManager().registerEffect(new TntEffect(this)); - } - - @Override - public void unloadPlatform() { - CommandAPI.onDisable(); - } + @Override + public void onLoad() { + CommandAPI.onLoad(new CommandAPIBukkitConfig(this).shouldHookPaperReload(true).silentLogs(true)); + } + + @Override + @NotNull + public Audience getAudience(@NotNull UUID user) { + final Player player = getServer().getPlayer(user); + return player == null || !player.isOnline() ? Audience.empty() : player; + } + + @Override + public void loadPlatform() { + CommandAPI.onEnable(); + areCommandsInitialized = true; + getEffectManager().registerEffect(new TntEffect(this)); + getHooks().add(new AbeoVanishHook()); + } + + @Override + public void unloadPlatform() { + CommandAPI.onDisable(); + } } diff --git a/paper/src/main/java/eu/mikart/animvanish/hooks/impl/AbeoVanishHook.java b/paper/src/main/java/eu/mikart/animvanish/hooks/impl/AbeoVanishHook.java new file mode 100644 index 0000000..9eba622 --- /dev/null +++ b/paper/src/main/java/eu/mikart/animvanish/hooks/impl/AbeoVanishHook.java @@ -0,0 +1,29 @@ +package eu.mikart.animvanish.hooks.impl; + +import eu.mikart.abeovanish.api.BukkitAbeoVanishAPI; +import eu.mikart.animvanish.hooks.Hook; +import eu.mikart.animvanish.user.BukkitUser; +import eu.mikart.animvanish.user.OnlineUser; +import org.bukkit.entity.Player; + +public class AbeoVanishHook extends Hook { + + private final BukkitAbeoVanishAPI abeoVanishAPI; + + public AbeoVanishHook() { + super("AbeoVanish"); + this.abeoVanishAPI = BukkitAbeoVanishAPI.getInstance(); + } + + @Override + public void vanish(OnlineUser p) { + Player player = ((BukkitUser) p).getPlayer(); + abeoVanishAPI.setVanished(player, !isVanished(p)); + } + + @Override + public boolean isVanished(OnlineUser p) { + Player player = ((BukkitUser) p).getPlayer(); + return abeoVanishAPI.isVanished(player); + } +} diff --git a/paper/src/main/resources/paper-plugin.yml b/paper/src/main/resources/paper-plugin.yml index b9a7b96..483e429 100644 --- a/paper/src/main/resources/paper-plugin.yml +++ b/paper/src/main/resources/paper-plugin.yml @@ -20,6 +20,10 @@ dependencies: load: BEFORE required: false join-classpath: true + AbeoVanish: + load: BEFORE + required: false + join-classpath: true Citizens: load: BEFORE required: false diff --git a/spigot/pom.xml b/spigot/pom.xml index 88934ca..0a118d2 100644 --- a/spigot/pom.xml +++ b/spigot/pom.xml @@ -140,12 +140,6 @@ aikar https://repo.aikar.co/content/groups/aikar/ - - - maven_central - Maven Central - https://repo.maven.apache.org/maven2/ - @@ -247,7 +241,7 @@ com.github.stefvanschie.inventoryframework IF - 0.10.17 + 0.10.19 diff --git a/spigot/src/main/resources/plugin.yml b/spigot/src/main/resources/plugin.yml index 5370819..a965dce 100644 --- a/spigot/src/main/resources/plugin.yml +++ b/spigot/src/main/resources/plugin.yml @@ -12,6 +12,7 @@ softdepend: - PremiumVanish - Citizens - AdvancedVanish + - AbeoVanish permissions: animvanish.*: