2.0.0-beta.3

+ Added MannyLama's patch #9 + Added option for whitelisting players * Fixed the license * Fixed the default messages for disabled.yml * Added small README.md which I need to change
TreyRuffy · Jun 13, 2020 · f2db000 · f2db000
1 parent 63298ed
commit f2db000
Show file tree

Hide file tree

Showing 10 changed files with 130 additions and 649 deletions.
diff --git a/Command Blocker Legacy/license.md → COPYING b/Command Blocker Legacy/license.md → COPYING
@@ -1,10 +1,7 @@
-	Command Blocker
-	Copyright (C) 2016-2020  TreyRuffy
-
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -620,3 +617,58 @@ reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/Command Blocker Legacy/dependency-reduced-pom.xml b/Command Blocker Legacy/dependency-reduced-pom.xml
@@ -7,6 +7,12 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>CommandBlockerLegacy</artifactId>
+  <licenses>
+    <license>
+      <name>GPLv3</name>
+      <url>http://www.gnu.org/copyleft/gpl.html</url>
+    </license>
+  </licenses>
   <build>
     <sourceDirectory>src</sourceDirectory>
     <resources>

diff --git a/Command Blocker Legacy/pom.xml b/Command Blocker Legacy/pom.xml
@@ -9,6 +9,13 @@
     <relativePath>../pom.xml</relativePath>
   </parent>
 
+  <licenses>
+    <license>
+      <name>GPLv3</name>
+      <url>http://www.gnu.org/copyleft/gpl.html</url>
+    </license>
+  </licenses>
+
   <artifactId>CommandBlockerLegacy</artifactId>
 
   <build>

diff --git a/Command Blocker/dependency-reduced-pom.xml b/Command Blocker/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>CommandBlockerMain</artifactId>
     <groupId>me.treyruffy.commandblocker</groupId>
-    <version>1.0.0</version>
+    <version>2.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>CommandBlocker</artifactId>
@@ -168,10 +168,16 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>me.treyruffy.commandblockerlegacy</groupId>
+      <groupId>me.treyruffy.commandblocker</groupId>
       <artifactId>CommandBlockerLegacy</artifactId>
       <version>1.0.0</version>
       <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>gson</artifactId>
+          <groupId>com.google.code.gson</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jetbrains</groupId>
@@ -189,14 +195,14 @@
           <artifactId>commons-lang</artifactId>
           <groupId>commons-lang</groupId>
         </exclusion>
-        <exclusion>
-          <artifactId>gson</artifactId>
-          <groupId>com.google.code.gson</groupId>
-        </exclusion>
         <exclusion>
           <artifactId>snakeyaml</artifactId>
           <groupId>org.yaml</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>gson</artifactId>
+          <groupId>com.google.code.gson</groupId>
+        </exclusion>
         <exclusion>
           <artifactId>guava</artifactId>
           <groupId>com.google.guava</groupId>

diff --git a/Command Blocker/pom.xml b/Command Blocker/pom.xml
@@ -117,7 +117,7 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>me.treyruffy.commandblockerlegacy</groupId>
+            <groupId>me.treyruffy.commandblocker</groupId>
             <artifactId>CommandBlockerLegacy</artifactId>
             <version>1.0.0</version>
             <scope>provided</scope>

diff --git a/Command Blocker/src/me/treyruffy/commandblocker/bukkit/listeners/BukkitBlock.java b/Command Blocker/src/me/treyruffy/commandblocker/bukkit/listeners/BukkitBlock.java
@@ -40,7 +40,7 @@ private Boolean blocker(Player p, String[] args) {
 		for (String cmd : disabled.getConfigurationSection("DisabledCommands").getKeys(false)) {
 			String cmds = cmd.replace("%colon%", ":");
 			String[] cmdList = cmds.split(" ");
-			
+
 			if (args[0].equalsIgnoreCase("/" + cmdList[0])) {
 				if (args.length != 1) {
 					int i = 1, j = 0;
@@ -55,9 +55,13 @@ private Boolean blocker(Player p, String[] args) {
 						j = 1;
 					}
 				}
+				if (disabled.getStringList("DisabledCommands." + cmd + ".WhitelistedPlayers").contains(p.getUniqueId().toString())) {
+					return false;
+				}
+
 				String permission = cmd.replace(":", "").replace("%colon%", "").replace(" ", "");
 				FileConfiguration config = BukkitMain.oldConfig() ? OldConfigManager.getConfig() : ConfigManager.getConfig();
-				
+
 				if (disabled.getStringList("DisabledCommands." + cmd + ".Worlds").isEmpty()) {
 					List<String> a = new ArrayList<>();
 					a.add("all");
@@ -68,13 +72,13 @@ private Boolean blocker(Player p, String[] args) {
 						ConfigManager.saveConfig();
 					}
 				}
-				
+
 				if (!(disabled.getStringList("DisabledCommands." + cmd + ".Worlds").contains("all"))) {
 					if (!disabled.getStringList("DisabledCommands." + cmd + ".Worlds").contains(p.getWorld().getName())) {
 						return false;
 					}
 				}
-				
+
 				if ((disabled.getString("DisabledCommands." + cmd + ".Permission") == null) || (disabled.getString("DisabledCommands." + cmd + ".Permission").equalsIgnoreCase("default"))) {
 					if (p.hasPermission(config.getString("Default.Permission").replace("%command%", permission))) {
 						return false;
@@ -84,28 +88,31 @@ private Boolean blocker(Player p, String[] args) {
 						return false;
 					}
 				}
-				
+
 				if (!disabled.getString("DisabledCommands." + cmd + ".Message").replace(" ", "").equalsIgnoreCase("none")) {
 					String message;
 					if ((disabled.getString("DisabledCommands." + cmd + ".Message") == null) || (disabled.getString("DisabledCommands." + cmd + ".Message").equalsIgnoreCase("default"))) {
 						String msg = ChatColor.translateAlternateColorCodes('&', config.getString("Default.Message"));
-						
+
 						message = (BukkitMain.isPapiEnabled() ? PlaceholderAPI.setPlaceholders(p, Variables.translateVariables(msg, p)) : Variables.translateVariables(msg, p));
 					} else {
 						String msg = ChatColor.translateAlternateColorCodes('&', disabled.getString("DisabledCommands." + cmd + ".Message"));
-						
+
 						message = (BukkitMain.isPapiEnabled() ? PlaceholderAPI.setPlaceholders(p, Variables.translateVariables(msg, p)) : Variables.translateVariables(msg, p));
 					}
-					p.sendMessage(message);
+					// MannyLama's patch #9
+					if (message.length() != 0){
+						p.sendMessage(message);
+					}
 				}
-				
-				
+
+
 				if ((disabled.getStringList("DisabledCommands." + cmd + ".PlayerCommands").size() > 0) && (!disabled.getStringList("DisabledCommands." + cmd + ".PlayerCommands").contains("none"))) {
 					for (String s : disabled.getStringList("DisabledCommands." + cmd + ".PlayerCommands")) {
 						p.performCommand(Variables.translateVariables(s, p).replace("%command%", cmds));
 					}
 				}
-				
+
 				if (disabled.getStringList("DisabledCommands." + cmd + ".ConsoleCommands").size() > 0 && (!disabled.getStringList("DisabledCommands." + cmd + ".ConsoleCommands").contains("none"))) {
 					for (String s : disabled.getStringList("DisabledCommands." + cmd + ".ConsoleCommands")) {
 						Bukkit.dispatchCommand(Bukkit.getConsoleSender(), Variables.translateVariables(s, p).replace("%command%", cmds));
@@ -141,7 +148,11 @@ private Boolean opBlocker(Player p, String[] args) {
 						j = 1;
 					}
 				}
-
+
+				if (opDisabled.getStringList("DisabledOpCommands." + cmd + ".WhitelistedPlayers").contains(p.getUniqueId().toString())) {
+					return false;
+				}
+
 				FileConfiguration config = BukkitMain.oldConfig() ? OldConfigManager.getConfig() : ConfigManager.getConfig();
 
 				if (opDisabled.getStringList("DisabledOpCommands." + cmd + ".Worlds").isEmpty()) {
@@ -172,7 +183,10 @@ private Boolean opBlocker(Player p, String[] args) {
 
 						message = (BukkitMain.isPapiEnabled() ? PlaceholderAPI.setPlaceholders(p, Variables.translateVariables(msg, p)) : Variables.translateVariables(msg, p));
 					}
-					p.sendMessage(message);
+					// MannyLama's patch #9
+					if (message.length() != 0){
+						p.sendMessage(message);
+					}
 				}
 
 

diff --git a/Command Blocker/src/me/treyruffy/commandblocker/bungeecord/listeners/BungeeBlock.java b/Command Blocker/src/me/treyruffy/commandblocker/bungeecord/listeners/BungeeBlock.java
@@ -47,6 +47,11 @@ public void onCommand(ChatEvent e) {
 						}
 					}
 				}
+
+				if (disabled.getStringList("DisabledCommands." + command + ".WhitelistedPlayers").contains(p.getUniqueId().toString())) {
+					return;
+				}
+
 				if (!disabled.getStringList("DisabledCommands." + command + ".Servers").contains("all") || !(disabled.getSection("DisabledCommands").getSection(command).getString("Servers") == null)) {
 					if (!(disabled.getStringList("DisabledCommands." + command + ".Servers").contains(p.getServer().getInfo().getName()))) {
 						return;
@@ -75,8 +80,11 @@ public void onCommand(ChatEvent e) {
 
 						message = Variables.translateVariables(msg, p);
 					}
-
-					p.sendMessage(new TextComponent(message));
+
+					// MannyLama's patch #9
+					if (message.length() != 0) {
+						p.sendMessage(new TextComponent(message));
+					}
 				}
 
 				if ((disabled.getStringList("DisabledCommands." + command + ".PlayerCommands").size() > 0) && (!disabled.getStringList("DisabledCommands." + command + ".PlayerCommands").contains("none"))) {

diff --git a/README.md b/README.md
@@ -0,0 +1,3 @@
+#Command Blocker
+
+Allows you to block commands on both Bukkit/Spigot servers and BungeeCord servers.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#Command Blocker

		Allows you to block commands on both Bukkit/Spigot servers and BungeeCord servers.