forgot to fix permissions

Author: RhythmicSys

README.md

@@ -5,8 +5,20 @@ A simple plugin that allows freezing and unfreezing players.
 ### Permissions:
 - spf.freeze:
   - Allows a user to freeze another
+- spf.freezeall
+  - Allows base usage of the `/freezeall` command
+- spf.freezeall.server
+  - Allows freezing the entire server
+- spf.freezeall.world
+  - Allows freezing/unfreezing all players in a world
 - spf.unfreeze:
   - Allows a user to unfreeze someone who is frozen
+- spf.unfreezeall
+  - Allows usage of the `/unfreezeall` command
+- spf.unfreezeall.server
+  - Allows unfreezing all the players in a server
+- spf.unfreezeall.world
+  - Allows unfreezing all the players in a world
 - spf.notify:
   - Notifies this user when a frozen player logs in
 - spf.bypass:
@@ -21,6 +33,10 @@ A simple plugin that allows freezing and unfreezing players.
   - Freezes a player, or unfreezes them if they are frozen
 - /unfreeze <player>
   - unfreezes a frozen player
+- /freezeall [world]
+  - Freezes all players in a world or server, not supplying a world will freeze the whole server
+- /unfreezeall [world]
+  - Unfreezes all players in a world or server, not supplying a world will unfreeze the whole server 
 - /spfreload 
   - Reloads the configuration
 - /fspy
@@ -48,8 +64,8 @@ freeze-invulnerability: true
 chat-behavior: 2
 # Should console spy on attempted messages in chat behavior 2?
 console-sees-muted-messages: true
-# Should console be notified when someone who is frozen logs in?
-console-freeze-login-notified: true
+# Should console receive the same notifications that those with the 'spf.notify' permission do?
+console-notify: true
 # Which things should be prevented when someone is frozen?
 prevent-movement: true
 prevent-walking: true
@@ -65,10 +81,13 @@ prevent-crafting: true
 prevent-inventory-interaction: true
 prevent-inventory-open: true #idk why blocking interact doesn't block this but here we are
 prevent-attacking: true
+# Configurations for the /freezeall command
+freeze-new-logins: true # if the server or world is frozen, should people who log in while it's frozen, also be frozen?
+freeze-world-change: true # if teleporting into a frozen world should the person be frozen
 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.
+  # !! 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
@@ -89,18 +108,23 @@ placeholder-api-format: "<dark_gray>[Frozen]</dark_gray>"
 prefix: "<green><bold>[</bold><yellow>SPF</yellow><bold>]</bold></green> "
 no-permission: "<red>You do not have permission to run this command!</red>"
 no-player: "<red>You did not provide a valid player, please check your spelling and try again</red>"
+world-not-found: "<red>The world <yellow><world></yellow> could not be found. Please check your spelling and try again</red>"
 freeze-message: "<green><name></green> <aqua>has been frozen</aqua>"
+freeze-server-message: "<aqua>The server has been frozen</aqua>"
+freeze-world-message: "<aqua>The <green><world></green> world has been frozen<aqua>"
+freeze-world-change: "<dark_gray><bold><name></bold></dark_gray> <gray>has switched to <world>. Since that world is frozen, they will now be frozen"
 unfreeze-message: "<green><name></green> <yellow>has been unfrozen</yellow>"
+unfreeze-world-message: "<yellow>The <green><world></green> world has been unfrozen</yellow>"
+unfreeze-server-message: "<yellow>The server has been frozen</yellow>"
 reload-message: "<gold>The Simple Player Freeze config has been reloaded</gold>"
 have-been-frozen: "<red><bold>[NOTICE]</bold></red> <gray>You have been frozen. You cannot move, interact, or chat"
 have-been-unfrozen: "<green><bold>[NOTICE]</bold></green> <gray>You have been unfrozen. You can move, interact, and chat again."
 cannot-chat: "You are frozen and cannot chat"
 cannot-use-command: "You are frozen and cannot use that command"
 login-message: "<red><bold>[NOTICE]</bold></red> <gray>You were frozen during a previous session. You cannot move, interact, or chat"
 login-notif: "<dark_gray><bold><name></bold></dark_gray> <gray>has logged in. They were frozen during a previous session."
+login-notif-server-frozen: "<dark_gray><bold><name></bold></dark_gray> <gray>has logged in. Since the server is currently frozen, they will now be frozen"
 login-notif-now-unfrozen: "<dark_gray><bold><name></bold></dark_gray> <gray>has logged in. They were frozen during a previous session. They will now be unfrozen."
-login-notif-console: "[Simple Freeze] <name> logged in while frozen"
-login-notif-console-unfreezing: "[Simple Freeze] <name> logged in while frozen- unfreezing."
 # <player> and <message> placeholders
 shadow-mute-format: "<dark_gray>[Frozen]</dark_gray> <gray><player>: <message></gray>"
 freeze-spy-enabled: "<green>Freeze Spy has been toggled <bold><yellow>On</yellow></bold>!</green>"

src/main/java/simplexity/simpleplayerfreeze/Util.java

@@ -29,9 +29,10 @@ public class Util {
     public static Permission freezeNotify = new Permission("spf.notify");
     public static Permission freezeChatSpy = new Permission("spf.chatspy");
     public static Permission reloadPermission = new Permission("spf.reload");
-    public static Permission freezeAllPermission = new Permission("spf.freezeall");
     public static Permission freezeWorldPermission = new Permission("spf.freezeall.world");
     public static Permission freezeServerPermission = new Permission("spf.freezeall.server");
+    public static Permission unfreezeWorldPermission = new Permission("spf.unfreezeall.world");
+    public static Permission unfreezeServerPermission = new Permission("spf.unfreezeall.server");
     public static HashMap<World, Boolean> worldFrozen = new HashMap<>();
     public static boolean serverFrozen = false;
 

src/main/java/simplexity/simpleplayerfreeze/commands/UnfreezeAll.java

@@ -30,7 +30,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
     @Override
     public @Nullable List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
         tabComplete.clear();
-        if (!sender.hasPermission(Util.freezeWorldPermission)) {
+        if (!sender.hasPermission(Util.unfreezeWorldPermission)) {
             return List.of("");
         }
         for (World world : Util.worldFrozen.keySet()) {
@@ -42,7 +42,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
     public boolean unfreezeWorld(CommandSender sender, String[] args) {
         String worldName;
         if (args.length == 0) return false;
-        if (!sender.hasPermission(Util.freezeWorldPermission)) {
+        if (!sender.hasPermission(Util.unfreezeWorldPermission)) {
             Util.sendErrorMessage(sender, LocaleHandler.getInstance().getNoPermission());
             return false;
         }
@@ -64,7 +64,7 @@ public boolean unfreezeWorld(CommandSender sender, String[] args) {
     }
 
     public void unfreezeServer(CommandSender sender) {
-        if (!sender.hasPermission(Util.freezeServerPermission)) {
+        if (!sender.hasPermission(Util.unfreezeServerPermission)) {
             Util.sendErrorMessage(sender, LocaleHandler.getInstance().getNoPermission());
             return;
         }

src/main/java/simplexity/simpleplayerfreeze/configs/LocaleHandler.java

@@ -17,8 +17,8 @@ public class LocaleHandler {
     private final Logger logger = SimplePlayerFreeze.getInstance().getLogger();
     private String prefix, cannotChat, cannotUseCommand, freezeMessage, unfreezeMessage, freezeServerMessage, freezeWorldMessage,
             reloadMessage, haveBeenFrozen, haveBeenUnfrozen, noPermission, noPlayer, loginMessage, loginNotif,
-            loginNotifNowUnfrozen, loginNotifConsole, loginNotifConsoleUnfreezing, cannotBeFrozen, notFrozen, shadowMuteFormat,
-            freezeSpyEnabled, freezeSpyDisabled, onlyPlayer, freezeWorldChange, loginNotifServerFrozen, tooManyArgs, worldNotFound,
+            loginNotifNowUnfrozen, cannotBeFrozen, notFrozen, shadowMuteFormat,
+            freezeSpyEnabled, freezeSpyDisabled, onlyPlayer, freezeWorldChange, loginNotifServerFrozen, worldNotFound,
             unfreezeWorldMessage, unfreezeServerMessage;
 
 
@@ -59,8 +59,6 @@ public void loadLocale() {
         loginMessage = localeConfig.getString("login-message", "<red><bold>[NOTICE]</bold></red> <gray>You were frozen during a previous session. You cannot move, interact, or chat");
         loginNotif = localeConfig.getString("login-notif", "<dark_gray><bold><name></bold></dark_gray> <gray>has logged in. They were frozen during a previous session.");
         loginNotifNowUnfrozen = localeConfig.getString("login-notif-now-unfrozen", "<dark_gray><bold><name></bold></dark_gray> <gray>has logged in. They were frozen during a previous session. They will now be unfrozen.");
-        loginNotifConsole = localeConfig.getString("login-notif-console", "[Simple Freeze] <name> logged in while frozen");
-        loginNotifConsoleUnfreezing = localeConfig.getString("login-notif-console-unfreezing", "[Simple Freeze] <name> logged in while frozen- unfreezing.");
         cannotBeFrozen = localeConfig.getString("cannot-be-frozen", "<red>That player cannot be frozen!</red>");
         notFrozen = localeConfig.getString("not-frozen", "<red>That player is not frozen!</red>");
         shadowMuteFormat = localeConfig.getString("shadow-mute-format", "<dark_gray>[Frozen]</dark_gray> <gray><player>: <message></gray>");
@@ -70,7 +68,6 @@ public void loadLocale() {
         freezeWorldChange = localeConfig.getString("freeze-world-change", "<dark_gray><bold><name></bold></dark_gray> <gray>has switched to <world>. Since that world is frozen, they will now be frozen");
         loginNotifServerFrozen = localeConfig.getString("login-notif-server-frozen", "<dark_gray><bold><name></bold></dark_gray> <gray>has logged in. Since the server is currently frozen, they will now be frozen");
         worldNotFound = localeConfig.getString("world-not-found", "<red>The world <yellow><name></yellow> could not be found. Please check your spelling and try again</red>");
-        tooManyArgs = localeConfig.getString("too-many-strings", "<red>You have provided too many arguments, please check your syntax and try again</red>");
         unfreezeWorldMessage = localeConfig.getString("unfreeze-world-message", "<yellow>The <green><world></green> world has been unfrozen</yellow>");
         unfreezeServerMessage = localeConfig.getString("unfreeze-server-message", "<yellow>The server has been frozen</yellow>");
     }
@@ -124,14 +121,6 @@ public String getLoginNotifNowUnfrozen() {
         return loginNotifNowUnfrozen;
     }
 
-    public String getLoginNotifConsole() {
-        return loginNotifConsole;
-    }
-
-    public String getLoginNotifConsoleUnfreezing() {
-        return loginNotifConsoleUnfreezing;
-    }
-
     public String getCannotBeFrozen() {
         return cannotBeFrozen;
     }
@@ -176,10 +165,6 @@ public String getLoginNotifServerFrozen() {
         return loginNotifServerFrozen;
     }
 
-    public String getTooManyArgs() {
-        return tooManyArgs;
-    }
-
     public String getWorldNotFound() {
         return worldNotFound;
     }

src/main/java/simplexity/simpleplayerfreeze/listeners/AttackListener.java

@@ -1,7 +1,6 @@
 package simplexity.simpleplayerfreeze.listeners;
 
 import io.papermc.paper.event.player.PrePlayerAttackEntityEvent;
-import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import simplexity.simpleplayerfreeze.Util;

src/main/resources/locale.yml

@@ -2,7 +2,6 @@
 prefix: "<green><bold>[</bold><yellow>SPF</yellow><bold>]</bold></green> "
 no-permission: "<red>You do not have permission to run this command!</red>"
 no-player: "<red>You did not provide a valid player, please check your spelling and try again</red>"
-too-many-args: "<red>You have provided too many arguments, please check your syntax and try again</red>"
 world-not-found: "<red>The world <yellow><world></yellow> could not be found. Please check your spelling and try again</red>"
 freeze-message: "<green><name></green> <aqua>has been frozen</aqua>"
 freeze-server-message: "<aqua>The server has been frozen</aqua>"
@@ -20,8 +19,6 @@ login-message: "<red><bold>[NOTICE]</bold></red> <gray>You were frozen during a
 login-notif: "<dark_gray><bold><name></bold></dark_gray> <gray>has logged in. They were frozen during a previous session."
 login-notif-server-frozen: "<dark_gray><bold><name></bold></dark_gray> <gray>has logged in. Since the server is currently frozen, they will now be frozen"
 login-notif-now-unfrozen: "<dark_gray><bold><name></bold></dark_gray> <gray>has logged in. They were frozen during a previous session. They will now be unfrozen."
-login-notif-console: "[Simple Freeze] <name> logged in while frozen"
-login-notif-console-unfreezing: "[Simple Freeze] <name> logged in while frozen- unfreezing."
 # <player> and <message> placeholders
 shadow-mute-format: "<dark_gray>[Frozen]</dark_gray> <gray><player>: <message></gray>"
 freeze-spy-enabled: "<green>Freeze Spy has been toggled <bold><yellow>On</yellow></bold>!</green>"