Decently functional now

Author: RhythmicSys

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>simplexity</groupId>
     <artifactId>SimplePlayerFreeze</artifactId>
-    <version>0.0.2</version>
+    <version>0.0.3</version>
     <packaging>jar</packaging>
 
     <name>SimplePlayerFreeze</name>

src/main/java/simplexity/simpleplayerfreeze/ConfigSettings.java

@@ -1,13 +1,16 @@
 package simplexity.simpleplayerfreeze;
 
 import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.plugin.PluginManager;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class ConfigSettings {
 
     public static String prefix = "";
     public static String commandErrorMessage = "";
     public static String cannotChat = "";
+    public static String cannotUseCommand = "";
     public static String freezeMessage = "";
     public static String unfreezeMessage = "";
     public static String reloadMessage = "";
@@ -23,18 +26,31 @@ public class ConfigSettings {
     public static boolean freezeGlow;
     public static boolean freezeDismount;
     public static boolean freezeFlight;
+    public static boolean freezeInvulnerability;
     public static boolean preventMovement;
     public static boolean preventInteract;
+    public static boolean preventCrafting;
     public static boolean preventChat;
     public static boolean preventXPPickup;
     public static boolean preventItemPickup;
     public static boolean preventItemDrop;
+    public static boolean preventItemUse;
     public static boolean preventHotbarSwitch;
-    public static void reloadMessages() {
+    public static boolean preventInventoryInteraction;
+    public static boolean preventCommands;
+    public static ArrayList<String> whitelistedCommandList = new ArrayList<>();
+    
+    public static void reloadConfigSettings(){
+        reloadConfigBooleans();
+        reloadMessages();
+        reloadConfigCommands();
+    }
+    private static void reloadMessages() {
         FileConfiguration config = SimplePlayerFreeze.simplePlayerFreeze.getConfig();
         prefix = config.getString("prefix");
         commandErrorMessage = config.getString("command-error-message");
         cannotChat = config.getString("cannot-chat");
+        cannotUseCommand = config.getString("cannot-use-command");
         freezeMessage = config.getString("freeze-message");
         unfreezeMessage = config.getString("unfreeze-message");
         reloadMessage = config.getString("reload-message");
@@ -46,21 +62,32 @@ public static void reloadMessages() {
         loginNotif = config.getString("login-notif");
         cannotBeFrozen = config.getString("cannot-be-frozen");
         notFrozen = config.getString("not-frozen");
+        preventCommands = config.getBoolean("prevent-commands");
     }
 
-    public static void reloadConfigSettings(){
+    private static void reloadConfigBooleans() {
         FileConfiguration config = SimplePlayerFreeze.simplePlayerFreeze.getConfig();
         freezePersist = config.getBoolean("freeze-persist");
         freezeGlow = config.getBoolean("freeze-glow");
         freezeDismount = config.getBoolean("freeze-dismount");
         freezeFlight = config.getBoolean("freeze-flight");
+        freezeInvulnerability = config.getBoolean("freeze-invulnerability");
         preventMovement = config.getBoolean("prevent-movement");
         preventInteract = config.getBoolean("prevent-interact");
+        preventCrafting = config.getBoolean("prevent-crafting");
         preventChat = config.getBoolean("prevent-chat");
         preventXPPickup = config.getBoolean("prevent-xp-pickup");
         preventItemPickup = config.getBoolean("prevent-item-pickup");
         preventItemDrop = config.getBoolean("prevent-item-drop");
+        preventItemUse = config.getBoolean("prevent-item-use");
         preventHotbarSwitch = config.getBoolean("prevent-hotbar-switch");
-        reloadMessages();
+        preventInventoryInteraction = config.getBoolean("prevent-inventory-interaction");
+    }
+    
+    private static void reloadConfigCommands() {
+        FileConfiguration config = SimplePlayerFreeze.simplePlayerFreeze.getConfig();
+        whitelistedCommandList.clear();
+        List<String> commandList = config.getStringList("whitelisted-commands");
+        whitelistedCommandList.addAll(commandList);
     }
 }

src/main/java/simplexity/simpleplayerfreeze/SimplePlayerFreeze.java

@@ -30,10 +30,13 @@ private void registerListeners() {
         getServer().getPluginManager().registerEvents(new DropListener(), this);
         getServer().getPluginManager().registerEvents(new EXPPickupListener(), this);
         getServer().getPluginManager().registerEvents(new InteractListener(), this);
-        getServer().getPluginManager().registerEvents(new InventoryListener(), this);
+        getServer().getPluginManager().registerEvents(new CraftingListener(), this);
+        getServer().getPluginManager().registerEvents(new LeaveListener(), this);
         getServer().getPluginManager().registerEvents(new JoinListener(), this);
         getServer().getPluginManager().registerEvents(new MoveListener(), this);
         getServer().getPluginManager().registerEvents(new PickupListener(), this);
         getServer().getPluginManager().registerEvents(new SwitchItemListener(), this);
+        getServer().getPluginManager().registerEvents(new ItemConsumeListener(), this);
+        getServer().getPluginManager().registerEvents(new CommandListener(), this);
     }
 }

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

@@ -15,14 +15,15 @@ public class Util {
     public static Permission freezePermission = new Permission("spf.freeze");
     public static Permission unfreezePermission = new Permission("spf.unfreeze");
     public static Permission freezeBypassPermission = new Permission("spf.bypass");
+    public static Permission freezeNotify = new Permission("spf.notify");
     public static Permission reloadPermission = new Permission("spf.reload");
 
 
 
 
 
     public static boolean isFrozen(Player player) {
-        return player.getPersistentDataContainer().getOrDefault(isFrozenKey, PersistentDataType.BOOLEAN, Boolean.FALSE);
+        return player.getPersistentDataContainer().getOrDefault(isFrozenKey, PersistentDataType.BOOLEAN, false);
     }
 
 }

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

@@ -13,7 +13,8 @@
 import java.util.List;
 
 public class FreezePlayer extends Command {
-    //
+    
+    // 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);
     }
@@ -36,15 +37,15 @@ public boolean execute(@NotNull CommandSender sender, @NotNull String s, @NotNul
         } else if (player.hasPermission(Util.freezeBypassPermission)) {
             sender.sendRichMessage(ConfigSettings.prefix + ConfigSettings.cannotBeFrozen);
             return false;
-        
+            
         } else if (Util.isFrozen(player)) {
             FreezeFunctionality.setUnfrozen(player);
-            sender.sendMessage(Util.miniMessage.deserialize(ConfigSettings.unfreezeMessage,
+            sender.sendMessage(Util.miniMessage.deserialize((ConfigSettings.prefix + ConfigSettings.unfreezeMessage),
                     Placeholder.component("name", player.displayName())));
             return true;
         } else {
             FreezeFunctionality.setFrozen(player);
-            sender.sendMessage(Util.miniMessage.deserialize(ConfigSettings.freezeMessage,
+            sender.sendMessage(Util.miniMessage.deserialize((ConfigSettings.prefix + ConfigSettings.freezeMessage),
                     Placeholder.component("name", player.displayName())));
         }
         return true;

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

@@ -11,6 +11,7 @@
 
 public class ReloadConfig extends Command {
 
+    // Reloads the configuration
 
     public ReloadConfig(@NotNull String name, @NotNull String description, @NotNull String usageMessage, @NotNull List<String> aliases) {
         super(name, description, usageMessage, aliases);

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

@@ -14,6 +14,8 @@
 
 public class UnfreezePlayer extends Command {
 
+    // Unfreezes a frozen player
+    
     public UnfreezePlayer(@NotNull String name, @NotNull String description, @NotNull String usageMessage, @NotNull List<String> aliases) {
         super(name, description, usageMessage, aliases);
     }
@@ -35,7 +37,7 @@ public boolean execute(@NotNull CommandSender sender, @NotNull String s, @NotNul
             return true;
         }
         FreezeFunctionality.setUnfrozen(player);
-        sender.sendMessage(Util.miniMessage.deserialize(ConfigSettings.unfreezeMessage,
+        sender.sendMessage(Util.miniMessage.deserialize((ConfigSettings.prefix + ConfigSettings.unfreezeMessage),
                 Placeholder.component("name", player.displayName())));
         return true;
     }

src/main/java/simplexity/simpleplayerfreeze/freeze/FreezeFunctionality.java

@@ -10,31 +10,31 @@ public class FreezeFunctionality {
     public static void setFrozen(Player player) {
         player.getPersistentDataContainer().set(Util.isFrozenKey, PersistentDataType.BOOLEAN, true);
         if (ConfigSettings.freezeFlight) {
-            setFlight(player);
+            enableFlight(player);
         }
         if (ConfigSettings.freezeGlow) {
             player.setGlowing(true);
         }
-        if (ConfigSettings.freezeDismount){
-            player.eject();
+        if (ConfigSettings.freezeDismount && player.isInsideVehicle()) {
+            player.leaveVehicle();
+        }
+        if (ConfigSettings.freezeInvulnerability) {
+            player.setInvulnerable(true);
         }
         player.setWalkSpeed(0f);
         player.sendRichMessage(ConfigSettings.haveBeenFrozen);
     }
 
     public static void setUnfrozen(Player player) {
         player.getPersistentDataContainer().set(Util.isFrozenKey, PersistentDataType.BOOLEAN, false);
-        if (!player.getPersistentDataContainer().getOrDefault(Util.previouslyHadFlyPerms, PersistentDataType.BOOLEAN, false)) {
-            player.setAllowFlight(false);
-        }
-        player.setFlying(false);
-        player.setGravity(true);
+        removeFlight(player);
+        player.setInvulnerable(false);
         player.setGlowing(false);
         player.setWalkSpeed(0.2f);
         player.sendRichMessage(ConfigSettings.haveBeenUnfrozen);
     }
 
-    public static void setFlight(Player player) {
+    public static void enableFlight(Player player) {
         boolean hasAllowFlight = player.getAllowFlight();
         if (hasAllowFlight) {
             player.getPersistentDataContainer().set(Util.previouslyHadFlyPerms, PersistentDataType.BOOLEAN, true);
@@ -44,5 +44,15 @@ public static void setFlight(Player player) {
         player.setGravity(false);
     }
 
+    public static void removeFlight(Player player) {
+        if (!player.getPersistentDataContainer().getOrDefault(Util.previouslyHadFlyPerms, PersistentDataType.BOOLEAN, false)) {
+            player.setAllowFlight(false);
+        }
+        player.getPersistentDataContainer().remove(Util.previouslyHadFlyPerms);
+        player.setFlying(false);
+        player.setInvulnerable(false);
+        player.setGravity(true);
+    }
+    
 
 }

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

@@ -0,0 +1,23 @@
+package simplexity.simpleplayerfreeze.listeners;
+
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import simplexity.simpleplayerfreeze.ConfigSettings;
+import simplexity.simpleplayerfreeze.Util;
+
+public class CommandListener implements Listener {
+    
+    @EventHandler
+    public void onCommand(PlayerCommandPreprocessEvent commandEvent) {
+        if (!ConfigSettings.preventCommands) return;
+        if (!Util.isFrozen(commandEvent.getPlayer())) return;
+        String command = commandEvent.getMessage().split(" ")[0];
+        if (!ConfigSettings.whitelistedCommandList.contains(command)) {
+            commandEvent.getPlayer().sendRichMessage(ConfigSettings.cannotUseCommand);
+            commandEvent.setCancelled(true);
+        }
+    }
+
+}

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

@@ -0,0 +1,20 @@
+package simplexity.simpleplayerfreeze.listeners;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.CraftItemEvent;
+import simplexity.simpleplayerfreeze.ConfigSettings;
+import simplexity.simpleplayerfreeze.Util;
+
+public class CraftingListener implements Listener {
+    
+    @EventHandler
+    public void onCraft(CraftItemEvent craftEvent) {
+        if (!ConfigSettings.preventCrafting) return;
+        if (Util.isFrozen((Player) craftEvent.getWhoClicked())) {
+            craftEvent.setCancelled(true);
+        }
+    }
+    
+}