1.0 update

Author: BuildTools

build.gradle

@@ -7,7 +7,7 @@ plugins {
 }
 
 group 'codedcosmos'
-version '0.1'
+version '1.0'
 mainClassName = 'codedcosmos.enderbot.core.EnderBot'
 
 sourceCompatibility = 1.8
@@ -18,7 +18,14 @@ repositories {
     mavenCentral()
     jcenter()
     maven {
-        url "https://hub.spigotmc.org/nexus/content/repositories/snapshots"
+        url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'
+
+        // As of Gradle 5.1, you can limit this to only those
+        // dependencies you expect from it
+        content {
+            includeGroup 'org.bukkit'
+            includeGroup 'org.spigotmc'
+        }
     }
 }
 
@@ -36,7 +43,7 @@ dependencies {
     compile 'com.google.oauth-client:google-oauth-client-jetty:1.23.0'
     compile 'com.google.apis:google-api-services-drive:v3-rev110-1.23.0'
 
-    compileOnly "org.spigotmc:spigot-api:1.15.1-R0.1-SNAPSHOT"
+    compileOnly 'org.spigotmc:spigot:1.15.2-R0.1-SNAPSHOT'
 }
 
 jar {

res/plugin.yml

@@ -1,5 +1,10 @@
 name: EnderBot
-version: 0.1
+version: 1.0
 author: codedcosmos
 main: codedcosmos.enderbot.plugin.MinecraftPlugin
-api-version: 1.15
+api-version: 1.15
+
+commands:
+  enderbackup:
+    description: Backs up the world and uploads zip
+    usage: /enderbackup

src/codedcosmos/enderbot/core/ConfigManager.java

@@ -34,6 +34,7 @@ public class ConfigManager {
 	public static String minecraft_ingame_channel_name;
 	public static String world_backups_channel_name;
 	public static int world_backups_frequency_in_days;
+	public static boolean world_backups_enabled;
 
 	// Censored Config values
 	public static String discord_bot_token;
@@ -49,6 +50,9 @@ public static HashMap<String, String> getDefault() {
 
 		// How often the world will be backed up (in days)
 		defaults.put("world-backups-frequency-in-days", "30");
+		
+		// Defines if the game will be backed up at all
+		defaults.put("world-backups-enabled", "False");
 
 
 		// Discord Developer API bot token
@@ -122,6 +126,15 @@ public static void load() {
 				world_backups_frequency_in_days = 30;
 			}
 			Log.print("Loaded 'world-backups-frequency-in-days' as " + world_backups_frequency_in_days);
+			
+			try {
+				world_backups_enabled = Boolean.parseBoolean(prop.getProperty("world-backups-enabled").toLowerCase());
+			} catch (NumberFormatException e) {
+				Log.printErr("Failed to load config 'world-backups-frequency-in-days'");
+				Log.printErr("Setting it as default!");
+				world_backups_enabled = false;
+			}
+			Log.print("Loaded 'world-backups-enabled' as " + world_backups_enabled);
 
 
 

src/codedcosmos/enderbot/core/EnderBot.java

@@ -13,11 +13,12 @@
  */
 package codedcosmos.enderbot.core;
 
+import codedcosmos.enderbot.utils.GoogleDrive;
 import codedcosmos.enderbot.utils.Log;
 
 public class EnderBot {
 
-	private static final String VERSION = "0.1";
+	private static final String VERSION = "1.0";
 	private static boolean runningInSpigot = false;
 
 	public static void load(boolean runningInSpigot) {
@@ -35,4 +36,8 @@ public static void load(boolean runningInSpigot) {
 	public static boolean isRunningInSpigot() {
 		return runningInSpigot;
 	}
+	
+	public static String getVersion() {
+		return VERSION;
+	}
 }

src/codedcosmos/enderbot/discord/JDABot.java

@@ -24,6 +24,8 @@
 
 public class JDABot {
 
+	private static JDA jda;
+	
 	public static void main(String[] args) {
 		Log.print("Starting EnderBot Discord Subsystem");
 		EnderBot.load(false);
@@ -40,11 +42,15 @@ public static void initBot() {
 			builder.addEventListeners(new DiscordChatListener());
 			builder.addEventListeners(new DiscordEventHandler());
 
-			JDA jda = builder.build();
+			jda = builder.build();
 
 			jda.awaitReady();
 		} catch (LoginException | InterruptedException e) {
 			Log.printErr(e);
 		}
 	}
+	
+	public static void stop() {
+		jda.shutdownNow();
+	}
 }

src/codedcosmos/enderbot/plugin/MinecraftChatListener.java

@@ -20,6 +20,8 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
 
 public class MinecraftChatListener implements Listener {
 	@EventHandler
@@ -28,4 +30,18 @@ public void onAsyncPlayerChat(AsyncPlayerChatEvent event) {
 			context.getInGameChannel().sendMessage("**"+event.getPlayer().getDisplayName()+"** : " + event.getMessage());
 		}
 	}
+	
+	@EventHandler
+	public void onPlayerJoin(PlayerJoinEvent event) {
+		for (GuildContext context : Guilds.getContexts()) {
+			context.getInGameChannel().sendMessage("`"+event.getPlayer().getDisplayName()+" joined the game`");
+		}
+	}
+	
+	@EventHandler
+	public void onPlayerQuit(PlayerQuitEvent event) {
+		for (GuildContext context : Guilds.getContexts()) {
+			context.getInGameChannel().sendMessage("`"+event.getPlayer().getDisplayName()+" left the game`");
+		}
+	}
 }

src/codedcosmos/enderbot/plugin/MinecraftPlugin.java

@@ -13,8 +13,10 @@
  */
 package codedcosmos.enderbot.plugin;
 
+import codedcosmos.enderbot.core.ConfigManager;
 import codedcosmos.enderbot.discord.JDABot;
 import codedcosmos.enderbot.core.EnderBot;
+import codedcosmos.enderbot.plugin.commands.BackupCommand;
 import codedcosmos.enderbot.utils.GoogleDrive;
 import codedcosmos.enderbot.utils.Log;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -26,22 +28,24 @@ public class MinecraftPlugin extends JavaPlugin {
 	@Override
 	public void onEnable(){
 		//Fired when the server enables the plugin
-		Log.print("Enabling EnderBot");
+		Log.print("Enabling EnderBot v" + EnderBot.getVersion());
 		EnderBot.load(true);
 
 		JDABot.initBot();
 		mainPlugin = this;
+		
+		this.getCommand("enderbackup").setExecutor(new BackupCommand());
 
 		getServer().getPluginManager().registerEvents(new MinecraftChatListener(), this);
-		archiveLoop();
+		
+		if (ConfigManager.world_backups_enabled) archiveLoop();
 	}
 
 	public void archiveLoop() {
 		JavaPlugin plugin = this;
 		getServer().getScheduler().scheduleSyncDelayedTask(this, new Runnable() {
 			public void run() {
-				int time = GoogleDrive.archiveIfNeeded();
-				Log.print("Backup task completed in " + time + "ms");
+				GoogleDrive.archiveIfNeeded();
 				archiveLoop();
 			}
 		}, 20L*60*30);
@@ -52,5 +56,6 @@ public void run() {
 	public void onDisable(){
 		//Fired when the server stops and disables all plugins
 		Log.print("Disabiling EnderBot");
+		JDABot.stop();
 	}
 }

src/codedcosmos/enderbot/plugin/commands/BackupCommand.java

@@ -0,0 +1,38 @@
+package codedcosmos.enderbot.plugin.commands;
+
+import codedcosmos.enderbot.core.ConfigManager;
+import codedcosmos.enderbot.core.EnderBot;
+import codedcosmos.enderbot.utils.GoogleDrive;
+import net.minecraft.server.v1_15_R1.ItemMapEmpty;
+import org.bukkit.Material;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.material.MaterialData;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class BackupCommand implements CommandExecutor {
+	public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+		if (sender instanceof Player) {
+			Player player = (Player) sender;
+			if (player.isOp()) {
+				if (!ConfigManager.world_backups_enabled) {
+					player.sendMessage("Backups are disabled");
+					return true;
+				}
+				
+				GoogleDrive.archive();
+				return true;
+			} else {
+				player.sendMessage("You must be op to use this command");
+			}
+		}
+		return false;
+	}
+}

src/codedcosmos/enderbot/utils/FileUtils.java

@@ -14,14 +14,18 @@
 package codedcosmos.enderbot.utils;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
 public class FileUtils {
+	
 	public static void zip(String source, String zipname) throws IOException {
 		// Helpful console message
 		Log.print("Creating zip file '" + zipname + "' for folder '" + source + "'");