more stuff

RhythmicSys · RhythmicSys · commit e86427c88bb5 · 2023-11-20T18:46:58.000-08:00
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>simplexity</groupId>
     <artifactId>SimplePlayerFreeze</artifactId>
-    <version>0.0.1</version>
+    <version>0.0.2</version>
     <packaging>jar</packaging>
 
     <name>SimplePlayerFreeze</name>
diff --git a/src/main/java/simplexity/simpleplayerfreeze/SimplePlayerFreeze.java b/src/main/java/simplexity/simpleplayerfreeze/SimplePlayerFreeze.java
@@ -10,26 +10,24 @@
 import java.util.List;
 
 public final class SimplePlayerFreeze extends JavaPlugin {
-    
-    //Todo: Figure out how to make the server not freak out about the player floating
     public static Plugin simplePlayerFreeze;
     
     @Override
     public void onEnable() {
         simplePlayerFreeze = this;
+        //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")));
         registerListeners();
         this.saveDefaultConfig();
         this.reloadConfig();
         ConfigSettings.reloadConfigSettings();
-        // Plugin startup logic
-        
     }
-    
+    // Registers the Event Listeners for the events that will be blocked when someone is frozen
     private void registerListeners() {
         getServer().getPluginManager().registerEvents(new ChatListener(), this);
+        getServer().getPluginManager().registerEvents(new DropListener(), this);
         getServer().getPluginManager().registerEvents(new EXPPickupListener(), this);
         getServer().getPluginManager().registerEvents(new InteractListener(), this);
         getServer().getPluginManager().registerEvents(new InventoryListener(), this);
@@ -38,9 +36,4 @@ private void registerListeners() {
         getServer().getPluginManager().registerEvents(new PickupListener(), this);
         getServer().getPluginManager().registerEvents(new SwitchItemListener(), this);
     }
-    
-    @Override
-    public void onDisable() {
-        // Plugin shutdown logic
-    }
 }
diff --git a/src/main/java/simplexity/simpleplayerfreeze/Util.java b/src/main/java/simplexity/simpleplayerfreeze/Util.java
@@ -11,24 +11,18 @@ public class Util {
     public static MiniMessage miniMessage = MiniMessage.miniMessage();
     public static String namespace = "simpleplayerfreeze";
     public static NamespacedKey isFrozenKey = new NamespacedKey(namespace, "isfrozen");
+    public static NamespacedKey previouslyHadFlyPerms = new NamespacedKey(namespace, "previousflyperms");
     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 reloadPermission = new Permission("spf.reload");
     
-    public static void setFrozen(Player player) {
-        player.getPersistentDataContainer().set(Util.isFrozenKey, PersistentDataType.BOOLEAN, true);
-        player.setGlowing(true);
-        player.setWalkSpeed(0f);
-    }
     
-    public static void setUnfrozen(Player player) {
-        player.getPersistentDataContainer().set(Util.isFrozenKey, PersistentDataType.BOOLEAN, false);
-        player.setGlowing(false);
-        player.setWalkSpeed(0.2f);
-    }
+    
+    
     
     public static boolean isFrozen(Player player) {
         return player.getPersistentDataContainer().getOrDefault(isFrozenKey, PersistentDataType.BOOLEAN, Boolean.FALSE);
     }
+    
 }
diff --git a/src/main/java/simplexity/simpleplayerfreeze/commands/FreezePlayer.java b/src/main/java/simplexity/simpleplayerfreeze/commands/FreezePlayer.java
@@ -8,6 +8,7 @@
 import org.jetbrains.annotations.NotNull;
 import simplexity.simpleplayerfreeze.ConfigSettings;
 import simplexity.simpleplayerfreeze.Util;
+import simplexity.simpleplayerfreeze.freeze.FreezeFunctionality;
 
 import java.util.List;
 
@@ -37,16 +38,14 @@ public boolean execute(@NotNull CommandSender sender, @NotNull String s, @NotNul
             return false;
         
         } else if (Util.isFrozen(player)) {
-            Util.setUnfrozen(player);
+            FreezeFunctionality.setUnfrozen(player);
             sender.sendMessage(Util.miniMessage.deserialize(ConfigSettings.unfreezeMessage,
                     Placeholder.component("name", player.displayName())));
-            player.sendRichMessage(ConfigSettings.haveBeenUnfrozen);
             return true;
         } else {
-            Util.setFrozen(player);
+            FreezeFunctionality.setFrozen(player);
             sender.sendMessage(Util.miniMessage.deserialize(ConfigSettings.freezeMessage,
                     Placeholder.component("name", player.displayName())));
-            player.sendRichMessage(ConfigSettings.haveBeenFrozen);
         }
         return true;
     }
diff --git a/src/main/java/simplexity/simpleplayerfreeze/commands/UnfreezePlayer.java b/src/main/java/simplexity/simpleplayerfreeze/commands/UnfreezePlayer.java
@@ -8,6 +8,7 @@
 import org.jetbrains.annotations.NotNull;
 import simplexity.simpleplayerfreeze.ConfigSettings;
 import simplexity.simpleplayerfreeze.Util;
+import simplexity.simpleplayerfreeze.freeze.FreezeFunctionality;
 
 import java.util.List;
 
@@ -33,10 +34,9 @@ public boolean execute(@NotNull CommandSender sender, @NotNull String s, @NotNul
             sender.sendRichMessage(ConfigSettings.prefix + ConfigSettings.notFrozen);
             return true;
         }
-        Util.setUnfrozen(player);
+        FreezeFunctionality.setUnfrozen(player);
         sender.sendMessage(Util.miniMessage.deserialize(ConfigSettings.unfreezeMessage,
                 Placeholder.component("name", player.displayName())));
-        player.sendRichMessage(ConfigSettings.haveBeenUnfrozen);
         return true;
     }
 }
diff --git a/src/main/java/simplexity/simpleplayerfreeze/freeze/FreezeFunctionality.java b/src/main/java/simplexity/simpleplayerfreeze/freeze/FreezeFunctionality.java
@@ -0,0 +1,48 @@
+package simplexity.simpleplayerfreeze.freeze;
+
+import org.bukkit.entity.Player;
+import org.bukkit.persistence.PersistentDataType;
+import simplexity.simpleplayerfreeze.ConfigSettings;
+import simplexity.simpleplayerfreeze.Util;
+
+public class FreezeFunctionality {
+    
+    public static void setFrozen(Player player) {
+        player.getPersistentDataContainer().set(Util.isFrozenKey, PersistentDataType.BOOLEAN, true);
+        if (ConfigSettings.freezeFlight) {
+            setFlight(player);
+        }
+        if (ConfigSettings.freezeGlow) {
+            player.setGlowing(true);
+        }
+        if (ConfigSettings.freezeDismount){
+            player.eject();
+        }
+        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);
+        player.setGlowing(false);
+        player.setWalkSpeed(0.2f);
+        player.sendRichMessage(ConfigSettings.haveBeenUnfrozen);
+    }
+    
+    public static void setFlight(Player player) {
+        boolean hasAllowFlight = player.getAllowFlight();
+        if (hasAllowFlight) {
+            player.getPersistentDataContainer().set(Util.previouslyHadFlyPerms, PersistentDataType.BOOLEAN, true);
+        }
+        player.setAllowFlight(true);
+        player.setFlying(true);
+        player.setGravity(false);
+    }
+    
+    
+}
diff --git a/src/main/java/simplexity/simpleplayerfreeze/listeners/ChatListener.java b/src/main/java/simplexity/simpleplayerfreeze/listeners/ChatListener.java
@@ -12,7 +12,7 @@ public void onChat(AsyncChatEvent chatEvent) {
         if (!ConfigSettings.preventChat) return;
         if (Util.isFrozen(chatEvent.getPlayer())) {
             chatEvent.setCancelled(true);
-            chatEvent.getPlayer().sendMessage("You are frozen! You cannot chat!");
+            chatEvent.getPlayer().sendRichMessage(ConfigSettings.cannotChat);
         }
     }
 
diff --git a/src/main/java/simplexity/simpleplayerfreeze/listeners/DropListener.java b/src/main/java/simplexity/simpleplayerfreeze/listeners/DropListener.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.entity.EntityPickupItemEvent;
+import org.bukkit.event.player.PlayerDropItemEvent;
+import simplexity.simpleplayerfreeze.ConfigSettings;
+import simplexity.simpleplayerfreeze.Util;
+
+public class DropListener implements Listener {
+    @EventHandler
+    public void onPickup(PlayerDropItemEvent playerDropItemEvent){
+        if (!ConfigSettings.preventItemDrop) return;
+        if (Util.isFrozen(playerDropItemEvent.getPlayer())) {
+            playerDropItemEvent.setCancelled(true);
+        }
+    }
+
+}
diff --git a/src/main/java/simplexity/simpleplayerfreeze/listeners/InventoryListener.java b/src/main/java/simplexity/simpleplayerfreeze/listeners/InventoryListener.java
@@ -13,6 +13,7 @@ public void onInventoryOpen(InventoryOpenEvent inventoryOpenEvent) {
         if (!(inventoryOpenEvent.getPlayer() instanceof Player player)) return;
         if (Util.isFrozen(player)) {
             inventoryOpenEvent.setCancelled(true);
+            inventoryOpenEvent.getInventory().close();
         }
     }
 }
diff --git a/src/main/java/simplexity/simpleplayerfreeze/listeners/JoinListener.java b/src/main/java/simplexity/simpleplayerfreeze/listeners/JoinListener.java
@@ -1,20 +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.player.PlayerJoinEvent;
 import org.bukkit.persistence.PersistentDataType;
 import simplexity.simpleplayerfreeze.ConfigSettings;
 import simplexity.simpleplayerfreeze.Util;
+import simplexity.simpleplayerfreeze.freeze.FreezeFunctionality;
 
 public class JoinListener implements Listener {
     @EventHandler
     public void onJoin(PlayerJoinEvent joinEvent) {
-        if (!ConfigSettings.freezePersist) return;
-        if (!joinEvent.getPlayer().isOp()) {
-            joinEvent.getPlayer().getPersistentDataContainer().set(Util.isFrozenKey, PersistentDataType.BOOLEAN, Boolean.TRUE);
-            Util.setFrozen(joinEvent.getPlayer());
-            joinEvent.getPlayer().sendRichMessage(ConfigSettings.loginMessage);
+        Player player = joinEvent.getPlayer();
+        if (Util.isFrozen(player) && ConfigSettings.freezePersist) {
+            FreezeFunctionality.setFrozen(player);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`import org.jetbrains.annotations.NotNull;`
`9`	`9`	`import simplexity.simpleplayerfreeze.ConfigSettings;`
`10`	`10`	`import simplexity.simpleplayerfreeze.Util;`
	`11`	`+import simplexity.simpleplayerfreeze.freeze.FreezeFunctionality;`
`11`	`12`
`12`	`13`	`import java.util.List;`
`13`	`14`
`@@ -33,10 +34,9 @@ public boolean execute(@NotNull CommandSender sender, @NotNull String s, @NotNul`
`33`	`34`	`sender.sendRichMessage(ConfigSettings.prefix + ConfigSettings.notFrozen);`
`34`	`35`	`return true;`
`35`	`36`	`}`
`36`		`- Util.setUnfrozen(player);`
	`37`	`+ FreezeFunctionality.setUnfrozen(player);`
`37`	`38`	`sender.sendMessage(Util.miniMessage.deserialize(ConfigSettings.unfreezeMessage,`
`38`	`39`	`Placeholder.component("name", player.displayName())));`
`39`		`- player.sendRichMessage(ConfigSettings.haveBeenUnfrozen);`
`40`	`40`	`return true;`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public void onChat(AsyncChatEvent chatEvent) {`
`12`	`12`	`if (!ConfigSettings.preventChat) return;`
`13`	`13`	`if (Util.isFrozen(chatEvent.getPlayer())) {`
`14`	`14`	`chatEvent.setCancelled(true);`
`15`		`- chatEvent.getPlayer().sendMessage("You are frozen! You cannot chat!");`
	`15`	`+ chatEvent.getPlayer().sendRichMessage(ConfigSettings.cannotChat);`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ public void onInventoryOpen(InventoryOpenEvent inventoryOpenEvent) {`
`13`	`13`	`if (!(inventoryOpenEvent.getPlayer() instanceof Player player)) return;`
`14`	`14`	`if (Util.isFrozen(player)) {`
`15`	`15`	`inventoryOpenEvent.setCancelled(true);`
	`16`	`+ inventoryOpenEvent.getInventory().close();`
`16`	`17`	`}`
`17`	`18`	`}`
`18`	`19`	`}`