diff --git a/Assembly/dependency-reduced-pom.xml b/Assembly/dependency-reduced-pom.xml
index abaaaf0..a90e72c 100644
--- a/Assembly/dependency-reduced-pom.xml
+++ b/Assembly/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
AntiVPN
dev.brighten.antivpn
- 1.0.1
+ 1.1
4.0.0
Assembly
diff --git a/Assembly/pom.xml b/Assembly/pom.xml
index 1dda8d4..d72ebbe 100644
--- a/Assembly/pom.xml
+++ b/Assembly/pom.xml
@@ -5,7 +5,7 @@
AntiVPN
dev.brighten.antivpn
- 1.0.1
+ 1.1
4.0.0
diff --git a/Assembly/target/maven-archiver/pom.properties b/Assembly/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..beed817
--- /dev/null
+++ b/Assembly/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Thu Jun 17 12:27:13 EDT 2021
+version=1.1
+groupId=dev.brighten.antivpn
+artifactId=Assembly
diff --git a/Bukkit/dependency-reduced-pom.xml b/Bukkit/dependency-reduced-pom.xml
index 38351b1..a66e719 100644
--- a/Bukkit/dependency-reduced-pom.xml
+++ b/Bukkit/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
AntiVPN
dev.brighten.antivpn
- 1.0.1
+ 1.1
4.0.0
Bukkit
diff --git a/Bukkit/pom.xml b/Bukkit/pom.xml
index 8a3d44c..dc9f4bf 100644
--- a/Bukkit/pom.xml
+++ b/Bukkit/pom.xml
@@ -5,7 +5,7 @@
AntiVPN
dev.brighten.antivpn
- 1.0.1
+ 1.1
4.0.0
@@ -47,7 +47,7 @@
dev.brighten.antivpn
Common
- 1.0.1
+ 1.1
provided
diff --git a/Bukkit/src/main/java/dev/brighten/antivpn/bukkit/BukkitPlugin.java b/Bukkit/src/main/java/dev/brighten/antivpn/bukkit/BukkitPlugin.java
index dfe7fd9..9ec3235 100644
--- a/Bukkit/src/main/java/dev/brighten/antivpn/bukkit/BukkitPlugin.java
+++ b/Bukkit/src/main/java/dev/brighten/antivpn/bukkit/BukkitPlugin.java
@@ -3,15 +3,18 @@ package dev.brighten.antivpn.bukkit;
import dev.brighten.antivpn.AntiVPN;
import dev.brighten.antivpn.command.Command;
import net.md_5.bungee.api.ChatColor;
-import net.md_5.bungee.api.chat.ComponentBuilder;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
+import org.bukkit.command.SimpleCommandMap;
+import org.bukkit.plugin.SimplePluginManager;
import org.bukkit.plugin.java.JavaPlugin;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+
public class BukkitPlugin extends JavaPlugin {
public static BukkitPlugin pluginInstance;
+ private SimpleCommandMap commandMap;
public void onEnable() {
pluginInstance = this;
@@ -21,19 +24,34 @@ public class BukkitPlugin extends JavaPlugin {
AntiVPN.start(new BukkitConfig(), new BukkitListener(), new BukkitPlayerExecutor());
+ if (pluginInstance.getServer().getPluginManager() instanceof SimplePluginManager) {
+ SimplePluginManager manager = (SimplePluginManager) pluginInstance.getServer().getPluginManager();
+ try {
+ Field field = SimplePluginManager.class.getDeclaredField("commandMap");
+ field.setAccessible(true);
+ commandMap = (SimpleCommandMap) field.get(manager);
+ } catch (IllegalArgumentException | SecurityException | NoSuchFieldException | IllegalAccessException e) {
+ e.printStackTrace();
+ }
+ }
+
for (Command command : AntiVPN.getInstance().getCommands()) {
- getCommand(command.parent() + (command.parent().length() > 0 ? " " : "") + command.name())
- .setExecutor((sender, cmd, key, args) -> {
+ commandMap.register("antivpn", new org.bukkit.command.Command(command.name(),
+ command.description(), command.usage(), Arrays.asList(command.aliases())) {
+ @Override
+ public boolean execute(CommandSender sender, String s, String[] args) {
if(!sender.hasPermission("antivpn.command.*")
&& !sender.hasPermission(command.permission())) {
sender.sendMessage(ChatColor.RED + "No permission.");
return true;
}
- command.execute(new BukkitCommandExecutor(sender), args);
+ sender.sendMessage(ChatColor.translateAlternateColorCodes('&',
+ command.execute(new BukkitCommandExecutor(sender), args)));
- return true;
- });
+ return true;
+ }
+ });
}
}
diff --git a/Bukkit/target/classes/plugin.yml b/Bukkit/target/classes/plugin.yml
new file mode 100644
index 0000000..212759e
--- /dev/null
+++ b/Bukkit/target/classes/plugin.yml
@@ -0,0 +1,5 @@
+name: AntiVPN
+main: dev.brighten.antivpn.bukkit.BukkitPlugin
+version: 1.1
+author: funkemunky
+api-version: 1.13
diff --git a/Bungee/dependency-reduced-pom.xml b/Bungee/dependency-reduced-pom.xml
index a4320f7..117e54e 100644
--- a/Bungee/dependency-reduced-pom.xml
+++ b/Bungee/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
AntiVPN
dev.brighten.antivpn
- 1.0.1
+ 1.1
4.0.0
Bungee
diff --git a/Bungee/pom.xml b/Bungee/pom.xml
index a80ec00..3cb5565 100644
--- a/Bungee/pom.xml
+++ b/Bungee/pom.xml
@@ -5,7 +5,7 @@
AntiVPN
dev.brighten.antivpn
- 1.0.1
+ 1.1
4.0.0
@@ -41,7 +41,7 @@
dev.brighten.antivpn
Common
- 1.0.1
+ 1.1
provided
diff --git a/Bungee/target/classes/bungee.yml b/Bungee/target/classes/bungee.yml
new file mode 100644
index 0000000..f66342e
--- /dev/null
+++ b/Bungee/target/classes/bungee.yml
@@ -0,0 +1,5 @@
+name: AntiVPN
+main: dev.brighten.antivpn.bungee.BungeePlugin
+description: A simple and fast antivpn plugin.
+version: 1.1
+author: funkemunky
\ No newline at end of file
diff --git a/Common/pom.xml b/Common/pom.xml
index a9fbcfd..7b09f7c 100644
--- a/Common/pom.xml
+++ b/Common/pom.xml
@@ -5,7 +5,7 @@
AntiVPN
dev.brighten.antivpn
- 1.0.1
+ 1.1
4.0.0
diff --git a/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java b/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java
index af17653..b0f98ee 100644
--- a/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java
+++ b/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java
@@ -4,6 +4,8 @@ import dev.brighten.antivpn.api.PlayerExecutor;
import dev.brighten.antivpn.api.VPNConfig;
import dev.brighten.antivpn.api.VPNExecutor;
import dev.brighten.antivpn.command.Command;
+import dev.brighten.antivpn.command.impl.AntiVPNCommand;
+import dev.brighten.antivpn.command.impl.LookupCommand;
import dev.brighten.antivpn.utils.VPNResponse;
import dev.brighten.antivpn.utils.json.JSONException;
import dev.brighten.antivpn.utils.json.JSONObject;
@@ -39,7 +41,7 @@ public class AntiVPN {
INSTANCE.config.update();
//Registering commands
- registerCommands();
+ INSTANCE.registerCommands();
}
public void stop() {
@@ -61,7 +63,8 @@ public class AntiVPN {
return VPNResponse.fromJson(result);
}
- private static void registerCommands() {
-
+ private void registerCommands() {
+ commands.add(new AntiVPNCommand());
+ commands.add(new LookupCommand());
}
}
diff --git a/Common/src/main/java/dev/brighten/antivpn/command/Command.java b/Common/src/main/java/dev/brighten/antivpn/command/Command.java
index c60364b..0982140 100644
--- a/Common/src/main/java/dev/brighten/antivpn/command/Command.java
+++ b/Common/src/main/java/dev/brighten/antivpn/command/Command.java
@@ -4,12 +4,6 @@ import dev.brighten.antivpn.AntiVPN;
public abstract class Command {
- public Command() {
- for (Command child : children()) {
- AntiVPN.getInstance().getCommands().add(child);
- }
- }
-
public abstract String permission();
public abstract String name();
@@ -21,8 +15,6 @@ public abstract class Command {
public abstract String usage();
public abstract String parent();
-
- public abstract Command[] children();
public abstract String execute(CommandExecutor executor, String[] args);
}
diff --git a/Common/src/main/java/dev/brighten/antivpn/command/impl/AntiVPNCommand.java b/Common/src/main/java/dev/brighten/antivpn/command/impl/AntiVPNCommand.java
index 913c0e2..1e00622 100644
--- a/Common/src/main/java/dev/brighten/antivpn/command/impl/AntiVPNCommand.java
+++ b/Common/src/main/java/dev/brighten/antivpn/command/impl/AntiVPNCommand.java
@@ -1,5 +1,6 @@
package dev.brighten.antivpn.command.impl;
+import dev.brighten.antivpn.AntiVPN;
import dev.brighten.antivpn.command.Command;
import dev.brighten.antivpn.command.CommandExecutor;
import dev.brighten.antivpn.utils.StringUtil;
@@ -38,11 +39,6 @@ public class AntiVPNCommand extends Command {
return "";
}
- @Override
- public Command[] children() {
- return new Command[] {new LookupCommand()};
- }
-
@Override
public String execute(CommandExecutor uuid, String[] args) {
List messages = new ArrayList<>();
@@ -50,8 +46,7 @@ public class AntiVPNCommand extends Command {
messages.add(StringUtil.line("&8"));
messages.add("&6&lAntiVPN Help Page");
messages.add("");
- messages.add(String.format("&8/&f%s &8- &7&o%s", "antivpn", description()));
- for (Command child : children()) {
+ for (Command child : AntiVPN.getInstance().getCommands()) {
messages.add(String.format("&8/&f%s &8- &7&o%s", "&7antivpn &f" + child.name() + " &7" + child.usage(),
description()));
}
diff --git a/Common/src/main/java/dev/brighten/antivpn/command/impl/LookupCommand.java b/Common/src/main/java/dev/brighten/antivpn/command/impl/LookupCommand.java
index 9a2d75b..32f905f 100644
--- a/Common/src/main/java/dev/brighten/antivpn/command/impl/LookupCommand.java
+++ b/Common/src/main/java/dev/brighten/antivpn/command/impl/LookupCommand.java
@@ -39,11 +39,6 @@ public class LookupCommand extends Command {
return "antivpn";
}
- @Override
- public Command[] children() {
- return new Command[0];
- }
-
@Override
public String execute(CommandExecutor executor, String[] args) {
if(args.length == 0) {
diff --git a/Common/target/classes/config.yml b/Common/target/classes/config.yml
new file mode 100644
index 0000000..e69de29
diff --git a/Common/target/maven-archiver/pom.properties b/Common/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..ac92c1b
--- /dev/null
+++ b/Common/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Thu Jun 17 12:27:11 EDT 2021
+version=1.1
+groupId=dev.brighten.antivpn
+artifactId=Common
diff --git a/Common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/Common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000..a482232
--- /dev/null
+++ b/Common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,29 @@
+dev/brighten/antivpn/utils/json/CookieList.class
+dev/brighten/antivpn/api/VPNExecutor.class
+dev/brighten/antivpn/utils/json/XML.class
+dev/brighten/antivpn/utils/json/JSONWriter.class
+dev/brighten/antivpn/utils/json/JSONML.class
+dev/brighten/antivpn/api/PlayerExecutor.class
+dev/brighten/antivpn/utils/json/JSONObject$1.class
+dev/brighten/antivpn/utils/json/JSONException.class
+dev/brighten/antivpn/command/Command.class
+dev/brighten/antivpn/utils/json/HTTP.class
+dev/brighten/antivpn/utils/VPNResponse.class
+dev/brighten/antivpn/utils/StringUtil.class
+dev/brighten/antivpn/utils/json/HTTPTokener.class
+dev/brighten/antivpn/utils/json/JSONArray.class
+dev/brighten/antivpn/utils/json/XMLTokener.class
+dev/brighten/antivpn/api/APIPlayer.class
+dev/brighten/antivpn/command/CommandExecutor.class
+dev/brighten/antivpn/utils/json/CDL.class
+dev/brighten/antivpn/api/VPNConfig.class
+dev/brighten/antivpn/utils/json/JSONStringer.class
+dev/brighten/antivpn/command/impl/LookupCommand.class
+dev/brighten/antivpn/utils/json/JsonReader.class
+dev/brighten/antivpn/utils/json/JSONObject$Null.class
+dev/brighten/antivpn/AntiVPN.class
+dev/brighten/antivpn/utils/json/JSONString.class
+dev/brighten/antivpn/utils/json/JSONObject.class
+dev/brighten/antivpn/utils/json/JSONTokener.class
+dev/brighten/antivpn/utils/json/Cookie.class
+dev/brighten/antivpn/command/impl/AntiVPNCommand.class
diff --git a/Common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/Common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000..de618b9
--- /dev/null
+++ b/Common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,27 @@
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/utils/json/JSONML.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/api/APIPlayer.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/command/impl/LookupCommand.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/command/Command.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/utils/json/JsonReader.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/utils/json/JSONObject.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/utils/json/JSONArray.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/command/impl/AntiVPNCommand.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/utils/json/CDL.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/utils/json/JSONStringer.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/utils/json/JSONException.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/utils/StringUtil.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/api/VPNExecutor.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/utils/json/HTTPTokener.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/utils/json/HTTP.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/utils/json/XMLTokener.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/command/CommandExecutor.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/api/VPNConfig.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/utils/json/JSONString.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/utils/VPNResponse.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/utils/json/JSONWriter.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/utils/json/XML.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/utils/json/Cookie.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/utils/json/JSONTokener.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/api/PlayerExecutor.java
+/Users/dawson/Documents/GitHub/AntiVPN/Common/src/main/java/dev/brighten/antivpn/utils/json/CookieList.java