Merge pull request #1 from theShadowsDust/develop

Develop

Author: theShadowsDust

build.gradle.kts

@@ -1,25 +1,25 @@
-import net.minecrell.pluginyml.bukkit.BukkitPluginDescription.PluginLoadOrder
+import net.minecrell.pluginyml.bukkit.BukkitPluginDescription
 
 plugins {
     id("java")
-    id("net.minecrell.plugin-yml.bukkit") version "0.5.1"
+    id("net.minecrell.plugin-yml.paper") version "0.6.0"
     id("com.github.johnrengelman.shadow") version "7.1.2"
     id("xyz.jpenilla.run-paper") version "1.0.6"
 }
 
-group = "de.uniquegame"
-version = "1.0.0-RELEASE"
+group = "de.theshadowsdust"
+version = "2.0.0-RELEASE"
 
 repositories {
     mavenCentral()
     maven("https://papermc.io/repo/repository/maven-public/")
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT")
-    implementation("cloud.commandframework", "cloud-paper", "1.8.0")
-    implementation("cloud.commandframework", "cloud-annotations", "1.8.0")
-    implementation("cloud.commandframework", "cloud-minecraft-extras", "1.8.0")
+    compileOnly("io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT")
+    implementation("cloud.commandframework", "cloud-paper", "1.8.3")
+    implementation("cloud.commandframework", "cloud-annotations", "1.8.3")
+    implementation("cloud.commandframework", "cloud-minecraft-extras", "1.8.3")
     implementation("org.apache.commons:commons-lang3:3.12.0")
     implementation("me.lucko:commodore:2.2") {
         isTransitive = false
@@ -33,23 +33,27 @@ tasks {
         options.encoding = "UTF-8"
     }
 
-    build {
-        dependsOn(shadowJar)
-    }
-
     runServer {
-        minecraftVersion("1.19.3")
+        minecraftVersion("1.20.1")
     }
 
     shadowJar {
         archiveFileName.set("${rootProject.name}.${archiveExtension.getOrElse("jar")}")
     }
 }
 
-bukkit {
-    main = "${rootProject.group}.ultimatespawn.UltimateSpawnPlugin"
-    apiVersion = "1.19"
-    name = "UltimateSpawn"
-    load = PluginLoadOrder.POSTWORLD
-    author = "UniqueGame"
-}
+paper {
+
+    name = rootProject.name
+    author = "theShadowsDust"
+
+    main = "de.theshadowsdust.ultimatespawn.UltimateSpawnPlugin"
+    bootstrapper = "de.theshadowsdust.ultimatespawn.UltimateSpawnPluginBootstrap"
+    hasOpenClassloader = false
+
+    generateLibrariesJson = true
+    foliaSupported = true
+    apiVersion = "1.20"
+    load = BukkitPluginDescription.PluginLoadOrder.POSTWORLD
+}
+

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

gradlew.bat

@@ -1,10 +1,10 @@
-package de.uniquegame.ultimatespawn;
+package de.theshadowsdust.ultimatespawn;
 
-import de.uniquegame.ultimatespawn.listener.SpawnLocationListener;
-import de.uniquegame.ultimatespawn.service.CommandService;
-import de.uniquegame.ultimatespawn.service.ConfigurationService;
-import de.uniquegame.ultimatespawn.service.LanguageService;
-import de.uniquegame.ultimatespawn.service.SpawnPositionService;
+import de.theshadowsdust.ultimatespawn.listener.SpawnLocationListener;
+import de.theshadowsdust.ultimatespawn.service.CommandService;
+import de.theshadowsdust.ultimatespawn.service.ConfigurationService;
+import de.theshadowsdust.ultimatespawn.service.LanguageService;
+import de.theshadowsdust.ultimatespawn.service.SpawnPositionService;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;

src/main/java/de/uniquegame/ultimatespawn/UltimateSpawnPlugin.java renamed to src/main/java/de/theshadowsdust/ultimatespawn/UltimateSpawnPlugin.java

@@ -0,0 +1,21 @@
+package de.theshadowsdust.ultimatespawn;
+
+import io.papermc.paper.plugin.bootstrap.BootstrapContext;
+import io.papermc.paper.plugin.bootstrap.PluginBootstrap;
+import io.papermc.paper.plugin.bootstrap.PluginProviderContext;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+@SuppressWarnings("UnstableApiUsage")
+public class UltimateSpawnPluginBootstrap implements PluginBootstrap {
+
+    @Override
+    public void bootstrap(@NotNull BootstrapContext context) {
+        //Not needed yet!
+    }
+
+    @Override
+    public @NotNull JavaPlugin createPlugin(@NotNull PluginProviderContext context) {
+        return new UltimateSpawnPlugin();
+    }
+}

src/main/java/de/theshadowsdust/ultimatespawn/UltimateSpawnPluginBootstrap.java

@@ -1,13 +1,13 @@
-package de.uniquegame.ultimatespawn.command;
+package de.theshadowsdust.ultimatespawn.command;
 
 import cloud.commandframework.annotations.Argument;
 import cloud.commandframework.annotations.CommandDescription;
 import cloud.commandframework.annotations.CommandMethod;
 import cloud.commandframework.annotations.CommandPermission;
 import cloud.commandframework.annotations.specifier.Greedy;
-import de.uniquegame.ultimatespawn.UltimateSpawnPlugin;
-import de.uniquegame.ultimatespawn.service.LanguageService;
-import de.uniquegame.ultimatespawn.util.MessageUtil;
+import de.theshadowsdust.ultimatespawn.service.LanguageService;
+import de.theshadowsdust.ultimatespawn.util.MessageUtil;
+import de.theshadowsdust.ultimatespawn.UltimateSpawnPlugin;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/de/uniquegame/ultimatespawn/command/PluginCommands.java renamed to src/main/java/de/theshadowsdust/ultimatespawn/command/PluginCommands.java

@@ -1,4 +1,4 @@
-package de.uniquegame.ultimatespawn.command;
+package de.theshadowsdust.ultimatespawn.command;
 
 import cloud.commandframework.annotations.Argument;
 import cloud.commandframework.annotations.CommandDescription;
@@ -7,9 +7,9 @@
 import cloud.commandframework.annotations.specifier.Greedy;
 import cloud.commandframework.annotations.suggestions.Suggestions;
 import cloud.commandframework.context.CommandContext;
-import de.uniquegame.ultimatespawn.UltimateSpawnPlugin;
-import de.uniquegame.ultimatespawn.position.SpawnPosition;
-import de.uniquegame.ultimatespawn.service.LanguageService;
+import de.theshadowsdust.ultimatespawn.position.SpawnPosition;
+import de.theshadowsdust.ultimatespawn.service.LanguageService;
+import de.theshadowsdust.ultimatespawn.UltimateSpawnPlugin;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;

src/main/java/de/uniquegame/ultimatespawn/command/RemoveSpawnCommand.java renamed to src/main/java/de/theshadowsdust/ultimatespawn/command/RemoveSpawnCommand.java

@@ -1,8 +1,8 @@
-package de.uniquegame.ultimatespawn.command;
+package de.theshadowsdust.ultimatespawn.command;
 
 import cloud.commandframework.annotations.*;
-import de.uniquegame.ultimatespawn.UltimateSpawnPlugin;
-import de.uniquegame.ultimatespawn.service.LanguageService;
+import de.theshadowsdust.ultimatespawn.service.LanguageService;
+import de.theshadowsdust.ultimatespawn.UltimateSpawnPlugin;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;