make time/weather command checks more strict (closes #19)

fix SunriseSunsetRequest to use right config values

.github/ISSUE_TEMPLATE/BUG-REPORT.yml

@@ -1,6 +1,6 @@
 name: Bug report
 description: Report problems/issues here
-labels: bug
+labels: [bug]
 body:
 - type: checkboxes
   attributes:

.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml

@@ -1,6 +1,6 @@
 name: Feature request
 description: Use this to request new features and/or changes
-labels: enhancement
+labels: [enhancement]
 body:
 - type: checkboxes
   attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +1,3 @@
+#file: noinspection YAMLSchemaValidation
+#IntelliJ IDEA interprets this as another issue template so the above line is required
 blank_issues_enabled: false

.travis.yml

@@ -1,2 +1,2 @@
 language: java
-jdk: openjdk17
+jdk: openjdk21

README.md

@@ -9,6 +9,7 @@ ___
 - Supports all Minecraft versions from 1.7+
 - Constant time syncing (including custom or real-world sunrise/sunset times)
 - Weather syncing (rain/snow and thunder)
+- Enable/disable specific worlds
 
 **Upcoming Features:**
 - [ ] Commands

build.gradle

@@ -1,33 +1,45 @@
 plugins {
     id 'java'
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'io.github.goooler.shadow' version '8.1.8' // TODO: Temporarily using fork
 }
 
-group = 'io.github.Jack1424'
+group = 'io.github.jack1424'
-version = '1.3.0'
+version = '2.0.0-DEV'
 
 repositories {
     mavenCentral()
     maven {
-        name = 'papermc-repo'
+        name = "papermc-repo"
-        url = 'https://repo.papermc.io/repository/maven-public/'
+        url = "https://repo.papermc.io/repository/maven-public/"
     }
     maven {
-        name = 'sonatype'
+        name = "sonatype"
-        url = 'https://oss.sonatype.org/content/groups/public/'
+        url = "https://oss.sonatype.org/content/groups/public/"
     }
 }
 
 dependencies {
+    compileOnly("io.papermc.paper:paper-api:1.21-R0.1-SNAPSHOT")
     implementation("org.bstats:bstats-bukkit:3.0.2")
-    implementation("org.bukkit:bukkit:1.13-R0.1-SNAPSHOT")
 }
 
 shadowJar {
-    relocate('org.bstats', 'io.github.jack1424.realtimeweather')
+    relocate('org.bstats', 'io.github.jack1424.realTimeWeather')
 }
 
-def targetJavaVersion = 11
+tasks.jar {
+    manifest {
+        attributes["paperweight-mappings-namespace"] = "mojang"
+    }
+}
+
+tasks.shadowJar {
+    manifest {
+        attributes["paperweight-mappings-namespace"] = "mojang"
+    }
+}
+
+def targetJavaVersion = 21
 java {
     def javaVersion = JavaVersion.toVersion(targetJavaVersion)
     sourceCompatibility = javaVersion
@@ -38,8 +50,10 @@ java {
 }
 
 tasks.withType(JavaCompile).configureEach {
+    options.encoding = 'UTF-8'
+
     if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
-        options.release = targetJavaVersion
+        options.release.set(targetJavaVersion)
     }
 }
 

src/main/java/io/github/jack1424/realTimeWeather/ConfigManager.java

@@ -1,16 +1,19 @@
-package io.github.jack1424.realtimeweather;
+package io.github.jack1424.realTimeWeather;
 
-import io.github.jack1424.realtimeweather.requests.WeatherRequestObject;
+import io.github.jack1424.realTimeWeather.requests.WeatherRequestObject;
+import org.bukkit.World;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.json.simple.parser.ParseException;
 
 import javax.naming.ConfigurationException;
 import java.io.IOException;
+import java.net.URISyntaxException;
 import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 import java.time.zone.ZoneRulesException;
+import java.util.HashSet;
 import java.util.Objects;
 import java.util.TimeZone;
 
@@ -18,9 +21,10 @@ public class ConfigManager {
 	private final RealTimeWeather rtw;
 	private final FileConfiguration configFile;
 	private TimeZone timeZone;
-	private boolean debug, timeEnabled, weatherEnabled, blockTimeSetCommand, blockWeatherCommand, disableBedsAtNight, disableBedsDuringThunder;
+	private boolean debug, timeEnabled, weatherEnabled, timeSyncAllWorlds, weatherSyncAllWorlds, blockTimeSetCommand, blockWeatherCommand, disableBedsAtNight, disableBedsDuringThunder;
-	private long timeSyncInterval, weatherSyncInterval;
+	private long updateCheckInterval, timeSyncInterval, weatherSyncInterval;
 	private String sunriseSunset, sunriseSunsetLatitude, sunriseSunsetLongitude, apiKey, weatherLatitude, weatherLongitude, disableBedsAtNightMessage, disableBedsDuringThunderMessage, sunriseCustomTime, sunsetCustomTime;
+	private HashSet<World> timeSyncWorlds, weatherSyncWorlds;
 
 	public ConfigManager(RealTimeWeather rtw) {
 		this.rtw = rtw;
@@ -33,6 +37,16 @@ public class ConfigManager {
 		setTimeEnabled(configFile.getBoolean("SyncTime"));
 		if (isTimeEnabled())
 			try {
+				timeSyncWorlds = new HashSet<>();
+				setTimeSyncAllWorlds(configFile.getBoolean("TimeSyncAllWorlds"));
+				if (getTimeSyncAllWorlds()) {
+					for (World world : rtw.getServer().getWorlds())
+						if (world.getEnvironment() == World.Environment.NORMAL)
+							addTimeSyncWorld(world.getName());
+				} else {
+					for (String worldName : configFile.getStringList("TimeSyncWorlds"))
+						addTimeSyncWorld(worldName);
+				}
 				setBlockTimeSetCommand(configFile.getBoolean("BlockTimeSetCommand"));
 				setDisableBedsAtNight(configFile.getBoolean("DisableBedsAtNight"));
 				setDisableBedsAtNightMessage(configFile.getString("DisableBedsAtNightMessage"));
@@ -57,6 +71,16 @@ public class ConfigManager {
 		setWeatherEnabled(configFile.getBoolean("SyncWeather"));
 		if (isWeatherEnabled())
 			try {
+				weatherSyncWorlds = new HashSet<>();
+				setWeatherSyncAllWorlds(configFile.getBoolean("WeatherSyncAllWorlds"));
+				if (getWeatherSyncAllWorlds()) {
+					for (World world : rtw.getServer().getWorlds())
+						if (world.getEnvironment() == World.Environment.NORMAL)
+							addWeatherSyncWorld(world.getName());
+				} else {
+					for (String worldName : configFile.getStringList("WeatherSyncWorlds"))
+						addWeatherSyncWorld(worldName);
+				}
 				setBlockWeatherCommand(configFile.getBoolean("BlockWeatherCommand"));
 				setDisableBedsDuringThunder(configFile.getBoolean("DisableBedsDuringThunder"));
 				setDisableBedsDuringThunderMessage(configFile.getString("DisableBedsDuringThunderMessage"));
@@ -71,6 +95,17 @@ public class ConfigManager {
 
 				setWeatherEnabled(false);
 			}
+
+		setUpdateCheckInterval(configFile.getLong("UpdateCheckInterval"));
+	}
+
+	public long getUpdateCheckInterval() {
+		return updateCheckInterval;
+	}
+
+	public void setUpdateCheckInterval(long value) {
+		updateCheckInterval = value;
+		rtw.debug("updateCheckInterval set to " + value);
 	}
 
 	public boolean debugEnabled() {
@@ -91,6 +126,29 @@ public class ConfigManager {
 		rtw.debug("SyncTime set to " + value);
 	}
 
+	public boolean getTimeSyncAllWorlds() {
+		return timeSyncAllWorlds;
+	}
+
+	public void setTimeSyncAllWorlds(boolean value) {
+		timeSyncAllWorlds = value;
+		rtw.debug("TimeSyncAllWorlds set to " + value);
+	}
+
+	public HashSet<World> getTimeSyncWorlds() {
+		return timeSyncWorlds;
+	}
+
+	public void addTimeSyncWorld(String worldName) throws ConfigurationException {
+		World world = rtw.getServer().getWorld(worldName);
+
+		if (world == null)
+			throw new ConfigurationException("World \"" + worldName + "\" cannot be found");
+
+		timeSyncWorlds.add(world);
+		rtw.debug("World \"" + worldName + "\" added to TimeSyncWorlds");
+	}
+
 	public boolean getBlockTimeSetCommand() {
 		return blockTimeSetCommand;
 	}
@@ -213,6 +271,29 @@ public class ConfigManager {
 		rtw.debug("SyncWeather set to " + value);
 	}
 
+	public boolean getWeatherSyncAllWorlds() {
+		return weatherSyncAllWorlds;
+	}
+
+	public void setWeatherSyncAllWorlds(boolean value) {
+		weatherSyncAllWorlds = value;
+		rtw.debug("WeatherSyncAllWorlds set to " + value);
+	}
+
+	public HashSet<World> getWeatherSyncWorlds() {
+		return weatherSyncWorlds;
+	}
+
+	public void addWeatherSyncWorld(String worldName) throws ConfigurationException {
+		World world = rtw.getServer().getWorld(worldName);
+
+		if (world == null)
+			throw new ConfigurationException("World \"" + worldName + "\" cannot be found");
+
+		weatherSyncWorlds.add(world);
+		rtw.debug("World \"" + worldName + "\" added to WeatherSyncWorlds");
+	}
+
 	public boolean getBlockWeatherCommand() {
 		return blockWeatherCommand;
 	}
@@ -262,7 +343,7 @@ public class ConfigManager {
 		} catch (NullPointerException e) {
 			throw new ConfigurationException("The APIKey cannot be blank");
 		}
-		catch (IOException | ParseException e) {
+		catch (IOException | ParseException | URISyntaxException e) {
 			rtw.getLogger().severe(e.getMessage());
 			throw new ConfigurationException("There was an error when validating this APIKey (this does not mean that the API key is invalid)");
 		}

src/main/java/io/github/jack1424/realTimeWeather/EventHandlers.java

@@ -1,4 +1,4 @@
-package io.github.jack1424.realtimeweather;
+package io.github.jack1424.realTimeWeather;
 
 import org.bukkit.World;
 import org.bukkit.entity.Player;
@@ -13,13 +13,13 @@ public class EventHandlers implements Listener {
 	private final ConfigManager config;
 
 	public EventHandlers(RealTimeWeather rtw) {
-		config = rtw.getConfigurator();
+		config = rtw.getConfigManager();
 	}
 
 	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
 	public void onCommandPreprocess(PlayerCommandPreprocessEvent event) {
-		if ((config.getBlockTimeSetCommand() && config.isTimeEnabled() && event.getMessage().contains("time set"))
+		if ((config.getBlockTimeSetCommand() && config.isTimeEnabled() && event.getMessage().toLowerCase().contains("time set "))
-				|| (config.getBlockWeatherCommand() && config.isWeatherEnabled() && event.getMessage().contains("weather"))) {
+				|| (config.getBlockWeatherCommand() && config.isWeatherEnabled() && event.getMessage().toLowerCase().contains("weather "))) {
 			event.setCancelled(true);
 			event.getPlayer().sendMessage("Command disabled by RealTimeWeather");
 		}
@@ -27,8 +27,8 @@ public class EventHandlers implements Listener {
 
 	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
 	public void onConsoleCommand(ServerCommandEvent event) {
-		if ((config.getBlockTimeSetCommand() && config.isTimeEnabled() && event.getCommand().contains("time set"))
+		if ((config.getBlockTimeSetCommand() && config.isTimeEnabled() && event.getCommand().toLowerCase().contains("time set "))
-				|| (config.getBlockWeatherCommand() && config.isWeatherEnabled() && event.getCommand().contains("weather"))) {
+				|| (config.getBlockWeatherCommand() && config.isWeatherEnabled() && event.getCommand().toLowerCase().contains("weather "))) {
 			event.setCancelled(true);
 			event.getSender().sendMessage("Command disabled by RealTimeWeather");
 		}

src/main/java/io/github/jack1424/realTimeWeather/RealTimeWeather.java

@@ -1,8 +1,9 @@
-package io.github.jack1424.realtimeweather;
+package io.github.jack1424.realTimeWeather;
 
-import io.github.jack1424.realtimeweather.requests.*;
+import io.github.jack1424.realTimeWeather.requests.*;
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.SimplePie;
+import org.bukkit.GameRule;
 import org.bukkit.World;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -11,7 +12,6 @@ import java.time.LocalTime;
 import java.util.Calendar;
 import java.util.logging.Logger;
 
-@SuppressWarnings("deprecation")
 public final class RealTimeWeather extends JavaPlugin {
 	private Logger logger;
 	private ConfigManager config;
@@ -43,6 +43,13 @@ public final class RealTimeWeather extends JavaPlugin {
 		metrics.addCustomChart(new SimplePie("time_sync_enabled", () -> String.valueOf(config.isTimeEnabled())));
 
 		logger.info("Started!");
+
+		logger.info("Checking for updates...");
+		logger.info(getUpdateCheck());
+
+		long updateCheckInterval = config.getUpdateCheckInterval();
+		if (config.getUpdateCheckInterval() > 0)
+			getServer().getScheduler().scheduleSyncRepeatingTask(this,  () -> logger.info(getUpdateCheck()), updateCheckInterval, updateCheckInterval);
 	}
 
 	@Override
@@ -52,9 +59,9 @@ public final class RealTimeWeather extends JavaPlugin {
 				debug("Re-enabling normal daylight and weather cycles...");
 
 				if (config.isTimeEnabled())
-					world.setGameRuleValue("doDaylightCycle", "true");
+					world.setGameRule(GameRule.DO_DAYLIGHT_CYCLE, true);
 				if (config.isWeatherEnabled())
-					world.setGameRuleValue("doWeatherCycle", "true");
+					world.setGameRule(GameRule.DO_WEATHER_CYCLE, true);
 			}
 
 		logger.info("Stopping...");
@@ -70,19 +77,17 @@ public final class RealTimeWeather extends JavaPlugin {
 		if (config.getSunriseSunset().equals("custom"))
 			debug("Using custom sunrise/sunset times. Sunrise: " + config.getSunriseCustomTime() + ", Sunset: " + config.getSunsetCustomTime());
 
-		for (World world : getServer().getWorlds())
+		for (World world : config.getTimeSyncWorlds())
-			if (world.getEnvironment().equals(World.Environment.NORMAL))
+			world.setGameRule(GameRule.DO_DAYLIGHT_CYCLE, false);
-				world.setGameRuleValue("doDaylightCycle", "false");
 
 		getServer().getScheduler().scheduleSyncRepeatingTask(this, () -> {
 			if (config.isTimeEnabled()) {
 				Calendar cal = Calendar.getInstance(config.getTimeZone());
-				for (World world : getServer().getWorlds())
+				for (World world : config.getTimeSyncWorlds())
-					if (world.getEnvironment().equals(World.Environment.NORMAL))
 					if (config.getSunriseSunset().equals("real")) {
 						SunriseSunsetRequestObject sunriseSunset;
 						try {
-								sunriseSunset = new SunriseSunsetRequestObject(config.getTimeZone(), config.getWeatherLatitude(), config.getWeatherLongitude());
+							sunriseSunset = new SunriseSunsetRequestObject(config.getTimeZone(), config.getSunriseSunsetLatitude(), config.getSunriseSunsetLongitude());
 							world.setTime(calculateWorldTime(cal, sunriseSunset.getSunriseTime(), sunriseSunset.getSunsetTime()));
 						} catch (Exception e) {
 							logger.severe(e.getMessage());
@@ -97,15 +102,19 @@ public final class RealTimeWeather extends JavaPlugin {
 							world.setTime(calculateWorldTime(cal, "5:02:27 AM", "6:36:36 PM"));
 							return;
 						}
-						} else if (config.getSunriseSunset().equals("custom"))
+					} else if (config.getSunriseSunset().equals("custom")) {
 						world.setTime(calculateWorldTime(cal, config.getSunriseCustomTime(), config.getSunsetCustomTime()));
-						else
+					} else
 						world.setTime(calculateWorldTime(cal, "5:02:27 AM", "6:36:36 PM"));
 			}
 		}, 0L, config.getTimeSyncInterval());
+
+		debug("Weather sync enabled");
 	}
 
 	private void setupWeather() {
+		debug("Enabling weather sync...");
+
 		try {
 			new WeatherRequestObject(config.getAPIKey(), config.getWeatherLatitude(), config.getWeatherLongitude());
 		} catch (Exception e) {
@@ -116,11 +125,8 @@ public final class RealTimeWeather extends JavaPlugin {
 			return;
 		}
 
-		for (World world : getServer().getWorlds())
+		for (World world : config.getWeatherSyncWorlds())
-			if (world.getEnvironment().equals(World.Environment.NORMAL))
+			world.setGameRule(GameRule.DO_WEATHER_CYCLE, false);
-				world.setGameRuleValue("doWeatherCycle", "false");
-
-		debug("Enabling weather sync...");
 
 		getServer().getScheduler().scheduleSyncRepeatingTask(this, () -> {
 			debug("Syncing weather...");
@@ -129,8 +135,7 @@ public final class RealTimeWeather extends JavaPlugin {
 				WeatherRequestObject request = new WeatherRequestObject(config.getAPIKey(), config.getWeatherLatitude(), config.getWeatherLongitude());
 
 				debug("Setting weather (Rain: " + request.isRaining() + ", Thunder: " + request.isThundering() + ")...");
-				for (World world : getServer().getWorlds())
+				for (World world : config.getWeatherSyncWorlds()) {
-					if (world.getEnvironment().equals(World.Environment.NORMAL)) {
 					world.setStorm(request.isRaining());
 					world.setThundering(request.isThundering());
 				}
@@ -156,19 +161,37 @@ public final class RealTimeWeather extends JavaPlugin {
 			sunsetMinutes += 720;
 
 		LocalTime currentTime = LocalTime.of(cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE));
-		int currentMinutes = currentTime.getHour() * 60 + currentTime.getMinute();
+		double currentMinutes = currentTime.getHour() * 60 + currentTime.getMinute();
 
 		if (currentMinutes >= sunriseMinutes && currentMinutes < sunsetMinutes) {
-			return ((currentMinutes - sunriseMinutes) / (sunsetMinutes - sunriseMinutes) * 13569) + 23041;
+			return (long) (((currentMinutes - sunriseMinutes) / (sunsetMinutes - sunriseMinutes)) * 13569) + 23041;
 		} else {
-			if (currentMinutes < sunriseMinutes) {
+			if (currentMinutes < sunriseMinutes)
 				currentMinutes += 1440;
-			}
+			
-			return ((currentMinutes - sunsetMinutes) / (1440 - sunsetMinutes + sunriseMinutes) * 13569) + 12610;
+			return (long) (((currentMinutes - sunsetMinutes) / (1440 - sunsetMinutes + sunriseMinutes)) * 13569) + 12610;
 		}
 	}
 
-	public ConfigManager getConfigurator() {
+	@SuppressWarnings("UnstableApiUsage")
+	public String getUpdateCheck() {
+		String currentVersion = this.getPluginMeta().getVersion();
+		String latestVersion;
+		try {
+			debug("Getting latest version...");
+			latestVersion = RequestFunctions.getLatestVersion();
+		} catch (Exception exception) {
+			debug(exception.getMessage());
+			return "There was an error getting the latest version";
+		}
+
+		if (currentVersion.equals(latestVersion)) {
+			return String.format("RealTimeWeather (v%s) is up to date!", currentVersion);
+		} else
+			return String.format("RealTimeWeather (v%s) is outdated! v%s is the latest version.", currentVersion, latestVersion);
+	}
+
+	public ConfigManager getConfigManager() {
 		return config;
 	}
 

src/main/java/io/github/jack1424/realTimeWeather/requests/RequestFunctions.java

@@ -0,0 +1,47 @@
+package io.github.jack1424.realTimeWeather.requests;
+
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Scanner;
+
+public class RequestFunctions {
+	public static Object makeRequest(String URLString) throws IOException, HTTPResponseException, ParseException, URISyntaxException {
+		int responseCode = getResponseCode(URLString);
+		if (responseCode > 399)
+			throw new HTTPResponseException(responseCode);
+
+		Scanner scanner = new Scanner(new URI(URLString).toURL().openStream());
+		StringBuilder response = new StringBuilder();
+		while (scanner.hasNextLine())
+			response.append(scanner.nextLine());
+		scanner.close();
+
+		return new JSONParser().parse(response.toString());
+	}
+
+	public static int getResponseCode(String URLString) throws IOException, URISyntaxException {
+		URL url = new URI(URLString).toURL();
+		HttpURLConnection con = (HttpURLConnection) url.openConnection();
+		con.setRequestMethod("GET");
+		con.connect();
+		return con.getResponseCode();
+	}
+
+	public static String getLatestVersion() throws Exception {
+		return ((JSONObject) ((JSONArray) makeRequest("https://api.modrinth.com/v2/project/WRA6ODcm/version")).getFirst()).get("version_number").toString();
+	}
+
+	public static class HTTPResponseException extends Exception {
+		public HTTPResponseException(int responseCode) {
+			super(String.valueOf(responseCode));
+		}
+	}
+}

src/main/java/io/github/jack1424/realTimeWeather/requests/SunriseSunsetRequestObject.java

@@ -1,14 +1,11 @@
-package io.github.jack1424.realtimeweather.requests;
+package io.github.jack1424.realTimeWeather.requests;
 
 import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 
 import javax.naming.ConfigurationException;
-import javax.net.ssl.HttpsURLConnection;
 import java.io.IOException;
-import java.net.ProtocolException;
+import java.net.URISyntaxException;
-import java.net.URL;
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.ZoneId;
@@ -19,24 +16,14 @@ import java.util.*;
 public class SunriseSunsetRequestObject {
 	private String sunriseTime, sunsetTime;
 
-	public SunriseSunsetRequestObject(TimeZone timeZone, String lat, String lon) throws IOException, ParseException, ConfigurationException {
+	public SunriseSunsetRequestObject(TimeZone timeZone, String lat, String lon) throws IOException, ParseException, ConfigurationException, URISyntaxException {
-		URL url = new URL(String.format("https://api.sunrisesunset.io/json?lat=%s&lng=%s&timezone=UTC", lat, lon));
+		JSONObject response;
-
+		try {
-		HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
+			response = (JSONObject) ((JSONObject) RequestFunctions.makeRequest(String.format("https://api.sunrisesunset.io/json?lat=%s&lng=%s&timezone=UTC", lat, lon))).get("results");
-		con.setRequestMethod("GET");
+		} catch (RequestFunctions.HTTPResponseException e) {
-		con.connect();
+			throw new IOException("Server/client error (HTTP error " + e.getMessage() + ")");
-		int responseCode = con.getResponseCode();
-		if (responseCode > 399)
-			throw new ProtocolException("Server/client error (HTTP error " + responseCode + ")");
-
-		Scanner scanner = new Scanner(url.openStream());
-		StringBuilder data = new StringBuilder();
-		while (scanner.hasNext()) {
-			data.append(scanner.nextLine());
 		}
-		scanner.close();
 
-		JSONObject response = (JSONObject) ((JSONObject) new JSONParser().parse(data.toString())).get("results");
 		sunriseTime = response.get("sunrise").toString();
 		sunsetTime = response.get("sunset").toString();
 

src/main/java/io/github/jack1424/realTimeWeather/requests/WeatherRequestObject.java

@@ -0,0 +1,52 @@
+package io.github.jack1424.realTimeWeather.requests;
+
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.ParseException;
+
+import javax.naming.ConfigurationException;
+import java.io.IOException;
+import java.net.ProtocolException;
+import java.net.URISyntaxException;
+
+public class WeatherRequestObject {
+	private boolean rain = false, thunder = false;
+
+	public WeatherRequestObject(String apiKey, String lat, String lon) throws IOException, ParseException, ConfigurationException, URISyntaxException {
+		JSONArray conditions;
+		try {
+			conditions = (JSONArray) ((JSONObject) RequestFunctions.makeRequest(String.format("https://api.openweathermap.org/data/2.5/weather?lat=%s&lon=%s&appid=%s", lat, lon, apiKey))).get("weather");
+		} catch (RequestFunctions.HTTPResponseException e) {
+			int responseCode = Integer.parseInt(e.getMessage());
+			if (responseCode > 499) {
+				throw new ProtocolException("Server/client error (HTTP error " + responseCode + ")");
+			} else if (responseCode > 399) {
+				String message = "Error when getting weather information: ";
+
+				if (responseCode == 401)
+					throw new ConfigurationException(message + "API key invalid. Check the Wiki for troubleshooting steps.");
+				else
+					throw new ProtocolException(message + "Unknown error");
+			} else {
+				throw new IOException("Server/client error (HTTP error " + e.getMessage() + ")");
+			}
+		}
+
+		for (Object rawCondition : conditions) {
+			int id = Integer.parseInt(String.valueOf(((JSONObject) rawCondition).get("id")));
+			while (id >= 10)
+				id /= 10;
+
+			rain = id == 2 || id == 3 || id == 5 || id == 6;
+			thunder = id == 2;
+		}
+	}
+
+	public boolean isRaining() {
+		return rain;
+	}
+
+	public boolean isThundering() {
+		return thunder;
+	}
+}

src/main/java/io/github/jack1424/realtimeweather/requests/WeatherRequestObject.java

@@ -1,66 +0,0 @@
-package io.github.jack1424.realtimeweather.requests;
-
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-import javax.naming.ConfigurationException;
-import javax.net.ssl.HttpsURLConnection;
-import java.io.IOException;
-import java.net.ProtocolException;
-import java.net.URL;
-import java.util.Scanner;
-
-public class WeatherRequestObject {
-	private boolean rain = false, thunder = false;
-
-	public WeatherRequestObject(String apiKey, String lat, String lon) throws IOException, ParseException, ConfigurationException {
-		URL url = new URL(String.format("https://api.openweathermap.org/data/2.5/weather?lat=%s&lon=%s&appid=%s", lat, lon, apiKey));
-
-		HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
-		con.setRequestMethod("GET");
-		con.connect();
-		int responseCode = con.getResponseCode();
-		if (responseCode > 499) {
-			throw new ProtocolException("Server/client error (HTTP error " + responseCode + ")");
-		}
-		else if (responseCode > 399) {
-			String message = "Error when getting weather information: ";
-
-			if (responseCode == 401)
-				throw new ConfigurationException(message + "API key invalid. Check the Wiki for troubleshooting steps.");
-			else
-				throw new ProtocolException(message + "Unknown error");
-		}
-
-		Scanner scanner = new Scanner(url.openStream());
-		StringBuilder data = new StringBuilder();
-		while (scanner.hasNext()) {
-			data.append(scanner.nextLine());
-		}
-		scanner.close();
-
-		JSONArray conditions = (JSONArray) ((JSONObject) new JSONParser().parse(data.toString())).get("weather");
-
-		for (Object rawCondition : conditions) {
-			int id = Integer.parseInt(String.valueOf(((JSONObject) rawCondition).get("id")));
-
-			while (id >= 10)
-				id /= 10;
-
-			if (!rain)
-				rain = id == 2 || id == 3 || id == 5 || id == 6;
-			if (!thunder)
-				thunder = id == 2;
-		}
-	}
-
-	public boolean isRaining() {
-		return rain;
-	}
-
-	public boolean isThundering() {
-		return thunder;
-	}
-}

src/main/resources/config.yml

@@ -1,11 +1,37 @@
-# RealTimeWeather Configuration File (v1.3.0)
+# RealTimeWeather Configuration File (v2.0.0)
 # You can find detailed instructions at: https://github.com/Jack1424/RealTimeWeather/wiki#editing-the-configuration-file
 
+######################################## Real Time Weather Settings ##################################################
+# By default, RealTimeWeather will check if an update is available every 24 hours (1734000 ticks)                    #
+# You can change the interval here (or set to 0 to disable update checks)                                            #
+# If this is disabled, RealTimeWeather will still check for updates on startup                                       #
+# You can find a handy tick calculator here: https://mapmaking.fr/tick/                                              #
+UpdateCheckInterval: 1734000
+#
+# Set to true for various console messages when time and weather sync are executed                                   #
+# This is useful if the plugin is not working, and you want to find out what's wrong                                 #
+# This will also provide error messages even when an error is caught and managed by RTM                              #
+# Note: There will be no messages during a time sync because they happen very frequently                             #
+# Note: Unhandled plugin errors will still be logged regardless of the debug value                                   #
+Debug: false
+######################################################################################################################
+
 ################################# TIME SYNC SETTINGS #################################################################
 # Set to true to enable time syncing, or false to disable                                                            #
 # All time-related settings will be ignored if this is set to false                                                  #
 SyncTime: false
 #                                                                                                                    #
+# By default, RealTimeWeather will apply the time sync settings below to all worlds                                  #
+# End and nether worlds will not be synced                                                                           #
+# If you ony want to enable time syncing in some worlds on your server, set this to false                            #
+TimeSyncAllWorlds: true
+#                                                                                                                    #
+# List the worlds that you want RealTimeWeather to sync the time in                                                  #
+# End and nether worlds will not be synced                                                                           #
+# This only works if TimeSyncAllWorlds is set to false                                                               #
+TimeSyncWorlds:
+  - world
+#                                                                                                                    #
 # Set to false to enable the /time set command (not recommended)                                                     #
 BlockTimeSetCommand: true
 #                                                                                                                    #
@@ -45,6 +71,17 @@ SunsetCustomTime: '6:36:36 PM'
 # All weather-related settings will be ignored if this is set to false                                               #
 SyncWeather: false
 #                                                                                                                    #
+# By default, RealTimeWeather will apply the weather sync settings below to all worlds                               #
+# End and nether worlds will not be synced                                                                           #
+# If you ony want to enable weather syncing in some worlds on your server, set this to false                         #
+WeatherSyncAllWorlds: true
+#                                                                                                                    #
+# List the worlds that you want RealTimeWeather to sync the weather in                                               #
+# End and nether worlds will not be synced                                                                           #
+# This only works if WeatherSyncAllWorlds is set to false                                                            #
+WeatherSyncWorlds:
+  - world
+#                                                                                                                    #
 # Set to false to enable the /weather command (not recommended)                                                      #
 BlockWeatherCommand: true
 #                                                                                                                    #
@@ -71,10 +108,3 @@ WeatherLatitude: '0'
 WeatherLongitude: '0'
 #                                                                                                                    #
 ######################################################################################################################
-
-# Set to true for various console messages when time and weather sync are executed
-# This is useful if the plugin is not working, and you want to find out what's wrong
-# This will also provide error messages even when an error is caught and managed by RTM
-# Note: There will be no messages during a time sync because they happen very frequently
-# Note: Unhandled plugin errors will still be logged regardless of the debug value
-Debug: false

src/main/resources/plugin.yml

@@ -1,7 +1,8 @@
+main: io.github.jack1424.realTimeWeather.RealTimeWeather
 name: RealTimeWeather
 version: '${version}'
-description: Sync your server time and weather with the real world
+description: Sync your Minecraft server's time and weather with the real world
-main: io.github.jack1424.realtimeweather.RealTimeWeather
+api-version: '1.21'
 load: POSTWORLD
-authors: [Jack1424]
+author: Jack1424
-website: https://github.com/Jack1424/RealTimeWeather
+website: github.com/Jack1424/RealTimeWeather