Merge pull request #22 from DoJapHD/dev

Update to Java 21

.gitignore

@@ -133,4 +133,6 @@ docs/generated/
 run/
 
 # LabyGradle | Addon Plugin
-build-data.txt
+build-data.txt
+
+.assetsroot

api/build.gradle.kts

@@ -6,21 +6,13 @@ plugins {
 
 dependencies {
     labyApi("api")
-
-    // If you want to use external libraries, you can do that here.
-    // The dependencies that are specified here are loaded into your project but will also
-    // automatically be downloaded by labymod, but only if the repository is public.
-    // If it is private, you have to add and compile the dependency manually.
-    // You have to specify the repository, there are getters for maven central and sonatype, every
-    // other repository has to be specified with their url. Example:
-    // maven(mavenCentral(), "org.apache.httpcomponents:httpclient:4.5.13")
 }
 
 labyModProcessor {
     referenceType = net.labymod.gradle.core.processor.ReferenceType.INTERFACE
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }

build.gradle.kts

@@ -4,11 +4,10 @@ plugins {
     id("net.labymod.gradle.addon")
 }
 
-
 java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 
 labyMod {
-    defaultPackageName = "de.dojaphd.sendserver.core" //change this to your main package name (used by all modules)
+    defaultPackageName = "de.dojaphd.sendserver.core"
     addonInfo {
         namespace = "sendserveraddon"
         displayName = "Send To Server"
@@ -22,6 +21,7 @@ labyMod {
         registerVersions(
                 "1.8.9",
                 "1.12.2",
+                "1.16.5",
                 "1.17.1",
                 "1.18.2",
                 "1.19.2",
@@ -70,7 +70,11 @@ fun configureRun(provider: net.labymod.gradle.core.minecraft.provider.VersionPro
         args("--addon-dev-environment", "true")
     }
 
-    provider.javaVersion = JavaVersion.VERSION_17
+    provider.javaVersion = when (gameVersion) {
+        else -> {
+            JavaVersion.VERSION_21
+        }
+    }
 
     provider.mixin {
         val mixinMinVersion = when (gameVersion) {

core/build.gradle.kts

@@ -1,30 +1,15 @@
 version = "0.1.0"
-
 plugins {
     id("java-library")
 }
-
 dependencies {
     api(project(":api"))
-
-    // If you want to use external libraries, you can do that here.
-    // The dependencies that are specified here are loaded into your project but will also
-    // automatically be downloaded by labymod, but only if the repository is public.
-    // If it is private, you have to add and compile the dependency manually.
-    // You have to specify the repository, there are getters for maven central and sonatype, every
-    // other repository has to be specified with their url. Example:
-    // maven(mavenCentral(), "org.apache.httpcomponents:httpclient:4.5.13")
 }
-
 labyModProcessor {
     referenceType = net.labymod.gradle.core.processor.ReferenceType.DEFAULT
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
-
-tasks.withType<JavaCompile> {
-    options.encoding = "UTF-8"
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }

gradle/wrapper/gradle-wrapper.properties

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

settings.gradle.kts

@@ -1,7 +1,7 @@
 rootProject.name = "sendserveraddon"
 
 pluginManagement {
-    val labyGradlePluginVersion = "0.3.44"
+    val labyGradlePluginVersion = "0.3.48"
     plugins {
         id("net.labymod.gradle") version (labyGradlePluginVersion)
     }