diff --git a/build.gradle b/build.gradle index 19dcdb9..e47cc33 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ plugins { id "java" id "maven-publish" - id "net.minecrell.plugin-yml.bukkit" version "0.6.1-SNAPSHOT" - id 'com.github.johnrengelman.shadow' version '7.1.2' + id "net.minecrell.plugin-yml.bukkit" version "0.6.0" + id "com.gradleup.shadow" version "8.3.3" } group = "me.totalfreedom" -version = "4.8" +version = "4.9" description = "BukkitTelnet" repositories { @@ -23,15 +23,16 @@ repositories { } dependencies { - compileOnly "io.papermc.paper:paper-api:1.18.2-R0.1-SNAPSHOT" - annotationProcessor "org.projectlombok:lombok:1.18.24" - library "org.projectlombok:lombok:1.18.24" - library "org.json:json:20220320" - compileOnly("com.github.MilkBowl:VaultAPI:1.7") { + compileOnly "io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT" + annotationProcessor "org.projectlombok:lombok:1.18.34" + library "org.projectlombok:lombok:1.18.34" + library "org.json:json:20240303" + compileOnly("com.github.MilkBowl:VaultAPI:1.7.1") { exclude group: "org.bukkit", module: "bukkit" } - library "org.apache.logging.log4j:log4j-api:2.17.2" - library "org.apache.logging.log4j:log4j-core:2.17.2" + implementation "org.apache.commons:commons-lang3:3.17.0" + library "org.apache.logging.log4j:log4j-api:2.24.1" + library "org.apache.logging.log4j:log4j-core:2.24.1" } tasks { jar { @@ -40,7 +41,7 @@ tasks { } java { - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) + toolchain.languageVersion.set(JavaLanguageVersion.of(21)) } tasks.withType(JavaCompile) { @@ -50,7 +51,7 @@ tasks.withType(JavaCompile) { bukkit { name = "BukkitTelnet" main = "me.totalfreedom.bukkittelnet.BukkitTelnet" - apiVersion = "1.18" + apiVersion = "1.20" version = project.version description = "Telnet console access plugin." authors = ["bekvon", "Madgeek1450", "Prozza", "Taahh", "Telesphoreo"] diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..41d9927 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index aa991fc..1e2fbf0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index c53aefa..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: # * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». # # Important for patching: # diff --git a/settings.gradle b/settings.gradle index 5e44f85..8a01f58 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,9 +1,6 @@ pluginManagement { repositories { gradlePluginPortal() - maven { - url = uri("https://nexus.telesphoreo.me/repository/gradle-plugins/") - } } } -rootProject.name = 'bukkittelnet' +rootProject.name = 'BukkitTelnet' diff --git a/src/main/java/me/totalfreedom/bukkittelnet/PlayerEventListener.java b/src/main/java/me/totalfreedom/bukkittelnet/PlayerEventListener.java index 09c5414..a2e34bd 100644 --- a/src/main/java/me/totalfreedom/bukkittelnet/PlayerEventListener.java +++ b/src/main/java/me/totalfreedom/bukkittelnet/PlayerEventListener.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.Map; import me.totalfreedom.bukkittelnet.api.TelnetRequestDataTagsEvent; import me.totalfreedom.bukkittelnet.api.TelnetRequestUsageEvent; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/me/totalfreedom/bukkittelnet/TelnetLogger.java b/src/main/java/me/totalfreedom/bukkittelnet/TelnetLogger.java index 47f130c..4f9a74d 100644 --- a/src/main/java/me/totalfreedom/bukkittelnet/TelnetLogger.java +++ b/src/main/java/me/totalfreedom/bukkittelnet/TelnetLogger.java @@ -1,7 +1,7 @@ package me.totalfreedom.bukkittelnet; import java.util.logging.Logger; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; public final class TelnetLogger { diff --git a/src/main/java/me/totalfreedom/bukkittelnet/thirdparty/YamlConfig.java b/src/main/java/me/totalfreedom/bukkittelnet/thirdparty/YamlConfig.java index 91f2de5..3e52243 100644 --- a/src/main/java/me/totalfreedom/bukkittelnet/thirdparty/YamlConfig.java +++ b/src/main/java/me/totalfreedom/bukkittelnet/thirdparty/YamlConfig.java @@ -3,7 +3,7 @@ package me.totalfreedom.bukkittelnet.thirdparty; import java.io.File; import java.io.IOException; import java.io.InputStreamReader; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.logging.log4j.core.util.IOUtils; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.plugin.Plugin; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index a75d3c8..f1b2ab9 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,4 +1,4 @@ -# BukkitTelnet v4.8 Configuration File +# BukkitTelnet v4.9 Configuration File # Address to listen on, leave blank for all address: ''