Update OTFHEE plugin 1.3.0

.github/workflows/gradle.yml → .github/workflows/build.yml

@@ -21,22 +21,22 @@ jobs:
       contents: read
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDK 21
-      uses: actions/setup-java@v4
-      with:
-        java-version: '21'
-        distribution: 'temurin'
-
-    # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
-    # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
-    - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
-
-    - name: Make gradlew executable
-      run: chmod +x ./gradlew
-    - name: Build with Gradle Wrapper
-      run: ./gradlew build
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
+      # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
+
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+      - name: Build with Gradle Wrapper
+        run: ./gradlew build
 
     # NOTE: The Gradle Wrapper is the default and recommended way to run Gradle (https://docs.gradle.org/current/userguide/gradle_wrapper.html).
     # If your project does not have the Gradle Wrapper configured, you can use the following configuration to run Gradle with a specified version.
@@ -47,4 +47,4 @@ jobs:
     #     gradle-version: '8.9'
     #
     # - name: Build with Gradle 8.9
-    #   run: gradle build
+    #   run: gradle build

api/build.gradle

@@ -0,0 +1,16 @@
+plugins {
+    id 'java-library'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testImplementation platform('org.junit:junit-bom:5.10.0')
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+}
+
+test {
+    useJUnitPlatform()
+}

bastion/README.md

@@ -0,0 +1,5 @@
+<div align=center>
+    <img src="./bastion.png">
+    <br /><br />
+    <p>The best Minecraft AntiCheat.</p>
+</div>

bastion/build.gradle.kts

@@ -0,0 +1,13 @@
+plugins {
+    kotlin("jvm")
+    id("io.papermc.paperweight.userdev")
+}
+
+repositories {
+    mavenCentral()
+    maven("https://repo.papermc.io/repository/maven-public/")
+}
+
+dependencies {
+    paperweight.foliaDevBundle("1.21.4-R0.1-SNAPSHOT")
+}

bastion/src/main/resources/paper-plugin.yml

@@ -0,0 +1,4 @@
+name: "Bastion"
+version: "${version}"
+main: "com.otfhee.bastion.Bastion"
+api-version: "1.21.1"

build.gradle

@@ -1,57 +1,26 @@
 plugins {
-    id 'java'
-    id 'io.papermc.paperweight.userdev' version '1.7.2'
-    id 'xyz.jpenilla.run-paper' version '2.3.0'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'io.papermc.paperweight.userdev' version '2.0.0-beta.11' apply false
+    id 'org.jetbrains.kotlin.jvm' version '2.1.10' apply false
 }
 
-group = 'com.otfhee'
-version = '1.2.2'
+subprojects {
+    apply plugin: 'java'
+    apply plugin: 'maven-publish'
 
-compileJava.options.encoding = 'UTF-8'
+    group = 'com.otfhee'
+    version = '1.3.0-SNAPSHOT'
 
-repositories {
-    mavenCentral()
-    maven {
-        name = "papermc-repo"
-        url = "https://repo.papermc.io/repository/maven-public/"
-    }
-    maven {
-        name = "sonatype"
-        url = "https://oss.sonatype.org/content/groups/public/"
-    }
-    maven {
-        name = "codemc-repo"
-        url = "https://repo.codemc.org/repository/maven-public/"
-    }
-}
-
-dependencies {
-    paperweight.paperDevBundle('1.21.1-R0.1-SNAPSHOT')
-    compileOnly "dev.jorel:commandapi-bukkit-core:9.4.1"
-}
+    project.ext.version = version
 
-def targetJavaVersion = 21
-java {
-    def javaVersion = JavaVersion.toVersion(targetJavaVersion)
-    sourceCompatibility = javaVersion
-    targetCompatibility = javaVersion
-    if (JavaVersion.current() < javaVersion) {
-        toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
-    }
-}
+    sourceCompatibility = 21
+    targetCompatibility = 21
 
-tasks.withType(JavaCompile).configureEach {
-    if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
-        options.release.set(targetJavaVersion)
+    tasks.withType(JavaCompile).configureEach {
+        options.encoding = 'UTF-8'
     }
-    options.encoding = 'UTF-8'
-}
 
-processResources {
-    def props = [version: version]
-    inputs.properties props
-    filteringCharset 'UTF-8'
-    filesMatching('plugin.yml') {
-        expand props
+    repositories {
+        mavenCentral()
     }
-}
+}

gradle.properties

@@ -0,0 +1 @@
+org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

paper/build.gradle

@@ -0,0 +1,69 @@
+plugins {
+    id 'java-library'
+    id 'io.papermc.paperweight.userdev'
+    id 'xyz.jpenilla.run-paper' version '2.3.0'
+    id "com.github.johnrengelman.shadow" version "8.1.1"
+    id 'org.jetbrains.kotlin.jvm' version '2.1.10'
+}
+
+repositories {
+    maven { url 'https://repo.papermc.io/repository/maven-public/' }
+    maven { url 'https://nexus.scarsz.me/content/groups/public/' }
+    maven { url = 'https://repo.extendedclip.com/content/repositories/placeholderapi/' }
+    maven { url = 'https://repo.codemc.org/repository/maven-public/' }
+    maven { url "https://repo.dmulloy2.net/repository/public/" }
+    mavenCentral()
+}
+
+processResources {
+    filesMatching('paper-plugin.yml') {
+        expand 'version': project.ext.version
+    }
+}
+
+dependencies {
+    implementation project(":api")
+
+    implementation 'org.jetbrains.exposed:exposed-core:0.59.0'
+    implementation 'org.jetbrains.exposed:exposed-dao:0.59.0'
+    implementation 'org.jetbrains.exposed:exposed-jdbc:0.59.0'
+    implementation 'org.jetbrains.exposed:exposed-kotlin-datetime:0.59.0'
+
+    implementation 'org.jetbrains.kotlinx:kotlinx-datetime:0.5.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1'
+
+    implementation 'org.mariadb.jdbc:mariadb-java-client:3.5.2'
+    implementation 'mysql:mysql-connector-java:8.0.33'
+    implementation 'org.xerial:sqlite-jdbc:3.42.0.0'
+
+    paperweight.foliaDevBundle('1.21.4-R0.1-SNAPSHOT')
+
+    compileOnly 'dev.jorel:commandapi-bukkit-core:9.7.0'
+    compileOnly 'net.luckperms:api:5.4'
+    compileOnly 'com.comphenix.protocol:ProtocolLib:5.1.0'
+
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
+}
+
+
+shadowJar {
+    archiveFileName = "OTFHEE-Paper-${project.ext.version}.jar"
+
+    mergeServiceFiles()
+
+    dependencies {
+        include(dependency('com.otfhee:.*') as Spec<? super ResolvedDependency>)
+        include(dependency('org.jetbrains.exposed:.*') as Spec<? super ResolvedDependency>)
+        include(dependency('org.jetbrains.kotlin:.*') as Spec<? super ResolvedDependency>)
+        include(dependency('org.jetbrains.kotlinx:kotlinx-datetime-jvm:.*') as Spec<? super ResolvedDependency>)
+        include(dependency('org.mariadb.jdbc:mariadb-java-client') as Spec<? super ResolvedDependency>)
+        include(dependency('mysql:mysql-connector-java') as Spec<? super ResolvedDependency>)
+    }
+}
+
+artifacts {
+    archives shadowJar
+}
+kotlin {
+    jvmToolchain(21)
+}