From 643df35cfde2add322c29609342d44cb576ac91c Mon Sep 17 00:00:00 2001 From: prodigy Date: Tue, 2 Jul 2024 09:50:04 +0200 Subject: [PATCH] 1.21 update + version checker fixed + permission not working --- pom.xml | 17 +++++------------ .../fr/cocoraid/prodigycape/ProdigyCape.java | 4 ---- .../cocoraid/prodigycape/cape/PlayerCape.java | 2 -- .../prodigycape/commands/CapeCommand.java | 9 +-------- .../prodigycape/manager/CapeManager.java | 1 + .../prodigycape/utils/VersionChecker.java | 16 ++++++++++++---- src/main/resources/plugin.yml | 2 +- 7 files changed, 20 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index ec77f47..0d25e3a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ fr.cocoraid.prodigycape ProdigyCape - 1.0.3-SNAPSHOT + 1.0.31-SNAPSHOT ProdigyCape @@ -39,7 +39,7 @@ maven-jar-plugin 2.3.1 - /Users/prodigy/Documents/minecraft/serveur/1.20.6/plugins + /Users/prodigy/Documents/minecraft/serveur/1.21/plugins @@ -120,16 +120,9 @@ - com.github.max1mde - PassengerAPI - 1.0.0 - provided - - - - com.github.retrooper.packetevents - spigot - 2.3.0 + com.github.retrooper + packetevents-spigot + 2.4.0 compile diff --git a/src/main/java/fr/cocoraid/prodigycape/ProdigyCape.java b/src/main/java/fr/cocoraid/prodigycape/ProdigyCape.java index 71388c9..77d127c 100644 --- a/src/main/java/fr/cocoraid/prodigycape/ProdigyCape.java +++ b/src/main/java/fr/cocoraid/prodigycape/ProdigyCape.java @@ -5,8 +5,6 @@ import com.github.retrooper.packetevents.PacketEvents; import com.github.retrooper.packetevents.manager.player.PlayerManager; -import com.maximde.passengerapi.PassengerAPI; -import com.maximde.passengerapi.PassengerActions; import fr.cocoraid.prodigycape.commands.CapeCommand; import fr.cocoraid.prodigycape.commands.CapeCompletion; import fr.cocoraid.prodigycape.commands.CapeContext; @@ -50,7 +48,6 @@ public final class ProdigyCape extends JavaPlugin { private Configuration configuration; private PlayerManager playerManager; - private PassengerActions passengerActions; @Override @@ -105,7 +102,6 @@ public void onEnable() { .usePlatformLogger(); EntityLib.init(platform, settings); - this.passengerActions = PassengerAPI.getAPI(this); getServer().getPluginManager().registerEvents(new CapeListener(), this); getServer().getPluginManager().registerEvents(new JoinQuitListener(this), this); diff --git a/src/main/java/fr/cocoraid/prodigycape/cape/PlayerCape.java b/src/main/java/fr/cocoraid/prodigycape/cape/PlayerCape.java index 72d216f..fe544ff 100644 --- a/src/main/java/fr/cocoraid/prodigycape/cape/PlayerCape.java +++ b/src/main/java/fr/cocoraid/prodigycape/cape/PlayerCape.java @@ -10,7 +10,6 @@ import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerSetPassengers; import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerSpawnEntity; -import com.maximde.passengerapi.PassengerActions; import fr.cocoraid.prodigycape.ProdigyCape; @@ -38,7 +37,6 @@ public class PlayerCape { private static ProdigyCape instance = ProdigyCape.getInstance(); - private static PassengerActions passengerActions = instance.getPassengerActions(); private static PlayerManager playerManager = instance.getPlayerManager(); diff --git a/src/main/java/fr/cocoraid/prodigycape/commands/CapeCommand.java b/src/main/java/fr/cocoraid/prodigycape/commands/CapeCommand.java index f70762e..cfc5471 100644 --- a/src/main/java/fr/cocoraid/prodigycape/commands/CapeCommand.java +++ b/src/main/java/fr/cocoraid/prodigycape/commands/CapeCommand.java @@ -78,21 +78,14 @@ public void onCapeApply(Player player, Cape cape) { capeManager.applyCape(player, cape); } - //apply to other player @Syntax(" ") @CommandCompletion("@capes @players") @CommandPermission("prodigycape.admin") - @Subcommand("apply") + @Subcommand("force apply") public void onCapeApply(CommandSender sender, Cape cape, Player target) { - if (!capeManager.ownsCape(target, cape)) { - sender.sendMessage(languageManager.getLanguage().no_permission); - return; - } capeManager.applyCape(target, cape); } - - @Syntax("") @CommandPermission("prodigycape.menu") @Subcommand("menu") diff --git a/src/main/java/fr/cocoraid/prodigycape/manager/CapeManager.java b/src/main/java/fr/cocoraid/prodigycape/manager/CapeManager.java index 3b49518..aced0d4 100644 --- a/src/main/java/fr/cocoraid/prodigycape/manager/CapeManager.java +++ b/src/main/java/fr/cocoraid/prodigycape/manager/CapeManager.java @@ -190,6 +190,7 @@ public boolean isEnabled(Cape cape, Player player) { public boolean ownsCape(Player player, Cape cape) { if (player.hasPermission("prodigy.cape." + cape.getKey()) || player.hasPermission("prodigy.cape.*")) { + return true; } ProdigyPlayer pp = prodigyManager.getProdigyPlayer(player.getUniqueId()); diff --git a/src/main/java/fr/cocoraid/prodigycape/utils/VersionChecker.java b/src/main/java/fr/cocoraid/prodigycape/utils/VersionChecker.java index a13a6b6..0a78c01 100644 --- a/src/main/java/fr/cocoraid/prodigycape/utils/VersionChecker.java +++ b/src/main/java/fr/cocoraid/prodigycape/utils/VersionChecker.java @@ -8,11 +8,12 @@ */ public enum VersionChecker { - v1_19_R2(0), v1_19_R3(1), v1_20_R1(2), v1_20_R2(3), v1_20_R3(4), v1_20_R4(5); + v1_19_R2(0), v1_19_R3(1), v1_20_R1(2), v1_20_R2(3), v1_20_R3(4), v1_20_R4(5), v1_21_R1(6); @Getter private static VersionChecker currentVersion; private static boolean isPapermc = false; + static { try { Class.forName("com.destroystokyo.paper.VersionHistoryManager$VersionData"); @@ -20,10 +21,17 @@ public enum VersionChecker { } catch (ClassNotFoundException ignored) { } - if(isPapermc && Bukkit.getBukkitVersion().contains("1.20.6")) { - currentVersion = VersionChecker.v1_20_R4; + if (isPapermc) { + String version = Bukkit.getBukkitVersion(); + if (version.contains("1.20.6")) { + currentVersion = VersionChecker.v1_20_R4; + } else if (version.contains("1.21")) { + currentVersion = VersionChecker.v1_21_R1; + } else { + currentVersion = VersionChecker.valueOf(Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3]); + } } else { - currentVersion = VersionChecker.valueOf(Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3]); + currentVersion = VersionChecker.valueOf(Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3]); } } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 8d01f7e..9848dbd 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: ProdigyCape -version: '1.0.3-SNAPSHOT' +version: '1.0.31-SNAPSHOT' main: fr.cocoraid.prodigycape.ProdigyCape api-version: 1.19 softdepend: [Vault,PassengerAPI]