Merge pull request #27 from MineInAbyss/develop

Move in Looty, some of Mobzy, Geary 0.26.0
MineInAbyss · May 31, 2024 · 11f77ed · 11f77ed
2 parents 831348f + 29c9deb
commit 11f77ed
Show file tree

Hide file tree

Showing 161 changed files with 2,133 additions and 2,544 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
           cache: gradle
 
       - name: Build

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 val idofrontVersion: String by project
 
 plugins {
@@ -8,10 +6,19 @@ plugins {
     alias(idofrontLibs.plugins.mia.kotlin.jvm)
     alias(idofrontLibs.plugins.dokka) apply false
     alias(idofrontLibs.plugins.mia.autoversion)
+    idea
+}
+
+idea {
+    module {
+        isDownloadJavadoc = true
+        isDownloadSources = true
+    }
 }
 
 dependencies {
     api(project(":geary-papermc-tracking"))
+    api(project(":geary-papermc-integrations"))
     api(project(":geary-papermc-bridge"))
     api(gearyLibs.core)
     api(gearyLibs.autoscan)
@@ -26,12 +33,9 @@ allprojects {
 
     repositories {
         mavenCentral()
+        google()
         maven("https://repo.mineinabyss.com/releases")
         maven("https://repo.mineinabyss.com/snapshots")
-        maven("https://raw.githubusercontent.com/TheBlackEntity/PlugMan/repository/")
-        maven("https://jitpack.io")
-        maven("https://repo.codemc.io/repository/nms/")
-        maven("https://mvn.lumine.io/repository/maven-public/")
         mavenLocal()
     }
 
@@ -41,14 +45,12 @@ allprojects {
         testImplementation(libs.bundles.idofront.core)
     }
 
-    tasks {
-        withType<KotlinCompile> {
-            kotlinOptions {
-                freeCompilerArgs += listOf(
-                    "-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
-                    "-opt-in=kotlin.ExperimentalUnsignedTypes",
-                )
-            }
+    kotlin {
+        compilerOptions {
+            freeCompilerArgs.addAll(
+                "-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
+                "-opt-in=kotlin.ExperimentalUnsignedTypes",
+            )
         }
     }
 }

diff --git a/geary-papermc-bridge/build.gradle.kts b/geary-papermc-bridge/build.gradle.kts
@@ -10,10 +10,6 @@ dependencies {
     implementation(gearyLibs.serialization)
     implementation(gearyLibs.autoscan)
 
-    // Plugins
-    compileOnly(libs.plugman)
-    compileOnly(idofrontLibs.minecraft.plugin.mythic.dist)
-
     // MineInAbyss platform
     compileOnly(idofrontLibs.kotlin.stdlib)
     compileOnly(idofrontLibs.kotlinx.serialization.json)

diff --git a/geary-papermc-bridge/src/main/kotlin/com/mineinabyss/geary/papermc/bridge/PaperBridge.kt b/geary-papermc-bridge/src/main/kotlin/com/mineinabyss/geary/papermc/bridge/PaperBridge.kt
diff --git a/...y-papermc-bridge/src/main/kotlin/com/mineinabyss/geary/papermc/bridge/actions/DoDamage.kt b/...y-papermc-bridge/src/main/kotlin/com/mineinabyss/geary/papermc/bridge/actions/DoDamage.kt
diff --git a/...apermc-bridge/src/main/kotlin/com/mineinabyss/geary/papermc/bridge/actions/DoExplosion.kt b/...apermc-bridge/src/main/kotlin/com/mineinabyss/geary/papermc/bridge/actions/DoExplosion.kt
diff --git a/...apermc-bridge/src/main/kotlin/com/mineinabyss/geary/papermc/bridge/actions/DoKnockback.kt b/...apermc-bridge/src/main/kotlin/com/mineinabyss/geary/papermc/bridge/actions/DoKnockback.kt
diff --git a/...ermc-bridge/src/main/kotlin/com/mineinabyss/geary/papermc/bridge/actions/DoSpawnEntity.kt b/...ermc-bridge/src/main/kotlin/com/mineinabyss/geary/papermc/bridge/actions/DoSpawnEntity.kt
diff --git a/...-papermc-bridge/src/main/kotlin/com/mineinabyss/geary/papermc/bridge/actions/RunSkills.kt b/...-papermc-bridge/src/main/kotlin/com/mineinabyss/geary/papermc/bridge/actions/RunSkills.kt