diff --git a/BuildConfigUpdater/BuildConfigUpdater.iml b/BuildConfigUpdater/BuildConfigUpdater.iml
index df2c815..cea34c4 100644
--- a/BuildConfigUpdater/BuildConfigUpdater.iml
+++ b/BuildConfigUpdater/BuildConfigUpdater.iml
@@ -12,6 +12,8 @@
+
+
diff --git a/ButtonCore/src/main/java/buttondevteam/core/component/randomtp/RandomTP.java b/ButtonCore/src/main/java/buttondevteam/core/component/randomtp/RandomTP.java
index a0612db..755a32a 100644
--- a/ButtonCore/src/main/java/buttondevteam/core/component/randomtp/RandomTP.java
+++ b/ButtonCore/src/main/java/buttondevteam/core/component/randomtp/RandomTP.java
@@ -53,11 +53,15 @@ public class RandomTP extends TBMCCommandBase
public void onEnable(Component component)
{
+ System.out.println("Adding command");
TBMCChatAPI.AddCommand(component, this);
+ System.out.println("Getting world");
world = Bukkit.getWorld("World");
+ System.out.println("Getting border");
border = world.getWorldBorder();
- newLocation();
+ System.out.println("Getting new location");
+ System.out.println("Success: "+newLocation()); //TODO: It takes 10-30 seconds to find a location (newLocation() was there)
}
/*================================================================================================*/
diff --git a/ButtonCore/src/main/java/buttondevteam/core/component/restart/RestartComponent.java b/ButtonCore/src/main/java/buttondevteam/core/component/restart/RestartComponent.java
index 6b431bb..d0104a0 100644
--- a/ButtonCore/src/main/java/buttondevteam/core/component/restart/RestartComponent.java
+++ b/ButtonCore/src/main/java/buttondevteam/core/component/restart/RestartComponent.java
@@ -19,7 +19,6 @@ import org.bukkit.event.player.PlayerQuitEvent;
public class RestartComponent extends Component implements Listener {
@Override
public void enable() {
- //TODO: Permissions for the commands
registerCommand(new ScheduledRestartCommand(this));
TBMCChatAPI.AddCommand(this, new PrimeRestartCommand(this));
registerListener(this);
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/architecture/Component.java b/ButtonCore/src/main/java/buttondevteam/lib/architecture/Component.java
index b98466b..a39db67 100644
--- a/ButtonCore/src/main/java/buttondevteam/lib/architecture/Component.java
+++ b/ButtonCore/src/main/java/buttondevteam/lib/architecture/Component.java
@@ -131,10 +131,15 @@ public abstract class Component {
throw new UnregisteredComponentException(component);
if (component.enabled == enabled) return; //Don't do anything
if (component.enabled = enabled) {
+ //System.out.println("Updating config for "+component.getClassName());
updateConfig(component.getPlugin(), component);
+ //System.out.println("Enabling "+component.getClassName());
component.enable();
- if (ButtonPlugin.configGenAllowed(component))
+ if (ButtonPlugin.configGenAllowed(component)) {
+ //System.out.println("Pregenning config for "+component.getClassName());
IHaveConfig.pregenConfig(component, null);
+ }
+ //System.out.println("Done enabling "+component.getClassName());
} else {
component.disable();
component.plugin.saveConfig();
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/chat/Command2.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/Command2.java
index d2851fe..1e75596 100644
--- a/ButtonCore/src/main/java/buttondevteam/lib/chat/Command2.java
+++ b/ButtonCore/src/main/java/buttondevteam/lib/chat/Command2.java
@@ -126,91 +126,106 @@ public abstract class Command2
paramConverters.put(cl, new ParamConverter<>(converter, errormsg));
}
- public boolean handleCommand(TP sender, String commandline) throws Exception {
+ public boolean handleCommand(TP sender, String commandline) {
for (int i = commandline.length(); i != -1; i = commandline.lastIndexOf(' ', i - 1)) {
String subcommand = commandline.substring(0, i).toLowerCase();
SubcommandData sd = subcommands.get(subcommand); //O(1)
if (sd == null) continue;
- if (sd.method == null || sd.command == null) { //Main command not registered, but we have subcommands
- sender.sendMessage(sd.helpText);
- return true;
- }
- if (!hasPermission(sender, sd.command, sd.method)) {
- sender.sendMessage("§cYou don't have permission to use this command");
- return true;
- }
- val params = new ArrayList