From d2796f79923b9447d4a576fe0b021e04494c6221 Mon Sep 17 00:00:00 2001 From: Jack <55409055+Jack1424@users.noreply.github.com> Date: Tue, 23 Jul 2024 23:04:32 -0400 Subject: [PATCH] move project to Java 21 and the 1.21 Paper API --- .travis.yml | 2 +- build.gradle | 22 ++++++++++--------- .../realtimeweather/ConfigManager.java | 4 ++-- .../realtimeweather/EventHandlers.java | 2 +- .../realtimeweather/RealTimeWeather.java | 7 +++--- .../requests/RequestFunctions.java | 2 +- .../requests/SunriseSunsetRequestObject.java | 2 +- .../requests/WeatherRequestObject.java | 2 +- src/main/resources/config.yml | 2 +- src/main/resources/plugin.yml | 9 ++++---- 10 files changed, 28 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index 14f7cf4..e81ef57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,2 @@ language: java -jdk: openjdk17 \ No newline at end of file +jdk: openjdk21 \ No newline at end of file diff --git a/build.gradle b/build.gradle index d6dbd5d..769265c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,33 +1,33 @@ 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' -version = '1.4.0' +group = 'io.github.jack1424' +version = '2.0.0-DEV' repositories { mavenCentral() maven { - name = 'papermc-repo' - url = 'https://repo.papermc.io/repository/maven-public/' + name = "papermc-repo" + url = "https://repo.papermc.io/repository/maven-public/" } maven { - name = 'sonatype' - url = 'https://oss.sonatype.org/content/groups/public/' + name = "sonatype" + 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') } -def targetJavaVersion = 11 +def targetJavaVersion = 21 java { def javaVersion = JavaVersion.toVersion(targetJavaVersion) sourceCompatibility = javaVersion @@ -38,8 +38,10 @@ java { } tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' + if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { - options.release = targetJavaVersion + options.release.set(targetJavaVersion) } } diff --git a/src/main/java/io/github/jack1424/realtimeweather/ConfigManager.java b/src/main/java/io/github/jack1424/realtimeweather/ConfigManager.java index 9dda9fe..48865d2 100644 --- a/src/main/java/io/github/jack1424/realtimeweather/ConfigManager.java +++ b/src/main/java/io/github/jack1424/realtimeweather/ConfigManager.java @@ -1,6 +1,6 @@ -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; diff --git a/src/main/java/io/github/jack1424/realtimeweather/EventHandlers.java b/src/main/java/io/github/jack1424/realtimeweather/EventHandlers.java index 910a4c6..fdcda13 100644 --- a/src/main/java/io/github/jack1424/realtimeweather/EventHandlers.java +++ b/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; diff --git a/src/main/java/io/github/jack1424/realtimeweather/RealTimeWeather.java b/src/main/java/io/github/jack1424/realtimeweather/RealTimeWeather.java index ce4215f..787bd69 100644 --- a/src/main/java/io/github/jack1424/realtimeweather/RealTimeWeather.java +++ b/src/main/java/io/github/jack1424/realtimeweather/RealTimeWeather.java @@ -1,6 +1,6 @@ -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.World; @@ -11,7 +11,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; @@ -124,7 +123,7 @@ public final class RealTimeWeather extends JavaPlugin { config.setWeatherEnabled(false); return; } - + for (World world : config.getWeatherSyncWorlds()) world.setGameRuleValue("doWeatherCycle", "false"); diff --git a/src/main/java/io/github/jack1424/realtimeweather/requests/RequestFunctions.java b/src/main/java/io/github/jack1424/realtimeweather/requests/RequestFunctions.java index 119e55c..d869ebc 100644 --- a/src/main/java/io/github/jack1424/realtimeweather/requests/RequestFunctions.java +++ b/src/main/java/io/github/jack1424/realtimeweather/requests/RequestFunctions.java @@ -1,4 +1,4 @@ -package io.github.jack1424.realtimeweather.requests; +package io.github.jack1424.realTimeWeather.requests; import org.json.simple.JSONArray; import org.json.simple.JSONObject; diff --git a/src/main/java/io/github/jack1424/realtimeweather/requests/SunriseSunsetRequestObject.java b/src/main/java/io/github/jack1424/realtimeweather/requests/SunriseSunsetRequestObject.java index 70bd9d9..8ff5a6c 100644 --- a/src/main/java/io/github/jack1424/realtimeweather/requests/SunriseSunsetRequestObject.java +++ b/src/main/java/io/github/jack1424/realtimeweather/requests/SunriseSunsetRequestObject.java @@ -1,4 +1,4 @@ -package io.github.jack1424.realtimeweather.requests; +package io.github.jack1424.realTimeWeather.requests; import org.json.simple.JSONObject; import org.json.simple.parser.ParseException; diff --git a/src/main/java/io/github/jack1424/realtimeweather/requests/WeatherRequestObject.java b/src/main/java/io/github/jack1424/realtimeweather/requests/WeatherRequestObject.java index 0a215d3..5a63872 100644 --- a/src/main/java/io/github/jack1424/realtimeweather/requests/WeatherRequestObject.java +++ b/src/main/java/io/github/jack1424/realtimeweather/requests/WeatherRequestObject.java @@ -1,4 +1,4 @@ -package io.github.jack1424.realtimeweather.requests; +package io.github.jack1424.realTimeWeather.requests; import org.json.simple.JSONArray; import org.json.simple.JSONObject; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 4cb1acf..48813e6 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,4 +1,4 @@ -# RealTimeWeather Configuration File (v1.4.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 ################################################## diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 889e184..9e5db46 100644 --- a/src/main/resources/plugin.yml +++ b/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 -main: io.github.jack1424.realtimeweather.RealTimeWeather +description: Sync your Minecraft server's time and weather with the real world +api-version: '1.21' load: POSTWORLD -authors: [Jack1424] -website: https://github.com/Jack1424/RealTimeWeather +author: Jack1424 +website: github.com/Jack1424/RealTimeWeather