diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml
deleted file mode 100644
index fe47c80..0000000
--- a/.github/workflows/gradle-publish.yml
+++ /dev/null
@@ -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 }}
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 33dd8d6..4876d70 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,6 +5,7 @@
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8928eef..21819a6 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,5 +4,5 @@
-
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a79fc6a..0407897 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,7 +5,25 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -34,7 +52,23 @@
-
+
+
+
+
-
-
+
+
@@ -388,6 +442,8 @@
+
+
diff --git a/api/build.gradle b/api/build.gradle
deleted file mode 100644
index 8d02277..0000000
--- a/api/build.gradle
+++ /dev/null
@@ -1,7 +0,0 @@
-
-dependencies {
- api 'org.jetbrains:annotations:24.0.0'
-
- compileOnlyApi(adventureDependencies)
- compileOnlyApi 'com.github.retrooper.packetevents:api:2.3.0'
-}
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
new file mode 100644
index 0000000..e85b290
--- /dev/null
+++ b/api/build.gradle.kts
@@ -0,0 +1,6 @@
+dependencies {
+ api(libs.jetbrains.annotations)
+
+ compileOnlyApi(libs.bundles.adventure)
+ compileOnlyApi(libs.packetevents.api)
+}
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 925667e..0000000
--- a/build.gradle
+++ /dev/null
@@ -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}'
-}
-
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..93a0f48
--- /dev/null
+++ b/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("maven") {
+ groupId = project.group.toString()
+ artifactId = project.name
+ version = project.version.toString()
+ from(components["java"])
+ }
+ }
+ }
+}
+
+dependencies {
+ compileOnlyApi(libs.packetevents.spigot)
+}
diff --git a/code-gen/build.gradle b/code-gen/build.gradle
deleted file mode 100644
index 30cb78d..0000000
--- a/code-gen/build.gradle
+++ /dev/null
@@ -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'
-}
diff --git a/code-gen/build.gradle.kts b/code-gen/build.gradle.kts
new file mode 100644
index 0000000..7af00c4
--- /dev/null
+++ b/code-gen/build.gradle.kts
@@ -0,0 +1,6 @@
+dependencies {
+ implementation(libs.gson)
+ implementation(libs.javapoet)
+ implementation(libs.packetevents.api)
+ implementation(libs.jetbrains.annotations)
+}
diff --git a/common/build.gradle b/common/build.gradle.kts
similarity index 97%
rename from common/build.gradle
rename to common/build.gradle.kts
index 3647b1a..70254d5 100644
--- a/common/build.gradle
+++ b/common/build.gradle.kts
@@ -1,4 +1,3 @@
-
dependencies {
api(project(":api"))
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ea829b1..086d5c7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
diff --git a/libs.versions.toml b/libs.versions.toml
new file mode 100644
index 0000000..d0ac5e4
--- /dev/null
+++ b/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" }
\ No newline at end of file
diff --git a/model-engine-addon/build.gradle b/model-engine-addon/build.gradle
deleted file mode 100644
index 4488d2f..0000000
--- a/model-engine-addon/build.gradle
+++ /dev/null
@@ -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"))
-}
diff --git a/model-engine-addon/build.gradle.kts b/model-engine-addon/build.gradle.kts
new file mode 100644
index 0000000..0c60c32
--- /dev/null
+++ b/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"))
+}
diff --git a/platforms/spigot/build.gradle b/platforms/spigot/build.gradle
deleted file mode 100644
index ae6b4d3..0000000
--- a/platforms/spigot/build.gradle
+++ /dev/null
@@ -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')
-}
diff --git a/platforms/spigot/build.gradle.kts b/platforms/spigot/build.gradle.kts
new file mode 100644
index 0000000..63bfe4f
--- /dev/null
+++ b/platforms/spigot/build.gradle.kts
@@ -0,0 +1,9 @@
+dependencies {
+ api(project(":common"))
+ compileOnly(libs.paper)
+ compileOnly(libs.packetevents.spigot)
+}
+
+java {
+ disableAutoTargetJvm()
+}
diff --git a/platforms/standalone/build.gradle b/platforms/standalone/build.gradle
deleted file mode 100644
index 9dec5ae..0000000
--- a/platforms/standalone/build.gradle
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-dependencies {
- api(project(":common"))
- compileOnly('com.github.retrooper.packetevents:api:2.3.0')
-}
diff --git a/platforms/standalone/build.gradle.kts b/platforms/standalone/build.gradle.kts
new file mode 100644
index 0000000..29c2ca3
--- /dev/null
+++ b/platforms/standalone/build.gradle.kts
@@ -0,0 +1,4 @@
+dependencies {
+ api(project(":common"))
+ compileOnly(libs.packetevents.api)
+}
diff --git a/platforms/velocity/build.gradle b/platforms/velocity/build.gradle
deleted file mode 100644
index 689b917..0000000
--- a/platforms/velocity/build.gradle
+++ /dev/null
@@ -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'
-}
diff --git a/platforms/velocity/build.gradle.kts b/platforms/velocity/build.gradle.kts
new file mode 100644
index 0000000..d508b46
--- /dev/null
+++ b/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)
+}
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 020ecc3..0000000
--- a/settings.gradle
+++ /dev/null
@@ -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'
-
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..c7e7c86
--- /dev/null
+++ b/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")
+}
diff --git a/test-plugin/build.gradle b/test-plugin/build.gradle
deleted file mode 100644
index c2843f1..0000000
--- a/test-plugin/build.gradle
+++ /dev/null
@@ -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")
- }
-}
\ No newline at end of file
diff --git a/test-plugin/build.gradle.kts b/test-plugin/build.gradle.kts
new file mode 100644
index 0000000..c36a2b7
--- /dev/null
+++ b/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
+ }
+}
\ No newline at end of file