diff --git a/build.gradle.kts b/build.gradle.kts index e21850e..63663e9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,16 +1,19 @@ +import org.gradle.api.artifacts.repositories.AuthenticationSupported +import org.gradle.authentication.http.HttpHeaderAuthentication +import org.gradle.api.credentials.HttpHeaderCredentials + plugins { java `maven-publish` id("com.gradleup.shadow") version "9.0.0-beta4" - id("io.papermc.paperweight.userdev") version "2.0.0-beta.10" + id("io.papermc.paperweight.userdev") version "2.0.0-beta.17" id("org.sonarqube") version "5.1.0.4882" } group = "me.unurled" -version = "0.2.0" +version = "0.3.0" val mcVersion = "1.21.4-R0.1-SNAPSHOT" -val lampVersion = "4.0.0-beta.17" val javaVersion = 23 @@ -22,10 +25,6 @@ repositories { dependencies { paperweight.paperDevBundle(mcVersion) - implementation("io.github.revxrsal:lamp.common:${lampVersion}") - implementation("io.github.revxrsal:lamp.bukkit:${lampVersion}") - implementation("io.github.revxrsal:lamp.brigadier:${lampVersion}") - implementation("io.github.revxrsal:lamp.paper:${lampVersion}") } java { @@ -66,11 +65,14 @@ tasks.register("javadocJar") { publishing { repositories { maven { - name = "repounurledme" - url = uri("https://repo.unurled.me/releases") - credentials(PasswordCredentials::class) + name = "SacredRealms" + url = uri("https://git.unurled.me/api/packages/SacredRealms/maven") + credentials(HttpHeaderCredentials::class) { + name = "Authorization" + value = "token " + project.findProperty("mavenToken") + } authentication { - create("basic") + create("header") } } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b9..1b33c55 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 cea7a79..ff23a68 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6..23d15a9 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -115,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -206,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. @@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9b42019..5eed7ee 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/src/main/java/me/unurled/srcore/SRCore.java b/src/main/java/me/unurled/srcore/SRCore.java index e9a3d4c..6267572 100644 --- a/src/main/java/me/unurled/srcore/SRCore.java +++ b/src/main/java/me/unurled/srcore/SRCore.java @@ -8,9 +8,6 @@ import org.bukkit.plugin.Plugin; import org.bukkit.plugin.java.JavaPlugin; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import revxrsal.commands.Lamp; -import revxrsal.commands.bukkit.BukkitLamp; -import revxrsal.commands.bukkit.actor.BukkitCommandActor; /** The SRCore class is a class that is used to manage the core of the plugin. */ public final class SRCore { @@ -18,7 +15,6 @@ public final class SRCore { private static SRCore instance; private final Managers managers; private Plugin plugin; - private Lamp lamp; private SRCore() { managers = new Managers(); @@ -67,7 +63,6 @@ public final class SRCore { } this.plugin = plugin; - lamp = BukkitLamp.builder((JavaPlugin) plugin).build(); } private @Nullable Plugin tryFindPlugin() { @@ -102,14 +97,4 @@ public final class SRCore { public void unload() { managers.unload(); } - - /** - * Return Lamp command processor - * - * @return null if {@link SRCore#setPlugin(Plugin)} is not already called - */ - @Nullable - public Lamp lamp() { - return lamp; - } }