From 6b642bd21f6ae2f4ad57b888ea4761b83150e219 Mon Sep 17 00:00:00 2001
From: Bram <bram@bramdekker.com>
Date: Sun, 7 Jul 2024 14:16:19 +0200
Subject: [PATCH] Added: Build Source Module

---
 .idea/gradle.xml                              |  12 ++
 .idea/misc.xml                                |   2 +-
 .idea/workspace.xml                           | 132 ++++++++----------
 api/build.gradle.kts                          |   5 +
 build.gradle.kts                              |  59 +-------
 buildSrc/build.gradle.kts                     |  13 ++
 .../entitylib.java-conventions.gradle.kts     |  52 +++++++
 code-gen/build.gradle.kts                     |   4 +
 common/build.gradle.kts                       |   5 +
 model-engine-addon/build.gradle.kts           |   5 +
 platforms/spigot/build.gradle.kts             |  13 +-
 platforms/standalone/build.gradle.kts         |   5 +
 platforms/velocity/build.gradle.kts           |  25 ++--
 test-plugin/build.gradle.kts                  |  27 +---
 test-plugin/src/main/resources/plugin.yml     |   2 +-
 15 files changed, 190 insertions(+), 171 deletions(-)
 create mode 100644 buildSrc/build.gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/entitylib.java-conventions.gradle.kts

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 4876d70..82d18a6 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,12 +4,24 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT">
+            <builds>
+              <build path="$PROJECT_DIR$/buildSrc" name="buildSrc">
+                <projects>
+                  <project path="$PROJECT_DIR$/buildSrc" />
+                </projects>
+              </build>
+            </builds>
+          </compositeBuild>
+        </compositeConfiguration>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="21" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/api" />
+            <option value="$PROJECT_DIR$/buildSrc" />
             <option value="$PROJECT_DIR$/code-gen" />
             <option value="$PROJECT_DIR$/common" />
             <option value="$PROJECT_DIR$/model-engine-addon" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 21819a6..7c47dd4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,5 +4,5 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="21" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0407897..684f35c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,26 +4,22 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="9d5d9b6f-43c8-41a4-bb42-a66ffc96c9b0" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/api/build.gradle.kts" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/libs.versions.toml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.github/workflows/gradle-publish.yml" beforeDir="false" />
+    <list default="true" id="9d5d9b6f-43c8-41a4-bb42-a66ffc96c9b0" name="Changes" comment="Gradle Build Chain from Groovy -&gt; Kotlin DSL">
+      <change afterPath="$PROJECT_DIR$/buildSrc/build.gradle.kts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/buildSrc/src/main/kotlin/entitylib.java-conventions.gradle.kts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/build.gradle" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle.kts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code-gen/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/code-gen/build.gradle.kts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/common/build.gradle.kts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" beforeDir="false" afterPath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gradlew" beforeDir="false" afterPath="$PROJECT_DIR$/gradlew" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/model-engine-addon/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/model-engine-addon/build.gradle.kts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/platforms/spigot/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/spigot/build.gradle.kts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/platforms/standalone/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/standalone/build.gradle.kts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/platforms/standalone/src/main/java/me/tofaa/entitylib/standalone/task/Task.java" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/standalone/src/main/java/me/tofaa/entitylib/standalone/task/Task.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/platforms/velocity/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/velocity/build.gradle.kts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/settings.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/settings.gradle.kts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-plugin/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/test-plugin/build.gradle.kts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/api/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/api/build.gradle.kts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle.kts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/code-gen/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/code-gen/build.gradle.kts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/common/build.gradle.kts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/model-engine-addon/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/model-engine-addon/build.gradle.kts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/platforms/spigot/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/spigot/build.gradle.kts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/platforms/standalone/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/standalone/build.gradle.kts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/platforms/velocity/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/velocity/build.gradle.kts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test-plugin/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/test-plugin/build.gradle.kts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test-plugin/src/main/resources/plugin.yml" beforeDir="false" afterPath="$PROJECT_DIR$/test-plugin/src/main/resources/plugin.yml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -57,17 +53,6 @@
                 <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
                 <item name="EntityLib" type="f1a62948:ProjectNode" />
               </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="EntityLib" type="f1a62948:ProjectNode" />
-                <item name="Tasks" type="e4a08cd1:TasksNode" />
-              </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="EntityLib" type="f1a62948:ProjectNode" />
-                <item name="Tasks" type="e4a08cd1:TasksNode" />
-                <item name="build" type="c8890929:TasksNode$1" />
-              </path>
             </expand>
             <select />
           </tree_state>
@@ -131,52 +116,53 @@
     <option name="showExcludedFiles" value="false" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "Downloaded.Files.Path.Enabled": "false",
-    "Gradle.Build EntityLib.executor": "Run",
-    "Gradle.EntityLib [build].executor": "Run",
-    "Gradle.EntityLib [dependencies].executor": "Run",
-    "Gradle.EntityLib [publish].executor": "Run",
-    "Gradle.EntityLib [runServer] (1).executor": "Run",
-    "Gradle.EntityLib [runServer].executor": "Run",
-    "Gradle.EntityLib:code-gen [:code-gen:Main.main()].executor": "Run",
-    "Gradle.EntityLib:test-plugin [cleanAllRunTaskCaches].executor": "Run",
-    "Gradle.EntityLib:test-plugin [cleanCustomServiceCaches].executor": "Run",
-    "Gradle.EntityLib:test-plugin [cleanPaperCache].executor": "Run",
-    "Gradle.EntityLib:test-plugin [cleanPaperPluginsCache].executor": "Run",
-    "Gradle.EntityLib:test-plugin [publish].executor": "Run",
-    "Gradle.EntityLib:test-plugin [runServer].executor": "Run",
-    "Gradle.EntityLib:test-plugin [shadowJar].executor": "Run",
-    "JAR Application.Unnamed.executor": "Run",
-    "Repository.Attach.Annotations": "false",
-    "Repository.Attach.JavaDocs": "false",
-    "Repository.Attach.Sources": "false",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "git-widget-placeholder": "feat/BuildChainRework",
-    "ignore.virus.scanning.warn.message": "true",
-    "jdk.selected.JAVA_MODULE": "corretto-17",
-    "kotlin-language-version-configured": "true",
-    "last_opened_file_path": "C:/Development/EntityLib",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "project.structure.last.edited": "Modules",
-    "project.structure.proportion": "0.15",
-    "project.structure.side.proportion": "0.2",
-    "settings.editor.selected.configurable": "reference.settingsdialog.project.gradle",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;Downloaded.Files.Path.Enabled&quot;: &quot;false&quot;,
+    &quot;Gradle.Build EntityLib.executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.EntityLib [build].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.EntityLib [dependencies].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.EntityLib [publish].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.EntityLib [runServer] (1).executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.EntityLib [runServer].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.EntityLib:api [build].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.EntityLib:code-gen [:code-gen:Main.main()].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.EntityLib:test-plugin [cleanAllRunTaskCaches].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.EntityLib:test-plugin [cleanCustomServiceCaches].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.EntityLib:test-plugin [cleanPaperCache].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.EntityLib:test-plugin [cleanPaperPluginsCache].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.EntityLib:test-plugin [publish].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.EntityLib:test-plugin [runServer].executor&quot;: &quot;Run&quot;,
+    &quot;Gradle.EntityLib:test-plugin [shadowJar].executor&quot;: &quot;Run&quot;,
+    &quot;JAR Application.Unnamed.executor&quot;: &quot;Run&quot;,
+    &quot;Repository.Attach.Annotations&quot;: &quot;false&quot;,
+    &quot;Repository.Attach.JavaDocs&quot;: &quot;false&quot;,
+    &quot;Repository.Attach.Sources&quot;: &quot;false&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;feat/BuildChainRework&quot;,
+    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
+    &quot;jdk.selected.JAVA_MODULE&quot;: &quot;corretto-17&quot;,
+    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/Development/EntityLib&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.15&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;reference.settingsdialog.project.gradle&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   },
-  "keyToStringList": {
-    "kotlin-gradle-user-dirs": [
-      "/home/tofaa/.gradle"
+  &quot;keyToStringList&quot;: {
+    &quot;kotlin-gradle-user-dirs&quot;: [
+      &quot;C:\\Users\\Bram\\.gradle&quot;
     ]
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="C:\Development\EntityLib" />
@@ -186,7 +172,7 @@
       <recent name="D:\Github\EntityLib\test-plugin" />
     </key>
   </component>
-  <component name="RunManager" selected="Gradle.EntityLib:api [build]">
+  <component name="RunManager" selected="Gradle.EntityLib [runServer]">
     <configuration name="EntityLib [build]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
@@ -444,6 +430,8 @@
       <workItem from="1719569161589" duration="807000" />
       <workItem from="1720349680459" duration="2922000" />
       <workItem from="1720352793422" duration="312000" />
+      <workItem from="1720353517992" duration="622000" />
+      <workItem from="1720354186649" duration="315000" />
     </task>
     <servers />
   </component>
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
index e85b290..af548d8 100644
--- a/api/build.gradle.kts
+++ b/api/build.gradle.kts
@@ -1,3 +1,8 @@
+plugins {
+    entitylib.`java-conventions`
+    id("java-library")
+}
+
 dependencies {
     api(libs.jetbrains.annotations)
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 93a0f48..ba6a196 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,59 +1,8 @@
 plugins {
-    id("java")
+    entitylib.`java-conventions`
     id("java-library")
-    id("maven-publish")
 }
 
-allprojects {
-    apply(plugin = "java")
-    apply(plugin = "java-library")
-    apply(plugin = "maven-publish")
-
-    group = "me.tofaa.entitylib"
-    description = rootProject.name
-    version = "2.4.1-SNAPSHOT"
-
-    java.sourceCompatibility = JavaVersion.VERSION_1_8
-    java.targetCompatibility = JavaVersion.VERSION_1_8
-
-    java {
-        withSourcesJar()
-        withJavadocJar()
-    }
-
-    repositories {
-        mavenCentral()
-        maven {
-            url = uri("https://jitpack.io/")
-        }
-        maven {
-            name = "papermc"
-            url = uri("https://repo.papermc.io/repository/maven-public/")
-        }
-        maven {
-            name = "codemc-repo"
-            url = uri("https://repo.codemc.io/repository/maven-releases/")
-        }
-        maven {
-            url = uri("https://oss.sonatype.org/content/groups/public/")
-        }
-        maven {
-            url = uri("https://repo.codemc.org/repository/maven-public/")
-        }
-    }
-
-    publishing {
-        publications {
-            create<MavenPublication>("maven") {
-                groupId = project.group.toString()
-                artifactId = project.name
-                version = project.version.toString()
-                from(components["java"])
-            }
-        }
-    }
-}
-
-dependencies {
-    compileOnlyApi(libs.packetevents.spigot)
-}
+group = "me.tofaa.entitylib"
+description = rootProject.name
+version = "2.4.1-SNAPSHOT"
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
new file mode 100644
index 0000000..77bf5d3
--- /dev/null
+++ b/buildSrc/build.gradle.kts
@@ -0,0 +1,13 @@
+plugins {
+    `kotlin-dsl`
+}
+
+kotlin {
+    compilerOptions {
+        jvmToolchain(8)
+    }
+}
+
+repositories {
+    mavenCentral()
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/entitylib.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/entitylib.java-conventions.gradle.kts
new file mode 100644
index 0000000..4ed76ee
--- /dev/null
+++ b/buildSrc/src/main/kotlin/entitylib.java-conventions.gradle.kts
@@ -0,0 +1,52 @@
+plugins {
+    java
+    id("maven-publish")
+}
+
+group = rootProject.group
+version = rootProject.version
+description = project.description
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+    maven("https://repo.codemc.io/repository/maven-releases/")
+    maven("https://repo.codemc.io/repository/maven-snapshots/")
+}
+
+java {
+    withSourcesJar()
+    withJavadocJar()
+    disableAutoTargetJvm()
+
+    toolchain.languageVersion = JavaLanguageVersion.of(21)
+}
+
+tasks {
+    processResources {
+        inputs.property("version", project.version)
+        filesMatching(listOf("plugin.yml", "velocity-plugin.json")) {
+            expand("version" to project.version)
+        }
+    }
+
+    withType<JavaCompile> {
+        options.encoding = Charsets.UTF_8.name()
+        // Set the release flag. This configures what version bytecode the compiler will emit, as well as what JDK APIs are usable.
+        // See https://openjdk.java.net/jeps/247 for more information.
+        options.release = 8
+    }
+
+    publishing {
+        publications {
+            create<MavenPublication>("maven") {
+                groupId = project.group.toString()
+                artifactId = project.name
+                version = project.version.toString()
+                from(components["java"])
+            }
+        }
+    }
+
+    defaultTasks("build")
+}
\ No newline at end of file
diff --git a/code-gen/build.gradle.kts b/code-gen/build.gradle.kts
index 7af00c4..880dfbe 100644
--- a/code-gen/build.gradle.kts
+++ b/code-gen/build.gradle.kts
@@ -1,3 +1,7 @@
+plugins {
+    entitylib.`java-conventions`
+}
+
 dependencies {
     implementation(libs.gson)
     implementation(libs.javapoet)
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 70254d5..d6eb1d7 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -1,3 +1,8 @@
+plugins {
+    entitylib.`java-conventions`
+    id("java-library")
+}
+
 dependencies {
     api(project(":api"))
 }
diff --git a/model-engine-addon/build.gradle.kts b/model-engine-addon/build.gradle.kts
index 0c60c32..1722ca7 100644
--- a/model-engine-addon/build.gradle.kts
+++ b/model-engine-addon/build.gradle.kts
@@ -1,3 +1,8 @@
+plugins {
+    entitylib.`java-conventions`
+    id("java-library")
+}
+
 repositories {
     maven {
         url = uri("https://mvn.lumine.io/repository/maven-public/")
diff --git a/platforms/spigot/build.gradle.kts b/platforms/spigot/build.gradle.kts
index 63bfe4f..1c14384 100644
--- a/platforms/spigot/build.gradle.kts
+++ b/platforms/spigot/build.gradle.kts
@@ -1,9 +1,14 @@
+plugins {
+    entitylib.`java-conventions`
+    id("java-library")
+}
+
+repositories {
+    maven("https://repo.papermc.io/repository/maven-public/")
+}
+
 dependencies {
     api(project(":common"))
     compileOnly(libs.paper)
     compileOnly(libs.packetevents.spigot)
 }
-
-java {
-    disableAutoTargetJvm()
-}
diff --git a/platforms/standalone/build.gradle.kts b/platforms/standalone/build.gradle.kts
index 29c2ca3..42f388c 100644
--- a/platforms/standalone/build.gradle.kts
+++ b/platforms/standalone/build.gradle.kts
@@ -1,3 +1,8 @@
+plugins {
+    entitylib.`java-conventions`
+    id("java-library")
+}
+
 dependencies {
     api(project(":common"))
     compileOnly(libs.packetevents.api)
diff --git a/platforms/velocity/build.gradle.kts b/platforms/velocity/build.gradle.kts
index d508b46..7c4791f 100644
--- a/platforms/velocity/build.gradle.kts
+++ b/platforms/velocity/build.gradle.kts
@@ -1,23 +1,22 @@
+plugins {
+    entitylib.`java-conventions`
+    id("java-library")
+}
 
 repositories {
-    maven {
-        name = "papermc"
-        url = uri("https://repo.papermc.io/repository/maven-public/")
-    }
+    maven("https://repo.papermc.io/repository/maven-public/")
 }
 
-tasks {
-    compileJava {
-        options.release.set(17)
-    }
-}
-
-java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
-
-
 dependencies {
     api(project(":common"))
     compileOnly(libs.velocity)
     compileOnly(libs.packetevents.velocity)
     annotationProcessor(libs.velocity)
 }
+
+tasks {
+    withType<JavaCompile> {
+        options.encoding = Charsets.UTF_8.name()
+        options.release = 17
+    }
+}
diff --git a/test-plugin/build.gradle.kts b/test-plugin/build.gradle.kts
index c36a2b7..56baa3f 100644
--- a/test-plugin/build.gradle.kts
+++ b/test-plugin/build.gradle.kts
@@ -1,34 +1,11 @@
 plugins {
-    id("java")
+    entitylib.`java-conventions`
     alias(libs.plugins.shadow)
     alias(libs.plugins.run.paper)
 }
 
-group = "me.tofaa.peentitymeta"
-version = "1.0-SNAPSHOT"
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
-    }
-    disableAutoTargetJvm()
-}
-
 repositories {
-    mavenCentral()
-    repositories {
-        maven("https://repo.papermc.io/repository/maven-public/")
-    }
-    maven {
-        name = "codemc-repo"
-        url = uri("https://repo.codemc.io/repository/maven-releases/")
-    }
-    maven {
-        url = uri("https://oss.sonatype.org/content/groups/public/")
-    }
-    maven {
-        url = uri("https://repo.codemc.org/repository/maven-public/")
-    }
+    maven("https://repo.papermc.io/repository/maven-public/")
 }
 
 dependencies {
diff --git a/test-plugin/src/main/resources/plugin.yml b/test-plugin/src/main/resources/plugin.yml
index 2c7deb1..1e9762b 100644
--- a/test-plugin/src/main/resources/plugin.yml
+++ b/test-plugin/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: EntityLibPlugin
-version: 1.0.0
+version: ${version}
 depend:
   - packetevents
 main: me.tofaa.testentitylib.TestEntityLibPlugin