commit

RhythmicSys · RhythmicSys · commit 8e44f0da77b5 · 2023-11-22T15:43:14.000-08:00
diff --git a/pom.xml b/pom.xml
@@ -58,6 +58,10 @@
             <id>sonatype</id>
             <url>https://oss.sonatype.org/content/groups/public/</url>
         </repository>
+        <repository>
+            <id>placeholderapi</id>
+            <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -67,5 +71,11 @@
             <version>1.20.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>me.clip</groupId>
+            <artifactId>placeholderapi</artifactId>
+            <version>2.11.5</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/src/main/java/simplexity/simpleplayerfreeze/ConfigSettings.java b/src/main/java/simplexity/simpleplayerfreeze/ConfigSettings.java
@@ -25,6 +25,7 @@ public class ConfigSettings {
     public static String freezeSpyEnabled = "";
     public static String freezeSpyDisabled = "";
     public static String onlyPlayer = "";
+    public static String placeholderAPIFormat = "";
     public static boolean freezePersist;
     public static boolean freezeGlow;
     public static boolean freezeDismount;
@@ -70,6 +71,7 @@ private static void reloadMessages() {
         freezeSpyEnabled = config.getString("freeze-spy-enabled");
         freezeSpyDisabled = config.getString("freeze-spy-disabled");
         onlyPlayer = config.getString("only-player");
+        placeholderAPIFormat = config.getString("placeholder-api-format");
     }
     
     private static void reloadConfigBooleans() {
diff --git a/src/main/java/simplexity/simpleplayerfreeze/SimplePlayerFreeze.java b/src/main/java/simplexity/simpleplayerfreeze/SimplePlayerFreeze.java
@@ -8,6 +8,7 @@
 import simplexity.simpleplayerfreeze.commands.ReloadConfig;
 import simplexity.simpleplayerfreeze.commands.UnfreezePlayer;
 import simplexity.simpleplayerfreeze.listeners.*;
+import simplexity.simpleplayerfreeze.placeholderapi.IsFrozenPlaceholder;
 
 import java.util.List;
 
@@ -19,11 +20,16 @@ public final class SimplePlayerFreeze extends JavaPlugin {
     public void onEnable() {
         simplePlayerFreeze = this;
         server = getServer();
+        boolean papiEnabled = getServer().getPluginManager().isPluginEnabled("PlaceholderAPI");
+        System.out.println(papiEnabled);
         //Register the commands for the plugin, this is supposedly the best way to do commands now
-        getServer().getCommandMap().register(Util.namespace, new FreezePlayer("freeze", "Freezes a player in place and prevents them from using normal things", "/freeze <player>", List.of("cease")));
-        getServer().getCommandMap().register(Util.namespace, new UnfreezePlayer("unfreeze", "Unfreezes a player and allows them to use normal things", "/unfreeze <player>", List.of("resume")));
-        getServer().getCommandMap().register(Util.namespace, new ReloadConfig("freezereload", " reloads the config", "/freezereload", List.of("simpleplayerfreezereload", "spfreload")));
-        getServer().getCommandMap().register(Util.namespace, new FreezeSpy("freezespy", "Toggles the visibility of frozen players' messages", "/freezespy", List.of("fspy", "spfspy")));
+        this.getCommand("freeze").setExecutor(new FreezePlayer());
+        this.getCommand("unfreeze").setExecutor(new UnfreezePlayer());
+        this.getCommand("freezereload").setExecutor(new ReloadConfig());
+        this.getCommand("freezespy").setExecutor(new FreezeSpy());
+        if (papiEnabled) {
+            new IsFrozenPlaceholder().register();
+        }
         registerListeners();
         this.saveDefaultConfig();
         this.reloadConfig();
diff --git a/src/main/java/simplexity/simpleplayerfreeze/commands/FreezePlayer.java b/src/main/java/simplexity/simpleplayerfreeze/commands/FreezePlayer.java
@@ -3,24 +3,23 @@
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import simplexity.simpleplayerfreeze.ConfigSettings;
 import simplexity.simpleplayerfreeze.Util;
 import simplexity.simpleplayerfreeze.freeze.FreezeFunctionality;
 
 import java.util.List;
 
-public class FreezePlayer extends Command {
+public class FreezePlayer implements CommandExecutor {
     
     // Freezes the player, or unfreezes the player if they are already frozen.
-    public FreezePlayer(@NotNull String name, @NotNull String description, @NotNull String usageMessage, @NotNull List<String> aliases) {
-        super(name, description, usageMessage, aliases);
-    }
     
-    @Override
-    public boolean execute(@NotNull CommandSender sender, @NotNull String s, @NotNull String[] strings) {
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
         if (!sender.hasPermission(Util.freezePermission)) {
             sender.sendRichMessage(ConfigSettings.noPermission);
             return false;
@@ -49,4 +48,5 @@ public boolean execute(@NotNull CommandSender sender, @NotNull String s, @NotNul
         }
         return true;
     }
+
 }
diff --git a/src/main/java/simplexity/simpleplayerfreeze/commands/FreezeSpy.java b/src/main/java/simplexity/simpleplayerfreeze/commands/FreezeSpy.java
@@ -1,6 +1,7 @@
 package simplexity.simpleplayerfreeze.commands;
 
 import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.persistence.PersistentDataType;
@@ -11,14 +12,11 @@
 
 import java.util.List;
 
-public class FreezeSpy extends Command {
+public class FreezeSpy implements CommandExecutor {
     
-    public FreezeSpy(@NotNull String name, @NotNull String description, @NotNull String usageMessage, @NotNull List<String> aliases) {
-        super(name, description, usageMessage, aliases);
-    }
     
     @Override
-    public boolean execute(@NotNull CommandSender sender, @NotNull String s, @NotNull String[] strings) {
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
         if (!sender.hasPermission(Util.freezeChatSpy)) {
             sender.sendRichMessage(ConfigSettings.noPermission);
             return false;
diff --git a/src/main/java/simplexity/simpleplayerfreeze/commands/ReloadConfig.java b/src/main/java/simplexity/simpleplayerfreeze/commands/ReloadConfig.java
@@ -1,6 +1,7 @@
 package simplexity.simpleplayerfreeze.commands;
 
 import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 import simplexity.simpleplayerfreeze.ConfigSettings;
@@ -9,16 +10,12 @@
 
 import java.util.List;
 
-public class ReloadConfig extends Command {
+public class ReloadConfig implements CommandExecutor {
     
     // Reloads the configuration
     
-    public ReloadConfig(@NotNull String name, @NotNull String description, @NotNull String usageMessage, @NotNull List<String> aliases) {
-        super(name, description, usageMessage, aliases);
-    }
-    
     @Override
-    public boolean execute(@NotNull CommandSender sender, @NotNull String s, @NotNull String[] strings) {
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
         if (!sender.hasPermission(Util.reloadPermission)) {
             sender.sendRichMessage(ConfigSettings.noPermission);
             return false;
diff --git a/src/main/java/simplexity/simpleplayerfreeze/commands/UnfreezePlayer.java b/src/main/java/simplexity/simpleplayerfreeze/commands/UnfreezePlayer.java
@@ -3,25 +3,24 @@
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import simplexity.simpleplayerfreeze.ConfigSettings;
 import simplexity.simpleplayerfreeze.Util;
 import simplexity.simpleplayerfreeze.freeze.FreezeFunctionality;
 
 import java.util.List;
 
-public class UnfreezePlayer extends Command {
+public class UnfreezePlayer implements CommandExecutor {
     
     // Unfreezes a frozen player
     
-    public UnfreezePlayer(@NotNull String name, @NotNull String description, @NotNull String usageMessage, @NotNull List<String> aliases) {
-        super(name, description, usageMessage, aliases);
-    }
-    
     @Override
-    public boolean execute(@NotNull CommandSender sender, @NotNull String s, @NotNull String[] strings) {
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
         if (!sender.hasPermission(Util.unfreezePermission)) return false;
         if (strings.length == 0) {
             sender.sendRichMessage(ConfigSettings.prefix + ConfigSettings.noPlayer);
@@ -41,4 +40,5 @@ public boolean execute(@NotNull CommandSender sender, @NotNull String s, @NotNul
                 Placeholder.component("name", player.displayName())));
         return true;
     }
+
 }
diff --git a/src/main/java/simplexity/simpleplayerfreeze/placeholderapi/IsFrozenPlaceholder.java b/src/main/java/simplexity/simpleplayerfreeze/placeholderapi/IsFrozenPlaceholder.java
@@ -0,0 +1,45 @@
+package simplexity.simpleplayerfreeze.placeholderapi;
+
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import simplexity.simpleplayerfreeze.ConfigSettings;
+import simplexity.simpleplayerfreeze.SimplePlayerFreeze;
+import simplexity.simpleplayerfreeze.Util;
+
+public class IsFrozenPlaceholder extends PlaceholderExpansion {
+    @Override
+    public @NotNull String getIdentifier() {
+        return "spf";
+    }
+    
+    @Override
+    public @NotNull String getAuthor() {
+        return SimplePlayerFreeze.simplePlayerFreeze.getDescription().getAuthors().toString();
+    }
+    
+    @Override
+    public @NotNull String getVersion() {
+        return SimplePlayerFreeze.simplePlayerFreeze.getDescription().getVersion();
+    }
+    
+    @Override
+    public String onRequest(OfflinePlayer offlinePlayer, @NotNull String params) {
+        if (params.equalsIgnoreCase("frozen")) {
+            Player player = offlinePlayer.getPlayer();
+            if (player == null) {
+                return "Offline";
+            }
+            if (Util.isFrozen(player)) {
+                return ConfigSettings.placeholderAPIFormat;
+            }
+            if (!Util.isFrozen(player)) {
+                return "";
+            }
+            return "";
+        }
+        return null;
+    }
+
+}
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -26,8 +26,21 @@ prevent-hotbar-switch: true
 prevent-commands: true
 prevent-crafting: true
 whitelisted-commands:
+# !! NOTE !! If you do not have the minecraft commands blocked by permissions, it is strongly advised
+# Not to remove these from the whitelist due to chat signatures - if these commands are cancelled,
+# The player will be kicked for a missing public key.
+  - /minecraft:msg
+  - /minecraft:w
+  - /minecraft:t
+  - /minecraft:teammsg
+  - /minecraft:tm
   - /msg
+  - /w
+  - /t
+  - /teammsg
+  - /tm
   - /r
+placeholder-api-format: "<dark_gray>[Frozen]</dark_gray>"
 #-------------------- [Locale] --------------------
 prefix: "<green><bold>[</bold><yellow>SPF</yellow><bold>]</bold></green> "
 no-permission: "<red>You do not have permission to run this command!</red>"
diff --git a/src/main/resources/paper-plugin.yml b/src/main/resources/paper-plugin.yml
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -0,0 +1,40 @@
+name: SimplePlayerFreeze
+main: simplexity.simpleplayerfreeze.SimplePlayerFreeze
+version: '${project.version}'
+api-version: '1.20'
+author: 'Rhythmic'
+website: 'https://github.com/Simplexity-Development/SimplePlayerFreeze'
+softdepend:
+  - 'PlaceholderAPI'
+permissions:
+  spf.freeze:
+    description: 'Allows the player to freeze other players'
+  spf.unfreeze:
+    description: 'Allows the player to unfreeze other players'
+  spf.notify:
+    description: 'Notifies this player when a frozen player logs in'
+  spf.bypass:
+    description: 'Makes this player immune to being frozen'
+  spf.reload:
+    description: 'Allows this player to reload the configuration'
+  spf.chatspy:
+    description: 'Allows this player to to see muted messages from frozen players'
+commands:
+  freeze:
+    permission: 'spf.freeze'
+    description: 'Freeze a player or unfreeze a frozen player'
+    usage: '/freeze <player>'
+  unfreeze:
+    permission: 'spf.unfreeze'
+    description: 'Unfreeze a frozen player'
+    usage: '/unfreeze <player>'
+  freezespy:
+    permission: 'spf.chatspy'
+    description: "Toggle personal visibility for frozen player's messages"
+    usage: '/fspy'
+    alias: 'fspy'
+  freezereload:
+    permission: 'spf.reload'
+    description: 'Reload the configuration of the SPF plugin'
+    usage: '/spfreload'
+    alias: 'spfreload'
