some few changes again

This commit is contained in:
mangorifo
2023-03-29 14:50:28 +08:00
parent 539cbe9104
commit 4a5fb14339
4 changed files with 9 additions and 22 deletions
-8
View File
@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/notify-on-start.iml" filepath="$PROJECT_DIR$/.idea/notify-on-start.iml" />
</modules>
</component>
</project>
+4 -6
View File
@@ -7,7 +7,7 @@ import cf.sobrooms.commands.SetLoggingModeCommand;
import cf.sobrooms.events.enchantment.EnchantItem;
import cf.sobrooms.events.enchantment.PrepareItemEnchant;
import cf.sobrooms.events.player.*;
import cf.sobrooms.events.server.ServerStart;
import cf.sobrooms.events.server.ServerLoad;
import cf.sobrooms.events.weather.LightningStrike;
import cf.sobrooms.events.weather.ThunderChange;
import cf.sobrooms.events.weather.WeatherChange;
@@ -15,7 +15,6 @@ 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.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonParser;
import org.bukkit.Bukkit;
@@ -28,11 +27,10 @@ public class Main extends JavaPlugin {
public static File isLoggingConfig;
public static File notifyWebhookConfig;
public static File pubMessageWebhookConfig;
public static String serverAddress = "mc-srv2-singapore.rrryfoo.cf";
private static boolean webhooksAreValidUrls;
public static void main(String... args) {
System.out.printf("Initializing using server address: %s...%n", serverAddress);
System.out.printf("Initializing using server address: %s...%n", ServerUtils.address);
}
@Override
@@ -77,11 +75,11 @@ public class Main extends JavaPlugin {
}
// register events
ServerStart serverStart = new ServerStart();
getServer().getPluginManager().registerEvents(serverStart, this);
if (getLoggingConfig().equals("true") && webhooksAreValidUrls)
registerEvents();
if (webhooksAreValidUrls) {
ServerLoad serverStart = new ServerLoad();
getServer().getPluginManager().registerEvents(serverStart, this);
PlayerJoin playerJoin = new PlayerJoin();
PlayerQuit playerQuit = new PlayerQuit();
getServer().getPluginManager().registerEvents(playerJoin, this);
+1 -5
View File
@@ -3,19 +3,15 @@ package cf.sobrooms;
import org.bukkit.Bukkit;
import org.bukkit.Server;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.Socket;
public class ServerUtils {
public static int port = 25565;
public static String address = "http://mc-srv2-singapore.rrryfoo.cf";
public static String address_fallback = Utils.getServerHostPublicIP();
public static String webhook_notify = Main.getNotifyWebhook();
public static String webhook_messages = Main.getPublicMessageWebhook();
public static String address = "http://mc-srv2-singapore.rrryfoo.cf";
public static boolean serverIsUp(String serverAddress, Integer serverPort) {
/*Socket socket;
@@ -5,7 +5,6 @@ import cf.sobrooms.Main;
import cf.sobrooms.ServerUtils;
import cf.sobrooms.Utils;
import org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.server.ServerLoadEvent;
@@ -16,14 +15,16 @@ import java.util.Date;
import cf.sobrooms.DiscordWebhook.EmbedObject;
public class ServerStart implements Listener {
import static cf.sobrooms.ServerUtils.address;
public class ServerLoad implements Listener {
public static int timesCalled = 0;
@EventHandler
public void onServerStart(ServerLoadEvent event) {
Bukkit.getConsoleSender().sendMessage("Triggered ServerLoad event.");
if (timesCalled < 1) {
Bukkit.getConsoleSender().sendMessage("Checking if server is up on " + ServerUtils.address + " with port " + ServerUtils.port + "...");
if (ServerUtils.serverIsUp(Main.serverAddress, 25565)) {
if (ServerUtils.serverIsUp(address, 25565)) {
System.out.println(ServerUtils.webhook_messages);
System.out.println(ServerUtils.webhook_notify);
DiscordWebhook notify = new DiscordWebhook(Main.getNotifyWebhook());