Merge branch 'development' into development

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>me.totalfreedom</groupId>
     <artifactId>TotalFreedomMod</artifactId>
-    <version>2022.06</version>
+    <version>2022.06.1</version>
     <packaging>jar</packaging>
 
     <properties>

src/main/java/me/totalfreedom/totalfreedommod/blocking/InteractBlocker.java

@@ -171,6 +171,11 @@ public class InteractBlocker extends FreedomService
             }
             case WRITTEN_BOOK:
             {
+                if (ConfigEntry.ALLOW_BOOKS.getBoolean())
+                {
+                    break;
+                }
+
                 player.getInventory().clear(player.getInventory().getHeldItemSlot());
                 player.sendMessage(ChatColor.GRAY + "Books are currently disabled.");
                 event.setCancelled(true);

src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlocker.java

@@ -24,7 +24,7 @@ import org.bukkit.plugin.SimplePluginManager;
 
 public class CommandBlocker extends FreedomService
 {
-
+    private final Pattern whitespacePattern = Pattern.compile("^/?( +)(.*)?");
     private final Pattern flagPattern = Pattern.compile("(:([0-9]){5,})");
     //
     private final Map<String, CommandBlockerEntry> entryList = Maps.newHashMap();
@@ -156,6 +156,14 @@ public class CommandBlocker extends FreedomService
 
         // Format
         command = command.toLowerCase().trim();
+
+        // Whitespaces
+        Matcher whitespaceMatcher = whitespacePattern.matcher(command);
+        if (whitespaceMatcher.matches() && whitespaceMatcher.groupCount() == 2)
+        {
+            command = whitespaceMatcher.group(2);
+        }
+
         command = command.startsWith("/") ? command.substring(1) : command;
 
         // Check for plugin specific commands

src/main/java/me/totalfreedom/totalfreedommod/command/Command_toggle.java

@@ -19,7 +19,7 @@ public class Command_toggle extends FreedomCommand
     private final List<String> toggles = Arrays.asList(
             "waterplace", "fireplace", "lavaplace", "fluidspread", "lavadmg", "firespread", "frostwalk",
             "firework", "prelog", "lockdown", "petprotect", "entitywipe", "nonuke [range] [count]",
-            "explosives [radius]", "unsafeenchs", "bells", "armorstands", "masterblocks", "grindstones",
+            "explosives [radius]", "unsafeenchs", "bells", "armorstands", "masterblocks", "books", "grindstones",
             "jukeboxes", "spawners", "4chan", "beehives", "respawnanchors", "autotp", "autoclear", "minecarts", "mp44",
             "landmines", "tossmob", "gravity");
 
@@ -199,6 +199,12 @@ public class Command_toggle extends FreedomCommand
                 break;
             }
 
+            case "books":
+            {
+                toggle("Books are", ConfigEntry.ALLOW_BOOKS);
+                break;
+            }
+
             case "grindstones":
             {
                 toggle("Grindstones are", ConfigEntry.ALLOW_GRINDSTONES);

src/main/java/me/totalfreedom/totalfreedommod/config/ConfigEntry.java

@@ -34,6 +34,7 @@ public enum ConfigEntry
     AUTO_CLEAR(Boolean.class, "allow.auto_clear"),
     ALLOW_GRAVITY(Boolean.class, "allow.gravity"),
     ALLOW_MASTERBLOCKS(Boolean.class, "allow.masterblocks"),
+    ALLOW_BOOKS(Boolean.class, "allow.books"),
     //
     BLOCKED_CHATCODES(String.class, "blocked_chatcodes"),
     //

src/main/resources/config.yml

@@ -220,6 +220,7 @@ allow:
   auto_clear: false
   gravity: false
   masterblocks: false
+  books: true
 
 blocked_commands:
   #