Gradle Build Chain from Groovy -> Kotlin DSL

.github/workflows/gradle-publish.yml

@@ -1,44 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will build a package using Gradle and then publish it to GitHub packages when a release is created
-# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-gradle
-
-name: Gradle Package
-
-on:
-  release:
-    types: [created]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDK 17
-      uses: actions/setup-java@v4
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-        server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
-        settings-path: ${{ github.workspace }} # location for the settings.xml file
-
-    - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
-
-    - name: Build with Gradle
-      run: ./gradlew shadowJar
-
-    # The USERNAME and TOKEN need to correspond to the credentials environment variables used in
-    # the publishing section of your build.gradle
-    - name: Publish to GitHub Packages
-      run: ./gradlew publish
-      env:
-        USERNAME: ${{ github.actor }}
-        TOKEN: ${{ secrets.GITHUB_TOKEN }}

.idea/gradle.xml

@@ -5,6 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="21" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -21,5 +22,6 @@
         </option>
       </GradleProjectSettings>
     </option>
+    <option name="parallelModelFetch" value="true" />
   </component>
 </project>

.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" default="true" project-jdk-name="corretto-1.8" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="21" project-jdk-type="JavaSDK" />
 </project>

.idea/workspace.xml

@@ -5,7 +5,25 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="9d5d9b6f-43c8-41a4-bb42-a66ffc96c9b0" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/platforms/spigot/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/spigot/build.gradle" afterDir="false" />
+      <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" />
+      <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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -34,7 +52,23 @@
         </task>
         <projects_view>
           <tree_state>
-            <expand />
+            <expand>
+              <path>
+                <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>
         </projects_view>
@@ -50,8 +84,25 @@
     </option>
   </component>
   <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="feat/GlobalVersioning" />
+      </map>
+    </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="GitHubPullRequestSearchHistory">{
+  &quot;lastFilter&quot;: {
+    &quot;state&quot;: &quot;OPEN&quot;,
+    &quot;assignee&quot;: &quot;Bram1903&quot;
+  }
+}</component>
+  <component name="GithubPullRequestsUISettings">{
+  &quot;selectedUrlAndAccountId&quot;: {
+    &quot;url&quot;: &quot;https://github.com/Tofaa2/EntityLib.git&quot;,
+    &quot;accountId&quot;: &quot;e257ab79-4278-4660-bbc6-e63d9844b8c0&quot;
+  }
+}</component>
   <component name="HighlightingSettingsPerFile">
     <setting file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.retrooper.packetevents/api/2.2.0/f981796d809d02eee3e485167b2476ed766be882/api-2.2.0.jar!/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerUpdateAttributes.class" root0="SKIP_INSPECTION" />
     <setting file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.retrooper.packetevents/api/2.3.0/a199b900341990aa6a2899e42e396800c83601f0/api-2.3.0-default.jar!/com/github/retrooper/packetevents/protocol/attribute/Attribute.class" root0="SKIP_INSPECTION" />
@@ -74,66 +125,69 @@
   &quot;associatedIndex&quot;: 8
 }</component>
   <component name="ProjectId" id="2YjbRUeaUVrjckNx4bRHlK0Dq9m" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showExcludedFiles" value="false" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
+  <component name="PropertiesComponent"><![CDATA[{
-  &quot;keyToString&quot;: {
+  "keyToString": {
-    &quot;Downloaded.Files.Path.Enabled&quot;: &quot;false&quot;,
+    "Downloaded.Files.Path.Enabled": "false",
-    &quot;Gradle.Build EntityLib.executor&quot;: &quot;Run&quot;,
+    "Gradle.Build EntityLib.executor": "Run",
-    &quot;Gradle.EntityLib [dependencies].executor&quot;: &quot;Run&quot;,
+    "Gradle.EntityLib [build].executor": "Run",
-    &quot;Gradle.EntityLib [publish].executor&quot;: &quot;Run&quot;,
+    "Gradle.EntityLib [dependencies].executor": "Run",
-    &quot;Gradle.EntityLib [runServer] (1).executor&quot;: &quot;Run&quot;,
+    "Gradle.EntityLib [publish].executor": "Run",
-    &quot;Gradle.EntityLib [runServer].executor&quot;: &quot;Run&quot;,
+    "Gradle.EntityLib [runServer] (1).executor": "Run",
-    &quot;Gradle.EntityLib:code-gen [:code-gen:Main.main()].executor&quot;: &quot;Run&quot;,
+    "Gradle.EntityLib [runServer].executor": "Run",
-    &quot;Gradle.EntityLib:test-plugin [cleanAllRunTaskCaches].executor&quot;: &quot;Run&quot;,
+    "Gradle.EntityLib:code-gen [:code-gen:Main.main()].executor": "Run",
-    &quot;Gradle.EntityLib:test-plugin [cleanCustomServiceCaches].executor&quot;: &quot;Run&quot;,
+    "Gradle.EntityLib:test-plugin [cleanAllRunTaskCaches].executor": "Run",
-    &quot;Gradle.EntityLib:test-plugin [cleanPaperCache].executor&quot;: &quot;Run&quot;,
+    "Gradle.EntityLib:test-plugin [cleanCustomServiceCaches].executor": "Run",
-    &quot;Gradle.EntityLib:test-plugin [cleanPaperPluginsCache].executor&quot;: &quot;Run&quot;,
+    "Gradle.EntityLib:test-plugin [cleanPaperCache].executor": "Run",
-    &quot;Gradle.EntityLib:test-plugin [publish].executor&quot;: &quot;Run&quot;,
+    "Gradle.EntityLib:test-plugin [cleanPaperPluginsCache].executor": "Run",
-    &quot;Gradle.EntityLib:test-plugin [runServer].executor&quot;: &quot;Run&quot;,
+    "Gradle.EntityLib:test-plugin [publish].executor": "Run",
-    &quot;Gradle.EntityLib:test-plugin [shadowJar].executor&quot;: &quot;Run&quot;,
+    "Gradle.EntityLib:test-plugin [runServer].executor": "Run",
-    &quot;JAR Application.Unnamed.executor&quot;: &quot;Run&quot;,
+    "Gradle.EntityLib:test-plugin [shadowJar].executor": "Run",
-    &quot;Repository.Attach.Annotations&quot;: &quot;false&quot;,
+    "JAR Application.Unnamed.executor": "Run",
-    &quot;Repository.Attach.JavaDocs&quot;: &quot;false&quot;,
+    "Repository.Attach.Annotations": "false",
-    &quot;Repository.Attach.Sources&quot;: &quot;false&quot;,
+    "Repository.Attach.JavaDocs": "false",
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    "Repository.Attach.Sources": "false",
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    "RunOnceActivity.ShowReadmeOnStart": "true",
-    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    "WebServerToolWindowFactoryState": "false",
-    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
+    "git-widget-placeholder": "feat/BuildChainRework",
-    &quot;jdk.selected.JAVA_MODULE&quot;: &quot;corretto-17&quot;,
+    "ignore.virus.scanning.warn.message": "true",
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
+    "jdk.selected.JAVA_MODULE": "corretto-17",
-    &quot;last_opened_file_path&quot;: &quot;D:/Github/EntityLib&quot;,
+    "kotlin-language-version-configured": "true",
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    "last_opened_file_path": "C:/Development/EntityLib",
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    "node.js.detected.package.eslint": "true",
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    "node.js.detected.package.tslint": "true",
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    "node.js.selected.package.eslint": "(autodetect)",
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    "node.js.selected.package.tslint": "(autodetect)",
-    &quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
+    "nodejs_package_manager_path": "npm",
-    &quot;project.structure.proportion&quot;: &quot;0.15&quot;,
+    "project.structure.last.edited": "Modules",
-    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
+    "project.structure.proportion": "0.15",
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.editor&quot;,
+    "project.structure.side.proportion": "0.2",
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+    "settings.editor.selected.configurable": "reference.settingsdialog.project.gradle",
+    "vue.rearranger.settings.migration": "true"
   },
-  &quot;keyToStringList&quot;: {
+  "keyToStringList": {
-    &quot;kotlin-gradle-user-dirs&quot;: [
+    "kotlin-gradle-user-dirs": [
-      &quot;/home/tofaa/.gradle&quot;
+      "/home/tofaa/.gradle"
     ]
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Development\EntityLib" />
       <recent name="$PROJECT_DIR$/model-engine-addon" />
       <recent name="D:\Github\EntityLib\api\src\main\java\me\tofaa\entitylib\extras" />
       <recent name="D:\Github\EntityLib\api\src\main\java\me\tofaa\entitylib\meta" />
       <recent name="D:\Github\EntityLib\test-plugin" />
     </key>
   </component>
-  <component name="RunManager" selected="Gradle.EntityLib [runServer]">
+  <component name="RunManager" selected="Gradle.EntityLib:api [build]">
-    <configuration name="EntityLib [runServer] (1)" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+    <configuration name="EntityLib [build]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -144,7 +198,7 @@
         </option>
         <option name="taskNames">
           <list>
-            <option value="runServer" />
+            <option value="build" />
           </list>
         </option>
         <option name="vmOptions" />
@@ -177,10 +231,10 @@
       <RunAsTest>false</RunAsTest>
       <method v="2" />
     </configuration>
-    <configuration name="EntityLib:test-plugin [cleanAllRunTaskCaches]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+    <configuration name="EntityLib:api [build]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$/test-plugin" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$/api" />
         <option name="externalSystemIdString" value="GRADLE" />
         <option name="scriptParameters" />
         <option name="taskDescriptions">
@@ -188,7 +242,7 @@
         </option>
         <option name="taskNames">
           <list>
-            <option value="cleanAllRunTaskCaches" />
+            <option value="build" />
           </list>
         </option>
         <option name="vmOptions" />
@@ -267,27 +321,27 @@
     </configuration>
     <list>
       <item itemvalue="Gradle.EntityLib [runServer]" />
-      <item itemvalue="Gradle.EntityLib [runServer] (1)" />
+      <item itemvalue="Gradle.EntityLib [build]" />
-      <item itemvalue="Gradle.EntityLib:test-plugin [cleanAllRunTaskCaches]" />
+      <item itemvalue="Gradle.EntityLib:api [build]" />
       <item itemvalue="Gradle.EntityLib:test-plugin [cleanCustomServiceCaches]" />
       <item itemvalue="Gradle.EntityLib:test-plugin [cleanPaperCache]" />
       <item itemvalue="Gradle.EntityLib:test-plugin [cleanPaperPluginsCache]" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Gradle.EntityLib:api [build]" />
+        <item itemvalue="Gradle.EntityLib [build]" />
         <item itemvalue="Gradle.EntityLib:test-plugin [cleanPaperPluginsCache]" />
         <item itemvalue="Gradle.EntityLib:test-plugin [cleanPaperCache]" />
         <item itemvalue="Gradle.EntityLib:test-plugin [cleanCustomServiceCaches]" />
-        <item itemvalue="Gradle.EntityLib:test-plugin [cleanAllRunTaskCaches]" />
-        <item itemvalue="Gradle.EntityLib [runServer] (1)" />
       </list>
     </recent_temporary>
   </component>
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-jdk-9f38398b9061-39b83d9b5494-intellij.indexing.shared.core-IU-241.15989.150" />
+        <option value="bundled-jdk-9f38398b9061-39b83d9b5494-intellij.indexing.shared.core-IU-241.18034.62" />
-        <option value="bundled-js-predefined-1d06a55b98c1-91d5c284f522-JavaScript-IU-241.15989.150" />
+        <option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-IU-241.18034.62" />
       </set>
     </attachedChunks>
   </component>
@@ -388,6 +442,8 @@
       <workItem from="1719246637584" duration="6142000" />
       <workItem from="1719306268310" duration="4050000" />
       <workItem from="1719569161589" duration="807000" />
+      <workItem from="1720349680459" duration="2922000" />
+      <workItem from="1720352793422" duration="312000" />
     </task>
     <servers />
   </component>

api/build.gradle

@@ -1,7 +0,0 @@
-
-dependencies {
-    api 'org.jetbrains:annotations:24.0.0'
-
-    compileOnlyApi(adventureDependencies)
-    compileOnlyApi 'com.github.retrooper.packetevents:api:2.3.0'
-}

api/build.gradle.kts

@@ -0,0 +1,6 @@
+dependencies {
+    api(libs.jetbrains.annotations)
+
+    compileOnlyApi(libs.bundles.adventure)
+    compileOnlyApi(libs.packetevents.api)
+}

build.gradle

@@ -1,66 +0,0 @@
-plugins {
-    id 'java'
-    id 'java-library'
-    id 'maven-publish'
-}
-allprojects {
-
-    project.ext.adventureVersion = '4.15.0'
-    project.ext.adventureDependencies = ["net.kyori:adventure-api:${adventureVersion}",
-                                         "net.kyori:adventure-text-serializer-gson:${adventureVersion}",
-                                         "net.kyori:adventure-text-serializer-legacy:${adventureVersion}",
-                                         "net.kyori:adventure-nbt:${adventureVersion}"]
-
-    project.ext.peVersion = '2.4.0'
-
-    apply plugin: 'java'
-    apply plugin: 'java-library'
-    apply plugin: 'maven-publish'
-
-    group = 'me.tofaa.entitylib'
-    version = '2.4.1-SNAPSHOT'
-
-    java.sourceCompatibility = JavaVersion.VERSION_1_8
-    java.targetCompatibility = JavaVersion.VERSION_1_8
-    java {
-        withSourcesJar()
-        withJavadocJar()
-    }
-
-
-    repositories {
-        mavenCentral()
-        maven {
-            url = 'https://jitpack.io/'
-        }
-        maven {
-            name = 'papermc'
-            url = 'https://repo.papermc.io/repository/maven-public/'
-        }
-        maven {
-            name = 'codemc-repo'
-            url = 'https://repo.codemc.io/repository/maven-releases/'
-        }
-        maven {
-            url = "https://oss.sonatype.org/content/groups/public/"
-        }
-        maven { url = "https://repo.codemc.org/repository/maven-public/" }
-    }
-
-    publishing {
-        publications {
-            maven(MavenPublication) {
-                groupId project.group
-                artifactId project.name
-                version project.version
-                from components.java
-            }
-        }
-    }
-}
-
-
-dependencies {
-    compileOnlyApi 'com.github.retrooper:packetevents-spigot:${project.ext.peVersion}'
-}
-

build.gradle.kts

@@ -0,0 +1,59 @@
+plugins {
+    id("java")
+    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)
+}

code-gen/build.gradle

@@ -1,7 +0,0 @@
-
-dependencies {
-    implementation 'com.google.code.gson:gson:2.10.1'
-    implementation 'com.squareup:javapoet:1.13.0'
-    implementation 'com.github.retrooper.packetevents:api:2.2.0'
-    implementation 'org.jetbrains:annotations:24.0.0'
-}

code-gen/build.gradle.kts

@@ -0,0 +1,6 @@
+dependencies {
+    implementation(libs.gson)
+    implementation(libs.javapoet)
+    implementation(libs.packetevents.api)
+    implementation(libs.jetbrains.annotations)
+}

common/build.gradle.kts

@@ -1,4 +1,3 @@
-
 dependencies {
     api(project(":api"))
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Nov 27 02:38:48 TRT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

libs.versions.toml

@@ -0,0 +1,33 @@
+[versions]
+adventure = "4.16.0"
+jetbrains-annotations = "24.0.0"
+gson = "2.11.0"
+packetevents = "2.4.1-SNAPSHOT"
+paper = "1.21-R0.1-SNAPSHOT"
+velocity = "3.3.0-SNAPSHOT"
+run-paper = "2.3.0"
+shadow = "8.1.1"
+javapoet = "1.13.0"
+
+[libraries]
+adventure-api = { group = "net.kyori", name = "adventure-api", version.ref = "adventure" }
+adventure-text-serializer-gson = { group = "net.kyori", name = "adventure-text-serializer-gson", version.ref = "adventure" }
+adventure-text-serializer-legacy = { group = "net.kyori", name = "adventure-text-serializer-legacy", version.ref = "adventure" }
+adventure-text-serializer-gson-legacy = { group = "net.kyori", name = "adventure-text-serializer-gson-legacy-impl", version.ref = "adventure" }
+adventure-nbt = { group = "net.kyori", name = "adventure-nbt", version.ref = "adventure" }
+jetbrains-annotations = { group = "org.jetbrains", name = "annotations", version.ref = "jetbrains-annotations" }
+gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
+packetevents-api = { group = "com.github.retrooper", name = "packetevents-api", version.ref = "packetevents" }
+packetevents-spigot = { group = "com.github.retrooper", name = "packetevents-spigot", version.ref = "packetevents" }
+packetevents-velocity = { group = "com.github.retrooper", name = "packetevents-velocity", version.ref = "packetevents" }
+paper = { group = "io.papermc.paper", name = "paper-api", version.ref = "paper" }
+velocity = { group = "com.velocitypowered", name = "velocity-api", version.ref = "velocity" }
+javapoet = { group = "com.squareup", name = "javapoet", version.ref = "javapoet" }
+
+[bundles]
+adventure = ["adventure-api", "adventure-text-serializer-gson", "adventure-text-serializer-legacy", "adventure-nbt"]
+
+[plugins]
+run-paper = { id = "xyz.jpenilla.run-paper", version.ref = "run-paper" }
+run-velocity = { id = "xyz.jpenilla.run-velocity", version.ref = "run-paper" }
+shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }

model-engine-addon/build.gradle

@@ -1,8 +0,0 @@
-repositories {
-    maven { url 'https://mvn.lumine.io/repository/maven-public/' }
-}
-
-dependencies {
-//    compileOnly 'com.ticxo.modelengine:ModelEngine:R4.0.4'
-    api(project(":api"))
-}

model-engine-addon/build.gradle.kts

@@ -0,0 +1,10 @@
+repositories {
+    maven {
+        url = uri("https://mvn.lumine.io/repository/maven-public/")
+    }
+}
+
+dependencies {
+    // compileOnly("com.ticxo.modelengine:ModelEngine:R4.0.4")
+    api(project(":api"))
+}

platforms/spigot/build.gradle

@@ -1,6 +0,0 @@
-
-dependencies {
-    api(project(":common"))
-    compileOnly('com.github.retrooper:packetevents-spigot:' + peVersion)
-    compileOnly('org.spigotmc:spigot-api:1.19.4-R0.1-SNAPSHOT')
-}

platforms/spigot/build.gradle.kts

@@ -0,0 +1,9 @@
+dependencies {
+    api(project(":common"))
+    compileOnly(libs.paper)
+    compileOnly(libs.packetevents.spigot)
+}
+
+java {
+    disableAutoTargetJvm()
+}

platforms/standalone/build.gradle

@@ -1,6 +0,0 @@
-
-
-dependencies {
-    api(project(":common"))
-    compileOnly('com.github.retrooper.packetevents:api:2.3.0')
-}

platforms/standalone/build.gradle.kts

@@ -0,0 +1,4 @@
+dependencies {
+    api(project(":common"))
+    compileOnly(libs.packetevents.api)
+}

platforms/velocity/build.gradle

@@ -1,20 +0,0 @@
-
-repositories {
-    maven {
-        name = 'papermc'
-        url = '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('com.github.retrooper.packetevents:velocity:' + peVersion)
-    compileOnly 'com.velocitypowered:velocity-api:3.3.0-SNAPSHOT'
-}

platforms/velocity/build.gradle.kts

@@ -0,0 +1,23 @@
+
+repositories {
+    maven {
+        name = "papermc"
+        url = uri("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)
+}

settings.gradle

@@ -1,21 +0,0 @@
-plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
-}
-rootProject.name = 'EntityLib'
-//include 'test-plugin'
-include 'api'
-include 'platforms:spigot'
-findProject(':platforms:spigot')?.name = 'spigot'
-include 'common'
-
-if (!Boolean.parseBoolean(System.getenv("JITPACK"))) {
-    include 'code-gen'
-    include 'test-plugin'
-    include 'model-engine-addon'
-}
-include 'platforms:velocity'
-findProject(':platforms:velocity')?.name = 'velocity'
-
-include 'platforms:standalone'
-findProject(':platforms:standalone')?.name = 'standalone'
-

settings.gradle.kts

@@ -0,0 +1,42 @@
+pluginManagement {
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id("org.gradle.toolchains.foojay-resolver") version "0.8.0"
+}
+
+toolchainManagement {
+    jvm {
+        javaRepositories {
+            repository("foojay") {
+                resolverClass.set(org.gradle.toolchains.foojay.FoojayToolchainResolver::class.java)
+            }
+        }
+    }
+}
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("libs.versions.toml"))
+        }
+    }
+}
+
+rootProject.name = "EntityLib"
+//include(":test-plugin")
+include(":common")
+include(":api")
+include(":platforms:spigot")
+include(":platforms:velocity")
+include(":platforms:standalone")
+
+if (!System.getenv("JITPACK").toBoolean()) {
+    include(":code-gen")
+    include(":test-plugin")
+    include(":model-engine-addon")
+}

test-plugin/build.gradle

@@ -1,46 +0,0 @@
-plugins {
-    id 'java'
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
-    //id("io.papermc.paperweight.userdev") version "1.5.11"
-    id 'xyz.jpenilla.run-paper' version '2.2.2'
-}
-
-group = 'me.tofaa.peentitymeta'
-version = '1.0-SNAPSHOT'
-// java 21
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
-    }
-}
-
-repositories {
-    mavenCentral()
-    maven {
-        name = 'papermc'
-        url = 'https://repo.papermc.io/repository/maven-public/'
-    }
-    maven {
-        name = 'codemc-repo'
-        url = 'https://repo.codemc.io/repository/maven-releases/'
-    }
-    maven {
-        url = "https://oss.sonatype.org/content/groups/public/"
-    }
-    maven { url = "https://repo.codemc.org/repository/maven-public/" }
-}
-
-dependencies {
-    compileOnly('org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT')
-    compileOnly('com.github.retrooper:packetevents-spigot:' + peVersion)
-//    implementation(project(":platforms:spigot"))
-    implementation(project(":platforms:spigot"))
-}
-
-
-runServer {
-    minecraftVersion("1.21")
-    downloadPlugins {
-        modrinth("packetevents", "MfD5eOYA")
-    }
-}

test-plugin/build.gradle.kts

@@ -0,0 +1,85 @@
+plugins {
+    id("java")
+    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/")
+    }
+}
+
+dependencies {
+    compileOnly(libs.paper)
+    compileOnly(libs.packetevents.spigot)
+    implementation(project(":platforms:spigot"))
+}
+
+tasks {
+    // 1.8.8 - 1.16.5 = Java 8
+    // 1.17           = Java 16
+    // 1.18 - 1.20.4  = Java 17
+    // 1-20.5+        = Java 21
+    val version = "1.21"
+    val javaVersion = JavaLanguageVersion.of(21)
+
+    val jvmArgsExternal = listOf(
+        "-Dcom.mojang.eula.agree=true"
+    )
+
+    val sharedBukkitPlugins = runPaper.downloadPluginsSpec {
+        modrinth("packetevents", "MfD5eOYA")
+    }
+
+    runServer {
+        minecraftVersion(version)
+        runDirectory = rootDir.resolve("run/paper/$version")
+
+        javaLauncher = project.javaToolchains.launcherFor {
+            languageVersion = javaVersion
+        }
+
+        downloadPlugins {
+            from(sharedBukkitPlugins)
+        }
+
+        jvmArgs = jvmArgsExternal
+    }
+
+    runPaper.folia.registerTask {
+        minecraftVersion(version)
+        runDirectory = rootDir.resolve("run/folia/$version")
+
+        javaLauncher = project.javaToolchains.launcherFor {
+            languageVersion = javaVersion
+        }
+
+        downloadPlugins {
+            from(sharedBukkitPlugins)
+        }
+
+        jvmArgs = jvmArgsExternal
+    }
+}