From f8fd481f4618fdd1939cf31697d6d453919eb648 Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Tue, 19 Mar 2019 14:33:23 +0100
Subject: [PATCH] Fixed restart cmd & added optional primitive support

I mean, the param is optional, not the support
Also sending broadcasts to the console unless MC is excluded
Also added toString() method to ConfigData
---
 ...igotmc_spigot_api_1_12_2_R0_1_SNAPSHOT.xml |  6 +++---
 .idea/misc.xml                                |  5 -----
 BuildConfigUpdater/BuildConfigUpdater.iml     |  1 +
 ...1) (com.github.TBMCPlugins.ButtonCore).iml |  2 +-
 .../restart/ScheduledRestartCommand.java      | 19 ++++++-------------
 .../lib/architecture/ConfigData.java          |  8 ++++++++
 .../java/buttondevteam/lib/chat/Command2.java | 10 +++++++++-
 .../buttondevteam/lib/chat/TBMCChatAPI.java   |  2 ++
 8 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/.idea/libraries/Maven__org_spigotmc_spigot_api_1_12_2_R0_1_SNAPSHOT.xml b/.idea/libraries/Maven__org_spigotmc_spigot_api_1_12_2_R0_1_SNAPSHOT.xml
index 42f0d6f..b6f88ae 100644
--- a/.idea/libraries/Maven__org_spigotmc_spigot_api_1_12_2_R0_1_SNAPSHOT.xml
+++ b/.idea/libraries/Maven__org_spigotmc_spigot_api_1_12_2_R0_1_SNAPSHOT.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/spigotmc/spigot-api/1.12.2-R0.1-SNAPSHOT/spigot-api-1.12.2-R0.1-20180712.012057-156.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/spigotmc/spigot-api/1.12.2-R0.1-SNAPSHOT/spigot-api-1.12.2-R0.1-SNAPSHOT.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/spigotmc/spigot-api/1.12.2-R0.1-SNAPSHOT/spigot-api-1.12.2-R0.1-20180712.012057-156-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/spigotmc/spigot-api/1.12.2-R0.1-SNAPSHOT/spigot-api-1.12.2-R0.1-SNAPSHOT-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/spigotmc/spigot-api/1.12.2-R0.1-SNAPSHOT/spigot-api-1.12.2-R0.1-20180712.012057-156-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/spigotmc/spigot-api/1.12.2-R0.1-SNAPSHOT/spigot-api-1.12.2-R0.1-SNAPSHOT-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6db2058..dd45459 100755
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <list size="1">
-      <item index="0" class="java.lang.String" itemvalue="org.bukkit.event.EventHandler" />
-    </list>
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/BuildConfigUpdater/BuildConfigUpdater.iml b/BuildConfigUpdater/BuildConfigUpdater.iml
index 274b3de..f14440c 100644
--- a/BuildConfigUpdater/BuildConfigUpdater.iml
+++ b/BuildConfigUpdater/BuildConfigUpdater.iml
@@ -12,6 +12,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="ButtonCore (1) (com.github.TBMCPlugins.ButtonCore)" />
+    <orderEntry type="module" module-name="ButtonCore (1) (com.github.TBMCPlugins.ButtonCore)" />
     <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.10" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
diff --git a/ButtonCore/ButtonCore (1) (com.github.TBMCPlugins.ButtonCore).iml b/ButtonCore/ButtonCore (1) (com.github.TBMCPlugins.ButtonCore).iml
index 7c2fa83..8580486 100644
--- a/ButtonCore/ButtonCore (1) (com.github.TBMCPlugins.ButtonCore).iml	
+++ b/ButtonCore/ButtonCore (1) (com.github.TBMCPlugins.ButtonCore).iml	
@@ -21,7 +21,7 @@
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.12-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: commons-io:commons-io:1.3.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.TBMCPlugins.ButtonCore:Towny:master-98b73aaac3-1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.TBMCPlugins.ButtonCore:Towny:master-b9ce3dc0e5-1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.milkbowl:VaultAPI:master-68f14eca20-1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.13.1-R0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
diff --git a/ButtonCore/src/main/java/buttondevteam/core/component/restart/ScheduledRestartCommand.java b/ButtonCore/src/main/java/buttondevteam/core/component/restart/ScheduledRestartCommand.java
index dabd48a..9b4002d 100755
--- a/ButtonCore/src/main/java/buttondevteam/core/component/restart/ScheduledRestartCommand.java
+++ b/ButtonCore/src/main/java/buttondevteam/core/component/restart/ScheduledRestartCommand.java
@@ -34,25 +34,18 @@ public class ScheduledRestartCommand extends ICommand2MC {
 	private final RestartComponent component;
 
 	@Command2.Subcommand
-	public boolean def(CommandSender sender, String alias, String[] args) {
-		int secs = 60;
-		try {
-			if (args.length > 0)
-				secs = Integer.parseInt(args[0]);
-		} catch (NumberFormatException e) {
-			sender.sendMessage("§cError: Seconds must be a number.");
-            return false;
-		}
-		if (secs < 10) {
+	public boolean def(CommandSender sender, @Command2.OptionalArg int seconds) {
+		if (seconds == 0) seconds = 60;
+		if (seconds < 10) {
 			sender.sendMessage("§cError: Seconds must be at least 10.");
 			return false;
 		}
-		final int restarttime = restartCounter = secs * 20;
-		restartbar = Bukkit.createBossBar("Server restart in " + secs + "s", BarColor.RED, BarStyle.SOLID,
+		final int restarttime = restartCounter = seconds * 20;
+		restartbar = Bukkit.createBossBar("Server restart in " + seconds + "s", BarColor.RED, BarStyle.SOLID,
 				BarFlag.DARKEN_SKY);
 		restartbar.setProgress(1);
         Bukkit.getOnlinePlayers().forEach(p -> restartbar.addPlayer(p));
-		sender.sendMessage("Scheduled restart in " + secs);
+		sender.sendMessage("Scheduled restart in " + seconds);
 		ScheduledServerRestartEvent e = new ScheduledServerRestartEvent(restarttime, this);
 		Bukkit.getPluginManager().callEvent(e);
 		restarttask = Bukkit.getScheduler().runTaskTimer(MainPlugin.Instance, () -> {
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/architecture/ConfigData.java b/ButtonCore/src/main/java/buttondevteam/lib/architecture/ConfigData.java
index 6374db0..83ce966 100644
--- a/ButtonCore/src/main/java/buttondevteam/lib/architecture/ConfigData.java
+++ b/ButtonCore/src/main/java/buttondevteam/lib/architecture/ConfigData.java
@@ -62,6 +62,14 @@ public class ConfigData<T> {
 		this.saveAction=saveAction;
 	}
 
+	@Override
+	public String toString() {
+		return "ConfigData{" +
+			"path='" + path + '\'' +
+			", value=" + value +
+			'}';
+	}
+
 	@SuppressWarnings("unchecked")
 	public T get() {
 		if (value != null) return value; //Speed things up
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/chat/Command2.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/Command2.java
index bc10fc7..2d8bda3 100644
--- a/ButtonCore/src/main/java/buttondevteam/lib/chat/Command2.java
+++ b/ButtonCore/src/main/java/buttondevteam/lib/chat/Command2.java
@@ -3,6 +3,8 @@ package buttondevteam.lib.chat;
 import buttondevteam.lib.TBMCCoreAPI;
 import buttondevteam.lib.ThorpeUtils;
 import buttondevteam.lib.player.ChromaGamerBase;
+import com.google.common.base.Defaults;
+import com.google.common.primitives.Primitives;
 import lombok.AllArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.var;
@@ -127,7 +129,13 @@ public abstract class Command2<TC extends ICommand2, TP extends Command2Sender>
 				pj = j + 1; //Start index
 				if (pj == commandline.length() + 1) { //No param given
 					if (paramArr[i1].isAnnotationPresent(OptionalArg.class)) {
-						params.add(null);
+						if (cl.isPrimitive())
+							params.add(Defaults.defaultValue(cl));
+						else if (Number.class.isAssignableFrom(cl)
+							|| Number.class.isAssignableFrom(cl))
+							params.add(Defaults.defaultValue(Primitives.unwrap(cl)));
+						else
+							params.add(null);
 						continue; //Fill the remaining params with nulls
 					} else {
 						sender.sendMessage(sd.helpText); //Required param missing
diff --git a/ButtonCore/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java
index 21f772e..f164d91 100755
--- a/ButtonCore/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java
+++ b/ButtonCore/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java
@@ -316,6 +316,8 @@ public class TBMCChatAPI {
 			throw new RuntimeException("Channel " + channel.DisplayName().get() + " not registered!");
 		if (!channel.Enabled().get())
 			return true; //Cancel sending
+		if (!Arrays.asList(exceptions).contains("Minecraft"))
+			Bukkit.getConsoleSender().sendMessage("[" + channel.DisplayName().get() + "] " + message);
 		TBMCSystemChatEvent event = new TBMCSystemChatEvent(channel, message, rtr.score, rtr.groupID, exceptions, target);
 		Bukkit.getPluginManager().callEvent(event);
 		return event.isCancelled();