Compare commits

..

10 Commits

Author SHA1 Message Date
51395dee10 Update dependencies 2025-12-12 17:10:16 -07:00
1b778b2815 Changes 2025-08-04 23:22:54 -07:00
078d0ad450 Merge pull request #6 from GalaxyNetwork-org/renovate/org.sayandev.stickynote.settings-1.x
Update plugin org.sayandev.stickynote.settings to v1.10.4.52
2025-08-04 23:22:11 -07:00
renovate[bot]
8265495554 Update plugin org.sayandev.stickynote.settings to v1.10.4.52 2025-08-03 13:36:24 +00:00
532ac5cb4a Merge pull request #4 from GalaxyNetwork-org/renovate/org.jetbrains.kotlin.jvm-2.x
Update plugin org.jetbrains.kotlin.jvm to v2.2.0
2025-08-02 13:34:15 -07:00
462bf3b19b Merge pull request #5 from GalaxyNetwork-org/renovate/gradle-9.x
Update dependency gradle to v9
2025-08-02 13:33:38 -07:00
da7d2f7d19 Merge pull request #3 from GalaxyNetwork-org/renovate/org.sayandev.stickynote.settings-1.x
Update plugin org.sayandev.stickynote.settings to v1.10.4.45
2025-08-02 13:33:28 -07:00
renovate[bot]
a38819284f Update plugin org.sayandev.stickynote.settings to v1.10.4.45 2025-08-02 17:48:35 +00:00
renovate[bot]
a309c71881 Update dependency gradle to v9 2025-08-01 12:53:53 +00:00
renovate[bot]
f132ad3705 Update plugin org.jetbrains.kotlin.jvm to v2.2.0 2025-08-01 05:23:02 +00:00
6 changed files with 106 additions and 117 deletions

2
.gitattributes vendored
View File

@@ -1,2 +0,0 @@
# Auto detect text files and perform LF normalization
* text=auto

View File

@@ -2,9 +2,8 @@ import org.sayandev.plugin.StickyNoteModules
plugins { plugins {
java java
kotlin("jvm") version "2.1.20" id("xyz.jpenilla.run-paper") version "3.0.2"
id("xyz.jpenilla.run-paper") version "2.3.1" id("de.eldoria.plugin-yml.bukkit") version "0.8.0"
id("de.eldoria.plugin-yml.bukkit") version "0.7.1"
id("org.sayandev.stickynote.project") id("org.sayandev.stickynote.project")
} }
@@ -29,10 +28,11 @@ repositories {
} }
dependencies { dependencies {
compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT") compileOnly("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT")
compileOnly("me.clip:placeholderapi:2.11.6") compileOnly("me.clip:placeholderapi:2.11.7")
compileOnly("com.github.booksaw:BetterTeams:4.13.4") compileOnly("com.github.booksaw:BetterTeams:4.15.2")
compileOnly("me.confuser.banmanager:BanManagerCommon:7.9.0") compileOnly("me.confuser.banmanager:BanManagerCommon:7.9.0")
implementation("com.googlecode.json-simple:json-simple:1.1.1")
} }
tasks { tasks {
@@ -52,7 +52,7 @@ tasks {
} }
runServer { runServer {
minecraftVersion("1.21.4") minecraftVersion("1.21.10")
jvmArgs() jvmArgs()
} }
@@ -77,8 +77,7 @@ tasks {
expand( expand(
"version" to project.version as String, "version" to project.version as String,
"slug" to slug, "slug" to slug,
"name" to rootProject.name, "name" to rootProject.name
"description" to project.description
) )
} }
} }
@@ -88,7 +87,7 @@ bukkit {
main = "$group.${slug}.${rootProject.name}Plugin" main = "$group.${slug}.${rootProject.name}Plugin"
version = rootProject.version.toString() version = rootProject.version.toString()
website = "lncvrt.xyz" website = "lncvrt.xyz"
apiVersion = "1.21" apiVersion = "1.21.10"
depend = listOf("PlaceholderAPI", "BetterTeams", "BanManager") depend = listOf("PlaceholderAPI", "BetterTeams", "BanManager")
authors = listOf("Lncvrt") authors = listOf("Lncvrt")
prefix = rootProject.name prefix = rootProject.name
@@ -96,9 +95,5 @@ bukkit {
java { java {
disableAutoTargetJvm() disableAutoTargetJvm()
if (gradle.startParameter.getTaskNames().any { it.startsWith("runServer") || it.startsWith("runFolia") || it.startsWith("runVelocity") }) { toolchain.languageVersion.set(JavaLanguageVersion.of(21))
toolchain.languageVersion.set(JavaLanguageVersion.of(21)) }
} else {
toolchain.languageVersion.set(JavaLanguageVersion.of(21))
}
}

Binary file not shown.

5
gradlew vendored
View File

@@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# Copyright © 2015-2021 the original authors. # Copyright © 2015 the original authors.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;; NONSTOP* ) nonstop=true ;;
esac esac
CLASSPATH="\\\"\\\""
# Determine the Java command to use to start the JVM. # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
# For Cygwin or MSYS, switch paths to Windows format before running java # For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" ) JAVACMD=$( cygpath --unix "$JAVACMD" )
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
set -- \ set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \ "-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@" "$@"

187
gradlew.bat vendored
View File

@@ -1,94 +1,93 @@
@rem @rem
@rem Copyright 2015 the original author or authors. @rem Copyright 2015 the original author or authors.
@rem @rem
@rem Licensed under the Apache License, Version 2.0 (the "License"); @rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License. @rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at @rem You may obtain a copy of the License at
@rem @rem
@rem https://www.apache.org/licenses/LICENSE-2.0 @rem https://www.apache.org/licenses/LICENSE-2.0
@rem @rem
@rem Unless required by applicable law or agreed to in writing, software @rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS, @rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and @rem See the License for the specific language governing permissions and
@rem limitations under the License. @rem limitations under the License.
@rem @rem
@rem SPDX-License-Identifier: Apache-2.0 @rem SPDX-License-Identifier: Apache-2.0
@rem @rem
@if "%DEBUG%"=="" @echo off @if "%DEBUG%"=="" @echo off
@rem ########################################################################## @rem ##########################################################################
@rem @rem
@rem Gradle startup script for Windows @rem Gradle startup script for Windows
@rem @rem
@rem ########################################################################## @rem ##########################################################################
@rem Set local scope for the variables with windows NT shell @rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0 set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=. if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused @rem This is normally unused
set APP_BASE_NAME=%~n0 set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter. @rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe @rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute if %ERRORLEVEL% equ 0 goto execute
echo. 1>&2 echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2 echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2 echo location of your Java installation. 1>&2
goto fail goto fail
:findJavaFromJavaHome :findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=% set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute if exist "%JAVA_EXE%" goto execute
echo. 1>&2 echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2 echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2 echo location of your Java installation. 1>&2
goto fail goto fail
:execute :execute
@rem Setup the command line @rem Setup the command line
set CLASSPATH=
@rem Execute Gradle
@rem Execute Gradle "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
"%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
:end @rem End local scope for the variables with windows NT shell
@rem End local scope for the variables with windows NT shell if %ERRORLEVEL% equ 0 goto mainEnd
if %ERRORLEVEL% equ 0 goto mainEnd
:fail
:fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code!
rem the _cmd.exe /c_ return code! set EXIT_CODE=%ERRORLEVEL%
set EXIT_CODE=%ERRORLEVEL% if %EXIT_CODE% equ 0 set EXIT_CODE=1
if %EXIT_CODE% equ 0 set EXIT_CODE=1 if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% exit /b %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd
:mainEnd if "%OS%"=="Windows_NT" endlocal
if "%OS%"=="Windows_NT" endlocal
:omega
:omega

View File

@@ -9,6 +9,6 @@ pluginManagement {
} }
plugins { plugins {
id("org.sayandev.stickynote.settings") version "1.10.4.41"} id("org.sayandev.stickynote.settings") version "1.10.5.22"}
rootProject.name = "GalaxyBoxPvP" rootProject.name = "GalaxyBoxPvP"