1.21 update + version checker fixed + permission not working

corentingosselin · Jul 2, 2024 · 643df35 · 643df35
1 parent aa00e04
commit 643df35
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 31 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>fr.cocoraid.prodigycape</groupId>
     <artifactId>ProdigyCape</artifactId>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.31-SNAPSHOT</version>
     <name>ProdigyCape</name>
 
     <properties>
@@ -39,7 +39,7 @@
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>2.3.1</version>
                 <configuration>
-                    <outputDirectory>/Users/prodigy/Documents/minecraft/serveur/1.20.6/plugins</outputDirectory>
+                    <outputDirectory>/Users/prodigy/Documents/minecraft/serveur/1.21/plugins</outputDirectory>
                 </configuration>
             </plugin>
 
@@ -120,16 +120,9 @@
     <dependencies>
 
         <dependency>
-            <groupId>com.github.max1mde</groupId>
-            <artifactId>PassengerAPI</artifactId>
-            <version>1.0.0</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.retrooper.packetevents</groupId>
-            <artifactId>spigot</artifactId>
-            <version>2.3.0</version>
+            <groupId>com.github.retrooper</groupId>
+            <artifactId>packetevents-spigot</artifactId>
+            <version>2.4.0</version>
             <scope>compile</scope>
         </dependency>
 

diff --git 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
@@ -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
@@ -78,21 +78,14 @@ public void onCapeApply(Player player, Cape cape) {
         capeManager.applyCape(player, cape);
     }
 
-    //apply to other player
     @Syntax("<cape> <player>")
     @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("<cape>")
     @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
@@ -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
@@ -8,22 +8,30 @@
  */
 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");
             isPapermc = true;
         } 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
@@ -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]