From 36a98773935de30d47f80c198bb1fa8d54813124 Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Fri, 16 Aug 2024 10:48:17 +0200
Subject: [PATCH] Fix KotlinCore

---
 KotlinCore/build.gradle.kts | 23 +++--------------------
 settings.gradle.kts         |  2 ++
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/KotlinCore/build.gradle.kts b/KotlinCore/build.gradle.kts
index 6c16669c..ce04fba5 100644
--- a/KotlinCore/build.gradle.kts
+++ b/KotlinCore/build.gradle.kts
@@ -18,19 +18,14 @@
  */
 
 plugins {
-    id("java")
+    steamwar.java
     kotlin("jvm") version "2.0.0"
-
-    id("com.github.johnrengelman.shadow")
+    alias(libs.plugins.shadow)
 }
 
 group = "de.steamwar"
 version = ""
 
-tasks.compileJava {
-    options.encoding = "UTF-8"
-}
-
 tasks.build {
     finalizedBy(tasks.shadowJar)
 }
@@ -44,22 +39,10 @@ java {
     targetCompatibility = JavaVersion.VERSION_21
 }
 
-sourceSets {
-    main {
-        java {
-            srcDirs("src/")
-        }
-        resources {
-            srcDirs("src/")
-            exclude("**/*.java", "**/*.kt")
-        }
-    }
-}
-
 dependencies {
     implementation(kotlin("reflect"))
 
-    compileOnly("io.papermc.paper:paper-api:1.21-R0.1-SNAPSHOT")
+    compileOnly(libs.paperapi21)
 }
 
 kotlin {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8b13607f..75762792 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -89,6 +89,7 @@ dependencyResolutionManagement {
                 includeGroup("org.spigotmc")
                 includeGroup("io.papermc.paper")
                 includeGroup("com.velocitypowered")
+                includeGroup("net.md-5")
             }
         }
         mavenCentral()
@@ -113,6 +114,7 @@ dependencyResolutionManagement {
             library("spigotapi", "org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT")
             library("spigotannotations", "org.spigotmc:plugin-annotations:1.2.3-SNAPSHOT")
             library("paperapi", "io.papermc.paper:paper-api:1.19.2-R0.1-SNAPSHOT")
+            library("paperapi21", "io.papermc.paper:paper-api:1.21-R0.1-SNAPSHOT")
             library("authlib", "com.mojang:authlib:1.5.25")
             library("datafixer", "com.mojang:datafixerupper:4.0.26")
             library("brigadier", "com.mojang:brigadier:1.0.18")