Merge pull request #50 from ParallelMC/staging

New Update

Author: EBro912

api/build.gradle

@@ -7,7 +7,7 @@ plugins {
 
 group = 'org.parallelmc'
 
-version = '3.3.0'
+version = '3.4.0'
 description = 'A set of utilities and features for use on the Parallel Minecraft server'
 
 java {
@@ -214,6 +214,14 @@ bukkit {
             description = 'Reloads all emojis'
             usage = '/reloademojis'
         }
+        banword {
+            description = 'Adds a word to the banned words list'
+            usage = '/banword (word)'
+        }
+        allowword {
+            description = 'Remove a word from the banned words list'
+            usage = '/allowword (word)'
+        }
         leavetutorial {
             description = 'Exit the tutorial you are currently in'
             usage = '/leavetutorial'
@@ -269,6 +277,10 @@ bukkit {
             description = 'Gives access to giving ParallelItems.'
             setDefault('FALSE')
         }
+        'parallelutils.enchant' {
+            description = 'Gives access to using ParallelItems enchants'
+            setDefault('FALSE')
+        }
         'parallelutils.test' {
             description = 'Gives access to the test command'
             setDefault('FALSE')
@@ -285,6 +297,14 @@ bukkit {
             description = 'Gives access to fakejoin and fakeleave commands'
             setDefault('FALSE')
         }
+        'parallelutils.banword' {
+            description = 'Gives access to banword command'
+            setDefault('FALSE')
+        }
+        'parallelutils.allowword' {
+            description = 'Gives access to allowword command'
+            setDefault('FALSE')
+        }
         'parallelutils.staffchat' {
             description = 'Gives access to reading and writing to staff chat'
         }

api/src/main/java/parallelmc/parallelutils/Constants.java

@@ -2,7 +2,7 @@
 
 public class Constants {
 
-	public static final Version VERSION = new Version(3, 3, 0);
+	public static final Version VERSION = new Version(3, 4, 0);
 	public static final String PLUGIN_NAME = "ParallelUtils";
 	public static final String DEFAULT_WORLD = "world2";
 }

modules/src/main/java/parallelmc/parallelutils/modules/beehiveinspector/events/BeehiveBroken.java

@@ -3,6 +3,7 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.block.data.type.Beehive;
+import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -27,7 +28,9 @@ public void onBreakBlock(BlockBreakEvent event) {
         if (block.getType().equals(Material.BEEHIVE) || block.getType().equals(Material.BEE_NEST))
         {
             // if the block doesn't have any drops for some reason, then do nothing
-            if (block.getDrops().isEmpty())
+            Player player = event.getPlayer();
+            ItemStack heldItem = player.getInventory().getItemInMainHand();
+            if (block.getDrops(heldItem, player).isEmpty())
                 return;
 
             ParallelUtils.log(Level.INFO, "Dropping");
@@ -54,7 +57,7 @@ public void onBreakBlock(BlockBreakEvent event) {
 
             // more beautiful code
             // since a beehive usually only drops itself or nothing, we can hardcode this index
-            ItemStack item = (ItemStack)block.getDrops().toArray()[0];
+            ItemStack item = (ItemStack)block.getDrops(heldItem, player).toArray()[0];
             List<Component> lore = new ArrayList<>();
             // add the lore with the hive information
             lore.add(Component.text("Bees: " + bees, NamedTextColor.GRAY));

modules/src/main/java/parallelmc/parallelutils/modules/parallelchat/ParallelChat.java

@@ -64,7 +64,6 @@ public class ParallelChat extends ParallelModule {
 
     private final FileConfiguration bannedWordsConfig = new YamlConfiguration();
     public List<String> bannedWords = new ArrayList<>();
-    public List<String> allowedWords = new ArrayList<>();
 
     public List<Component> autoMessages = new ArrayList<>();
 
@@ -176,7 +175,6 @@ UUID        varchar(36) not null,
         }
 
         this.bannedWords = bannedWordsConfig.getStringList("Banned-Words");
-        this.allowedWords = bannedWordsConfig.getStringList("Whitelisted-Words");
         ParallelUtils.log(Level.INFO, "ParallelChat: Loaded " + bannedWords.size() + " banned words.");
 
         ConfigurationSection groups = puPlugin.getConfig().getConfigurationSection("group-formats");
@@ -223,8 +221,8 @@ UUID        varchar(36) not null,
 
 
         try {
-            this.chatLogWriter = Files.newBufferedWriter(Path.of(puPlugin.getDataFolder().getAbsolutePath() + "/chat_log.txt"), StandardCharsets.UTF_8, StandardOpenOption.WRITE);
-            this.cmdLogWriter = Files.newBufferedWriter(Path.of(puPlugin.getDataFolder().getAbsolutePath() + "/command_log.txt"), StandardCharsets.UTF_8, StandardOpenOption.WRITE);
+            this.chatLogWriter = Files.newBufferedWriter(Path.of(puPlugin.getDataFolder().getAbsolutePath() + "/chat_log.txt"), StandardCharsets.UTF_8, StandardOpenOption.CREATE, StandardOpenOption.WRITE);
+            this.cmdLogWriter = Files.newBufferedWriter(Path.of(puPlugin.getDataFolder().getAbsolutePath() + "/command_log.txt"), StandardCharsets.UTF_8, StandardOpenOption.CREATE, StandardOpenOption.WRITE);
         }
         catch (IOException e) {
             ParallelUtils.log(Level.SEVERE, "Failed to open writer to loggers!");
@@ -257,6 +255,8 @@ UUID        varchar(36) not null,
         puPlugin.getCommand("formats").setExecutor(new ParallelFormats());
         puPlugin.getCommand("dnd").setExecutor(new ParallelDoNotDisturb());
         puPlugin.getCommand("reloademojis").setExecutor(new ParallelReloadEmojis());
+        puPlugin.getCommand("banword").setExecutor(new ParallelBanWord());
+        puPlugin.getCommand("allowword").setExecutor(new ParallelAllowWord());
 
         this.chatroomCommands = new ChatroomCommands();
         puPlugin.getCommand("chatroom").setExecutor(chatroomCommands);
@@ -316,6 +316,15 @@ public void onDisable() {
 
         // save chatrooms
         chatRoomManager.saveChatroomsToFile();
+
+        // save banned words list in case any words were added or removed
+        bannedWordsConfig.set("Banned-Words", bannedWords);
+        try {
+            bannedWordsConfig.save(new File(puPlugin.getDataFolder(), "bannedwords.yml"));
+        } catch (IOException e) {
+            ParallelUtils.log(Level.SEVERE, "Failed to save banned words to file!");
+            e.printStackTrace();
+        }
     }
 
     @Override

modules/src/main/java/parallelmc/parallelutils/modules/parallelchat/commands/ParallelAllowWord.java

@@ -0,0 +1,30 @@
+package parallelmc.parallelutils.modules.parallelchat.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import parallelmc.parallelutils.modules.parallelchat.ParallelChat;
+
+public class ParallelAllowWord implements CommandExecutor {
+    @Override
+    public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String label, String[] args) {
+        if (args.length < 1) {
+            return false;
+        }
+        if (commandSender instanceof Player) {
+            if (!commandSender.hasPermission("parallelutils.allowword")) {
+                return true;
+            }
+        }
+        // since we allow the same words with different capitalization we don't have to use equalsIgnoreCase here
+        if (ParallelChat.get().bannedWords.stream().noneMatch(x -> x.equals(args[0]))) {
+            commandSender.sendMessage("The word '" + args[0] + "' is already allowed.");
+            return true;
+        }
+        ParallelChat.get().bannedWords.remove(args[0]);
+        commandSender.sendMessage("Removed '" + args[0] + "' from the banned words list.");
+        return true;
+    }
+}

modules/src/main/java/parallelmc/parallelutils/modules/parallelchat/commands/ParallelBanWord.java

@@ -0,0 +1,30 @@
+package parallelmc.parallelutils.modules.parallelchat.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import parallelmc.parallelutils.modules.parallelchat.ParallelChat;
+
+public class ParallelBanWord implements CommandExecutor {
+    @Override
+    public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String label, String[] args) {
+        if (args.length < 1) {
+            return false;
+        }
+        if (commandSender instanceof Player) {
+            if (!commandSender.hasPermission("parallelutils.banword")) {
+                return true;
+            }
+        }
+        // since we allow the same words with different capitalization we don't have to use equalsIgnoreCase here
+        if (ParallelChat.get().bannedWords.stream().anyMatch(x -> x.equals(args[0]))) {
+            commandSender.sendMessage("The banned words list already contains the word '" + args[0] + "'");
+            return true;
+        }
+        ParallelChat.get().bannedWords.add(args[0]);
+        commandSender.sendMessage("Added '" + args[0] + "' to the banned words list.");
+        return true;
+    }
+}

modules/src/main/java/parallelmc/parallelutils/modules/parallelchat/events/OnChatMessage.java

@@ -78,6 +78,9 @@ public void onChatMessage(AsyncChatEvent event) {
         catch (IOException e) {
             ParallelUtils.log(Level.SEVERE, "Failed to log chat message!");
         }
+        catch (NullPointerException e) {
+            ParallelUtils.log(Level.SEVERE, "Failed to log chat message! chatLogWriter was null!");
+        }
 
         // @ Mention check
         // have to use strings to figure out the player names

modules/src/main/java/parallelmc/parallelutils/modules/parallelchat/events/OnCommand.java

@@ -49,5 +49,8 @@ public void onCommand(PlayerCommandPreprocessEvent event) {
         catch (IOException e) {
             ParallelUtils.log(Level.SEVERE, "Failed to log command!");
         }
+        catch (NullPointerException e) {
+            ParallelUtils.log(Level.SEVERE, "Failed to log chat message! chatLogWriter was null!");
+        }
     }
 }