diff --git a/.gitignore b/.gitignore index 0986bbe..8bffa4f 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ gradle-app.setting .project # JDT-specific (Eclipse Java Development Tools) .classpath + +/bin \ No newline at end of file diff --git a/src/main/java/cf/sobrooms/Main.java b/src/main/java/cf/sobrooms/Main.java index 49e6015..f7467c9 100644 --- a/src/main/java/cf/sobrooms/Main.java +++ b/src/main/java/cf/sobrooms/Main.java @@ -15,7 +15,6 @@ import cf.sobrooms.events.weather.ThunderChange; import cf.sobrooms.events.weather.WeatherChange; import cf.sobrooms.events.world.WorldInit; import cf.sobrooms.events.world.WorldLoad; -import cf.sobrooms.events.world.WorldSave; import cf.sobrooms.events.world.WorldUnload; import com.google.gson.JsonElement; import com.google.gson.JsonParser; @@ -131,9 +130,8 @@ public class Main extends JavaPlugin { JsonParser jsonReader = new JsonParser(); JsonElement MsgParse = jsonReader.parse(brfmsg.readLine()); String lineMsg = MsgParse.getAsJsonObject().get("url_publicmsg").getAsString(); - // validate url being url - // but this won't validate the url being an actual webhook - // i can try but lazy :sob: + + brfmsg.close(); if (lineMsg.equals("default-ns")) { System.out.printf("Please set the public message webhook URL in %s and restart the server", webhookConfig.getAbsolutePath()); webhooksAreValidUrls = false; @@ -156,9 +154,8 @@ public class Main extends JavaPlugin { JsonParser jsonReader = new JsonParser(); JsonElement NtfyParse = jsonReader.parse(brfntfy.readLine()); String lineNtfy = NtfyParse.getAsJsonObject().get("url_notify").getAsString(); - // validate url being url - // but this won't validate the url being an actual webhook - // i can try but lazy :sob: + + brfntfy.close(); if (lineNtfy.equals("default-ns")) { System.out.printf("Please set the webhook URL in %s and restart the server", webhookConfig.getAbsolutePath()); webhooksAreValidUrls = false; @@ -186,7 +183,6 @@ public class Main extends JavaPlugin { else return "Content is not a boolean"; } - reader.close(); } catch (IOException e) { System.out.println("An error occurred while reading the configuration file."); e.printStackTrace(); @@ -207,7 +203,6 @@ public class Main extends JavaPlugin { WeatherChange weatherChange = new WeatherChange(); WorldInit worldInit = new WorldInit(); WorldLoad worldLoad = new WorldLoad(); - WorldSave worldSave = new WorldSave(); WorldUnload worldUnload = new WorldUnload(); VehicleEnter vehicleEnter = new VehicleEnter(); VehicleExit vehicleExit = new VehicleExit(); @@ -222,7 +217,6 @@ public class Main extends JavaPlugin { getServer().getPluginManager().registerEvents(weatherChange, this); getServer().getPluginManager().registerEvents(worldInit, this); getServer().getPluginManager().registerEvents(worldLoad, this); - getServer().getPluginManager().registerEvents(worldSave, this); getServer().getPluginManager().registerEvents(worldUnload, this); getServer().getPluginManager().registerEvents(vehicleEnter, this); getServer().getPluginManager().registerEvents(vehicleExit, this); diff --git a/src/main/java/cf/sobrooms/events/server/ServerLoad.java b/src/main/java/cf/sobrooms/events/server/ServerLoad.java index dbcef34..9a09131 100644 --- a/src/main/java/cf/sobrooms/events/server/ServerLoad.java +++ b/src/main/java/cf/sobrooms/events/server/ServerLoad.java @@ -11,7 +11,6 @@ import org.bukkit.event.server.ServerLoadEvent; import java.awt.*; import java.io.IOException; -import java.sql.Timestamp; import java.util.Date; import cf.sobrooms.DiscordWebhook.EmbedObject; diff --git a/src/main/java/cf/sobrooms/events/weather/LightningStrike.java b/src/main/java/cf/sobrooms/events/weather/LightningStrike.java index 9e9141d..8ae0b15 100644 --- a/src/main/java/cf/sobrooms/events/weather/LightningStrike.java +++ b/src/main/java/cf/sobrooms/events/weather/LightningStrike.java @@ -3,7 +3,6 @@ package cf.sobrooms.events.weather; import cf.sobrooms.DiscordWebhook; import cf.sobrooms.ServerUtils; import org.bukkit.Bukkit; -import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.weather.LightningStrikeEvent; diff --git a/src/main/java/cf/sobrooms/events/weather/ThunderChange.java b/src/main/java/cf/sobrooms/events/weather/ThunderChange.java index 65f72bf..07ddcc8 100644 --- a/src/main/java/cf/sobrooms/events/weather/ThunderChange.java +++ b/src/main/java/cf/sobrooms/events/weather/ThunderChange.java @@ -3,7 +3,6 @@ package cf.sobrooms.events.weather; import cf.sobrooms.DiscordWebhook; import cf.sobrooms.ServerUtils; import org.bukkit.Bukkit; -import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.weather.ThunderChangeEvent; diff --git a/src/main/java/cf/sobrooms/events/world/WorldSave.java b/src/main/java/cf/sobrooms/events/world/WorldSave.java deleted file mode 100644 index 40dc964..0000000 --- a/src/main/java/cf/sobrooms/events/world/WorldSave.java +++ /dev/null @@ -1,30 +0,0 @@ -package cf.sobrooms.events.world; - -import cf.sobrooms.DiscordWebhook; -import cf.sobrooms.ServerUtils; -import org.bukkit.Bukkit; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.world.WorldSaveEvent; - -import java.awt.*; -import java.io.IOException; -import java.util.Date; - -public class WorldSave implements Listener { - @EventHandler - public void onWorldSave(WorldSaveEvent event) { - Bukkit.getConsoleSender().sendMessage("Triggered WorldSave event."); - DiscordWebhook notify = new DiscordWebhook(ServerUtils.webhook_notify); - DiscordWebhook.EmbedObject embedObject = new DiscordWebhook.EmbedObject().setTitle("WorldSave").setDescription("World in the server was saved") - .addField("Time", new Date().toString(), false) - .addField("World name", event.getWorld().getName(), true) - .setColor(Color.BLUE); - notify.addEmbed(embedObject); - try { - notify.execute(); - } catch (IOException e) { - throw new RuntimeException(e); - } - } -}