minster586/RealTimeWeather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 8 Wiki Activity

Add v1.4.0 changes to legacy #9

Merged
Jack1424 merged 12 commits from main into legacy 2024-07-23 18:10:08 -04:00
Conversation 0 Commits 12 Files Changed 8 +115 -54
6 changed files with 115 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6db07a376b - Show all commits

8
src/main/java/io/github/jack1424/realtimeweather/RealTimeWeather.java
View File

@@ -106,9 +106,9 @@ public final class RealTimeWeather extends JavaPlugin {
world.setTime(calculateWorldTime(cal, "5:02:27 AM", "6:36:36 PM")); world.setTime(calculateWorldTime(cal, "5:02:27 AM", "6:36:36 PM"));
return; return;
} }
} else if (config.getSunriseSunset().equals("custom")) } else if (config.getSunriseSunset().equals("custom")) {
world.setTime(calculateWorldTime(cal, config.getSunriseCustomTime(), config.getSunsetCustomTime())); world.setTime(calculateWorldTime(cal, config.getSunriseCustomTime(), config.getSunsetCustomTime()));
else } else
world.setTime(calculateWorldTime(cal, "5:02:27 AM", "6:36:36 PM")); world.setTime(calculateWorldTime(cal, "5:02:27 AM", "6:36:36 PM"));
} }
}, 0L, config.getTimeSyncInterval()); }, 0L, config.getTimeSyncInterval());
@@ -170,9 +170,9 @@ public final class RealTimeWeather extends JavaPlugin {
if (currentMinutes >= sunriseMinutes && currentMinutes < sunsetMinutes) { if (currentMinutes >= sunriseMinutes && currentMinutes < sunsetMinutes) {
return ((currentMinutes - sunriseMinutes) / (sunsetMinutes - sunriseMinutes) * 13569) + 23041; return ((currentMinutes - sunriseMinutes) / (sunsetMinutes - sunriseMinutes) * 13569) + 23041;
} else { } else {
if (currentMinutes < sunriseMinutes) { if (currentMinutes < sunriseMinutes)
currentMinutes += 1440; currentMinutes += 1440;
}
return ((currentMinutes - sunsetMinutes) / (1440 - sunsetMinutes + sunriseMinutes) * 13569) + 12610; return ((currentMinutes - sunsetMinutes) / (1440 - sunsetMinutes + sunriseMinutes) * 13569) + 12610;
} }
} }

1
src/main/java/io/github/jack1424/realtimeweather/requests/WeatherRequestObject.java
View File

@@ -33,7 +33,6 @@ public class WeatherRequestObject {
for (Object rawCondition : conditions) { for (Object rawCondition : conditions) {
int id = Integer.parseInt(String.valueOf(((JSONObject) rawCondition).get("id"))); int id = Integer.parseInt(String.valueOf(((JSONObject) rawCondition).get("id")));
while (id >= 10) while (id >= 10)
id /= 10; id /= 10;