Merge pull request #20 from NightMirror21/19-console-error-and-update…

…-to-1204 19 console error and update to 1204
NightMirror21 · Jan 16, 2024 · 3129b16 · 3129b16
2 parents 3fb5ee8 + ac265bc
commit 3129b16
Show file tree

Hide file tree

Showing 14 changed files with 123 additions and 63 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ sourceCompatibility = javaVersion;
 targetCompatibility = javaVersion;
 
 group = 'ru.nightmirror'
-version = '1.0.0'
+version = '1.0.1'
 description = 'WhitelistByTime'
 
 repositories {

diff --git a/core/build.gradle b/core/build.gradle
@@ -8,7 +8,7 @@ sourceCompatibility = javaVersion;
 targetCompatibility = javaVersion;
 
 group 'ru.nightmirror'
-version '1.0.0'
+version = rootProject.version
 
 repositories {
     mavenCentral()

diff --git a/folia/build.gradle b/folia/build.gradle
@@ -8,7 +8,7 @@ sourceCompatibility = javaVersion;
 targetCompatibility = javaVersion;
 
 group = 'ru.nightmirror'
-version = '1.0.0'
+version = rootProject.version
 description = 'WhitelistByTime-Folia'
 
 compileJava.options.encoding = "UTF-8"
@@ -36,9 +36,18 @@ repositories {
     }
 }
 
+processResources {
+    def props = [version: version]
+    inputs.properties props
+    filteringCharset 'UTF-8'
+    filesMatching('plugin.yml') {
+        expand props
+    }
+}
+
 dependencies {
     shadow project(path: ':core', configuration: 'default')
-    compileOnly 'dev.folia:folia-api:1.19.4-R0.1-SNAPSHOT'
+    compileOnly 'dev.folia:folia-api:1.20.2-R0.1-SNAPSHOT'
     compileOnly 'net.kyori:adventure-text-minimessage:4.14.0'
     implementation 'org.bstats:bstats-bukkit:3.0.1'
     compileOnly 'me.clip:placeholderapi:2.11.3'

diff --git a/folia/src/main/java/ru/nightmirror/wlbytime/WhitelistByTime.java b/folia/src/main/java/ru/nightmirror/wlbytime/WhitelistByTime.java
@@ -2,7 +2,6 @@
 
 import lombok.AccessLevel;
 import lombok.experimental.FieldDefaults;
-import org.bstats.bukkit.Metrics;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.event.HandlerList;
@@ -20,6 +19,7 @@
 import ru.nightmirror.wlbytime.common.listeners.WhitelistCmdListener;
 import ru.nightmirror.wlbytime.common.placeholder.PlaceholderHook;
 import ru.nightmirror.wlbytime.common.utils.ConfigUtils;
+import ru.nightmirror.wlbytime.common.utils.MetricsLoader;
 import ru.nightmirror.wlbytime.interfaces.IWhitelist;
 import ru.nightmirror.wlbytime.interfaces.checker.Checker;
 
@@ -42,7 +42,6 @@ public class WhitelistByTime extends JavaPlugin implements IWhitelist {
     WLDatabase database;
     Checker checker;
     PlaceholderHook placeholderHook;
-    Metrics metrics;
 
     public static void info(String message) {
         if (log != null) log.info(message);
@@ -85,7 +84,6 @@ public void onDisable() {
         HandlerList.unregisterAll(this);
 
         if (placeholderHook != null) placeholderHook.unregister();
-        if (metrics != null) metrics.shutdown();
         if (checker != null) checker.stop();
         if (database != null) database.close();
 
@@ -161,7 +159,11 @@ private void hookPlaceholder() {
     }
 
     private void initMetrics() {
-        new Metrics(this, 13834);
+        try {
+            new MetricsLoader(this);
+        } catch (Exception exception) {
+            info("Failed to start collecting metrics. The plugin will continue working, but metrics will not be collected.");
+        }
     }
 
     @Override

diff --git a/folia/src/main/java/ru/nightmirror/wlbytime/common/utils/MetricsLoader.java b/folia/src/main/java/ru/nightmirror/wlbytime/common/utils/MetricsLoader.java
@@ -0,0 +1,12 @@
+package ru.nightmirror.wlbytime.common.utils;
+
+
+import org.bstats.bukkit.Metrics;
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class MetricsLoader {
+
+    public MetricsLoader(JavaPlugin plugin) throws ClassNotFoundException {
+        new Metrics(plugin, 13834);
+    }
+}
diff --git a/folia/src/main/resources/plugin.yml b/folia/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: WhitelistByTime
 main: ru.nightmirror.wlbytime.WhitelistByTime
-version: 1.0.0
+version: '${version}'
 author: NightMirror
 description: Adding a player to the whitelist for a time
 api-version: 1.16

diff --git a/paper/build.gradle b/paper/build.gradle
@@ -3,12 +3,12 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '7.1.2'
 }
 
-def javaVersion = JavaVersion.VERSION_16;
+def javaVersion = JavaVersion.VERSION_17;
 sourceCompatibility = javaVersion;
 targetCompatibility = javaVersion;
 
 group = 'ru.nightmirror'
-version = '1.0.0'
+version = rootProject.version
 description = 'WhitelistByTime-Paper'
 
 compileJava.options.encoding = "UTF-8"
@@ -17,11 +17,6 @@ compileTestJava.options.encoding = "UTF-8"
 repositories {
     mavenCentral()
 
-    maven {
-        name 'dmulloy2-repo'
-        url 'https://repo.dmulloy2.net/repository/public/'
-    }
-
     maven {
         name 'papermc-repo'
         url 'https://repo.papermc.io/repository/maven-public/'
@@ -38,7 +33,7 @@ repositories {
 
 dependencies {
     shadow project(path: ':core', configuration: 'default')
-    compileOnly 'com.destroystokyo.paper:paper-api:1.16.5-R0.1-SNAPSHOT'
+    compileOnly 'io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT'
     compileOnly 'net.kyori:adventure-text-minimessage:4.14.0'
     implementation 'org.bstats:bstats-bukkit:3.0.1'
     compileOnly 'me.clip:placeholderapi:2.11.3'
@@ -52,4 +47,17 @@ shadowJar {
     archiveClassifier.set(null)
     configurations = [project.configurations.runtimeClasspath, project.configurations.shadow]
     archiveFileName.set(project.description + '-' + project.version + '.jar')
+}
+
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+}
+
+processResources {
+    def props = [version: version]
+    inputs.properties props
+    filteringCharset 'UTF-8'
+    filesMatching('plugin.yml') {
+        expand props
+    }
 }
diff --git a/paper/src/main/java/ru/nightmirror/wlbytime/WhitelistByTime.java b/paper/src/main/java/ru/nightmirror/wlbytime/WhitelistByTime.java
@@ -2,7 +2,6 @@
 
 import lombok.AccessLevel;
 import lombok.experimental.FieldDefaults;
-import org.bstats.bukkit.Metrics;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.event.HandlerList;
@@ -21,16 +20,14 @@
 import ru.nightmirror.wlbytime.common.placeholder.PlaceholderHook;
 import ru.nightmirror.wlbytime.common.utils.BukkitSyncer;
 import ru.nightmirror.wlbytime.common.utils.ConfigUtils;
+import ru.nightmirror.wlbytime.common.utils.MetricsLoader;
 import ru.nightmirror.wlbytime.interfaces.IWhitelist;
 import ru.nightmirror.wlbytime.interfaces.checker.Checker;
-import ru.nightmirror.wlbytime.interfaces.listener.EventListener;
 
 import java.sql.SQLException;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Objects;
 import java.util.logging.Logger;
 
@@ -47,7 +44,18 @@ public class WhitelistByTime extends JavaPlugin implements IWhitelist {
     WLDatabase database;
     Checker checker;
     PlaceholderHook placeholderHook;
-    Metrics metrics;
+
+    public static void info(String message) {
+        if (log != null) log.info(message);
+    }
+
+    public static void warn(String message) {
+        if (log != null) log.warning(message);
+    }
+
+    public static void error(String message) {
+        if (log != null) log.severe(message);
+    }
 
     @Override
     public void onEnable() {
@@ -79,7 +87,6 @@ public void onDisable() {
         HandlerList.unregisterAll(this);
 
         if (placeholderHook != null) placeholderHook.unregister();
-        if (metrics != null) metrics.shutdown();
         if (checker != null) checker.stop();
         if (database != null) database.close();
 
@@ -128,7 +135,7 @@ private void initDatabase() throws SQLException {
 
     private void initCommandsAndListeners() {
         getServer().getPluginManager().registerEvents(new WhitelistCmdListener(new CommandsExecutor(database, this, timeConvertor)), this);
-        getServer().getPluginManager().registerEvents(new PlayerLoginListener(database, getConfig().getBoolean("case-sensitive", false),this), this);
+        getServer().getPluginManager().registerEvents(new PlayerLoginListener(database, getConfig().getBoolean("case-sensitive", false), this), this);
 
         getCommand("whitelist").setExecutor(new WhitelistCommandExecutor(new CommandsExecutor(database, this, timeConvertor)));
         getCommand("whitelist").setTabCompleter(new WhitelistTabCompleter(database, this));
@@ -155,7 +162,11 @@ private void hookPlaceholder() {
     }
 
     private void initMetrics() {
-        new Metrics(this, 13834);
+        try {
+            new MetricsLoader(this);
+        } catch (Exception exception) {
+            info("Failed to start collecting metrics. The plugin will continue working, but metrics will not be collected.");
+        }
     }
 
     @Override
@@ -172,17 +183,4 @@ public void setWhitelistEnabled(boolean mode) {
     public FileConfiguration getPluginConfig() {
         return getConfig();
     }
-
-
-    public static void info(String message) {
-        if (log != null) log.info(message);
-    }
-
-    public static void warn(String message) {
-        if (log != null) log.warning(message);
-    }
-
-    public static void error(String message) {
-        if (log != null) log.severe(message);
-    }
 }
diff --git a/paper/src/main/java/ru/nightmirror/wlbytime/common/utils/MetricsLoader.java b/paper/src/main/java/ru/nightmirror/wlbytime/common/utils/MetricsLoader.java
@@ -0,0 +1,12 @@
+package ru.nightmirror.wlbytime.common.utils;
+
+
+import org.bstats.bukkit.Metrics;
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class MetricsLoader {
+
+    public MetricsLoader(JavaPlugin plugin) throws ClassNotFoundException {
+        new Metrics(plugin, 13834);
+    }
+}
diff --git a/paper/src/main/resources/plugin.yml b/paper/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: WhitelistByTime
 main: ru.nightmirror.wlbytime.WhitelistByTime
-version: 1.0.0
+version: '${version}'
 author: NightMirror
 description: Adding a player to the whitelist for a time
 api-version: 1.16

diff --git a/spigot/build.gradle b/spigot/build.gradle
@@ -8,7 +8,7 @@ sourceCompatibility = javaVersion;
 targetCompatibility = javaVersion;
 
 group = 'ru.nightmirror'
-version = '1.0.0'
+version = rootProject.version
 description = 'WhitelistByTime-Spigot'
 
 compileJava.options.encoding = "UTF-8"
@@ -32,7 +32,7 @@ repositories {
 
 dependencies {
     shadow project(path: ':core', configuration: 'default')
-    compileOnly 'org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot-api:1.20.4-R0.1-SNAPSHOT'
     implementation 'org.bstats:bstats-bukkit:3.0.1'
     compileOnly 'me.clip:placeholderapi:2.11.3'
     compileOnly 'org.jetbrains:annotations:24.0.1'
@@ -45,4 +45,13 @@ shadowJar {
     archiveClassifier.set(null)
     configurations = [project.configurations.runtimeClasspath, project.configurations.shadow]
     archiveFileName.set(project.description + '-' + project.version + '.jar')
+}
+
+processResources {
+    def props = [version: version]
+    inputs.properties props
+    filteringCharset 'UTF-8'
+    filesMatching('plugin.yml') {
+        expand props
+    }
 }