diff --git a/BuildConfigUpdater/BuildConfigUpdater.iml b/BuildConfigUpdater/BuildConfigUpdater.iml
index 9cd800b..73696cd 100644
--- a/BuildConfigUpdater/BuildConfigUpdater.iml
+++ b/BuildConfigUpdater/BuildConfigUpdater.iml
@@ -12,8 +12,6 @@
-
-
diff --git a/BuildConfigUpdater/src/main/java/BCUMain.java b/BuildConfigUpdater/src/main/java/BCUMain.java
index 5780afa..bca7209 100644
--- a/BuildConfigUpdater/src/main/java/BCUMain.java
+++ b/BuildConfigUpdater/src/main/java/BCUMain.java
@@ -8,7 +8,7 @@ public class BCUMain {
System.out.println("Getting list of repositories...");
List plugins = PluginUpdater.GetPluginNames();
System.out.println("Removing non-Maven projects...");
- plugins.removeIf(plugin -> !PluginUpdater.isMaven(plugin, "master"));
+ plugins.removeIf(plugin -> PluginUpdater.isNotMaven(plugin, "master"));
System.out.println(plugins.stream().collect(Collectors.joining("\n")));
for (String plugin : plugins) { //TODO: We don't want to apply it all at once, especially to unused/unowned repos
} //TODO: Add it to ButtonCore - or actually as a plugin or ButtonProcessor
diff --git a/ButtonCore/src/main/java/buttondevteam/core/MainPlugin.java b/ButtonCore/src/main/java/buttondevteam/core/MainPlugin.java
index 0df0374..5e0f094 100755
--- a/ButtonCore/src/main/java/buttondevteam/core/MainPlugin.java
+++ b/ButtonCore/src/main/java/buttondevteam/core/MainPlugin.java
@@ -29,14 +29,13 @@ public class MainPlugin extends JavaPlugin {
public static boolean Test;
public static Essentials ess;
- private PluginDescriptionFile pdfFile;
private Logger logger;
@Override
public void onEnable() {
// Logs "Plugin Enabled", registers commands
Instance = this;
- pdfFile = getDescription();
+ PluginDescriptionFile pdf = getDescription();
logger = getLogger();
setupPermissions();
Test = getConfig().getBoolean("test", true);
@@ -66,7 +65,7 @@ public class MainPlugin extends JavaPlugin {
}
ess = Essentials.getPlugin(Essentials.class);
new RandomTP().onEnable(this); //It registers it's command
- logger.info(pdfFile.getName() + " has been Enabled (V." + pdfFile.getVersion() + ") Test: " + Test + ".");
+ logger.info(pdf.getName() + " has been Enabled (V." + pdf.getVersion() + ") Test: " + Test + ".");
}
@Override
diff --git a/ButtonCore/src/main/java/buttondevteam/core/PlayerListener.java b/ButtonCore/src/main/java/buttondevteam/core/PlayerListener.java
index 2bb22cc..c85ecea 100755
--- a/ButtonCore/src/main/java/buttondevteam/core/PlayerListener.java
+++ b/ButtonCore/src/main/java/buttondevteam/core/PlayerListener.java
@@ -53,7 +53,7 @@ public class PlayerListener implements Listener {
public void onSystemChat(TBMCSystemChatEvent event) {
if (event.isHandled())
return; // Only handle here if ButtonChat couldn't
- Bukkit.getOnlinePlayers().stream().filter(p -> event.shouldSendTo(p))
+ Bukkit.getOnlinePlayers().stream().filter(event::shouldSendTo)
.forEach(p -> p.sendMessage(event.getChannel().DisplayName.substring(0, 2) + event.getMessage()));
}
}
\ No newline at end of file
diff --git a/ButtonCore/src/main/java/buttondevteam/core/ScheduledRestartCommand.java b/ButtonCore/src/main/java/buttondevteam/core/ScheduledRestartCommand.java
index 987c244..d7ade35 100755
--- a/ButtonCore/src/main/java/buttondevteam/core/ScheduledRestartCommand.java
+++ b/ButtonCore/src/main/java/buttondevteam/core/ScheduledRestartCommand.java
@@ -24,6 +24,8 @@ public class ScheduledRestartCommand extends TBMCCommandBase {
if (args.length > 0)
ticks = Integer.parseInt(args[0]);
} catch (NumberFormatException e) {
+ sender.sendMessage("§cError: Ticks must be a number.");
+ return false;
}
if (ticks < 20) {
sender.sendMessage("§cError: Ticks must be more than 20.");
@@ -33,14 +35,14 @@ public class ScheduledRestartCommand extends TBMCCommandBase {
restartbar = Bukkit.createBossBar("Server restart in " + ticks / 20f, BarColor.RED, BarStyle.SOLID,
BarFlag.DARKEN_SKY);
restartbar.setProgress(1);
- Bukkit.getOnlinePlayers().stream().forEach(p -> restartbar.addPlayer(p));
+ Bukkit.getOnlinePlayers().forEach(p -> restartbar.addPlayer(p));
sender.sendMessage("Scheduled restart in " + ticks / 20f);
ScheduledServerRestartEvent e = new ScheduledServerRestartEvent(ticks);
Bukkit.getPluginManager().callEvent(e);
restarttask = Bukkit.getScheduler().runTaskTimer(MainPlugin.Instance, () -> {
if (restartcounter < 0) {
restarttask.cancel();
- restartbar.getPlayers().stream().forEach(p -> restartbar.removePlayer(p));
+ restartbar.getPlayers().forEach(p -> restartbar.removePlayer(p));
Bukkit.spigot().restart();
}
if (restartcounter % 200 == 0)
diff --git a/ButtonCore/src/main/java/buttondevteam/core/TestPrepare.java b/ButtonCore/src/main/java/buttondevteam/core/TestPrepare.java
index 981c702..5f89ad3 100755
--- a/ButtonCore/src/main/java/buttondevteam/core/TestPrepare.java
+++ b/ButtonCore/src/main/java/buttondevteam/core/TestPrepare.java
@@ -20,7 +20,7 @@ public class TestPrepare {
Bukkit.setServer(Mockito.mock(Server.class, new Answer