From 570391ff7c49786506f1c99572f81af4d6676688 Mon Sep 17 00:00:00 2001 From: Piecuuu <56731916+Piecuuu@users.noreply.github.com> Date: Sat, 21 Feb 2026 20:50:32 +0100 Subject: [PATCH] invis ninja compatibility --- build.gradle | 1 + .../java/pl/piecuu/killstreak/Killstreak.java | 21 +++++++++++++++---- .../piecuu/killstreak/KillstreakManager.java | 8 +++++-- .../pl/piecuu/killstreak/PlayerManager.java | 2 +- src/main/resources/plugin.yml | 3 ++- 5 files changed, 27 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 6f6369a..f03bed0 100644 --- a/build.gradle +++ b/build.gradle @@ -20,6 +20,7 @@ repositories { dependencies { compileOnly "pl.piecuu.jajoptak:leaf-api:1.21.11-R0.1-SNAPSHOT" compileOnly "me.clip:placeholderapi:2.11.7" + compileOnly "pl.piecuu.invisninja:invis_ninja:1.0" } tasks.withType(JavaCompile).configureEach { diff --git a/src/main/java/pl/piecuu/killstreak/Killstreak.java b/src/main/java/pl/piecuu/killstreak/Killstreak.java index 6ecb26a..610a794 100644 --- a/src/main/java/pl/piecuu/killstreak/Killstreak.java +++ b/src/main/java/pl/piecuu/killstreak/Killstreak.java @@ -2,19 +2,32 @@ package pl.piecuu.killstreak; import org.bukkit.Bukkit; import org.bukkit.event.Listener; +import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; +import pl.piecuu.invisninja.InvisNinja; + public class Killstreak extends JavaPlugin implements Listener { + private static InvisNinja invisNinja; + public static InvisNinja getInvisNinja() { + return invisNinja; + } + @Override public void onEnable() { - if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) { + PluginManager pm = Bukkit.getPluginManager(); + if (pm.isPluginEnabled("PlaceholderAPI")) { + if(pm.isPluginEnabled("invisninja")) { + invisNinja = (InvisNinja)pm.getPlugin("invisninja"); + } + new KillstreakExpansion().register(); new KillstreakManager(this); - Bukkit.getPluginManager().registerEvents(this, this); - Bukkit.getPluginManager().registerEvents(new PlayerManager(this), this); + pm.registerEvents(this, this); + pm.registerEvents(new PlayerManager(this), this); } else { getLogger().warning("Could not find PlaceholderAPI! This plugin is required."); - Bukkit.getPluginManager().disablePlugin(this); + pm.disablePlugin(this); } } } diff --git a/src/main/java/pl/piecuu/killstreak/KillstreakManager.java b/src/main/java/pl/piecuu/killstreak/KillstreakManager.java index a580b5a..0102b58 100644 --- a/src/main/java/pl/piecuu/killstreak/KillstreakManager.java +++ b/src/main/java/pl/piecuu/killstreak/KillstreakManager.java @@ -7,6 +7,7 @@ import org.bukkit.persistence.PersistentDataType; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.TextColor; import net.kyori.adventure.text.format.TextDecoration; +import pl.piecuu.invisninja.InvisNinja; public class KillstreakManager { private static KillstreakManager instance; @@ -43,8 +44,11 @@ public class KillstreakManager { setKillstreak(player, 0L); } - public boolean shouldAnnounceKillstreak(long killstreak) { - return killstreak >= 5 && killstreak % 5 == 0; + public boolean shouldAnnounceKillstreak(long killstreak, Player p) { + InvisNinja in = plugin.getInvisNinja(); + if(in != null && in.isPlayerInvisible(p)) return false; + + return (killstreak >= 5 && killstreak % 5 == 0); } public int getColor(long killstreak) { diff --git a/src/main/java/pl/piecuu/killstreak/PlayerManager.java b/src/main/java/pl/piecuu/killstreak/PlayerManager.java index 3506ae3..96055fd 100644 --- a/src/main/java/pl/piecuu/killstreak/PlayerManager.java +++ b/src/main/java/pl/piecuu/killstreak/PlayerManager.java @@ -57,7 +57,7 @@ public class PlayerManager implements Listener { final long killstreak = km.increaseKillstreak(attacker, 1L); if(killstreak >= 3) this.playKillSound(p); - if(km.shouldAnnounceKillstreak(killstreak)) { + if(km.shouldAnnounceKillstreak(killstreak, attacker)) { final TextColor blueColor = TextColor.color(0x40b5e3); final Component component = attacker.displayName() .append(Component.text(" osiągnął killstreak ").color(blueColor)) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index e22e72c..e3f4a42 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -4,4 +4,5 @@ author: Piecuu main: pl.piecuu.killstreak.Killstreak api-version: '1.21.11' -depend: ["PlaceholderAPI"] \ No newline at end of file +depend: ["PlaceholderAPI"] +softdepend: ["invisninja"] \ No newline at end of file