Gradle stuff rework, minor cleanup.

.github/workflows/build.yml

@@ -28,4 +28,4 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: FireflyX Artifacts
-          path: build/libs/
+          path: build/libs/

.github/workflows/release.yml

@@ -18,4 +18,4 @@ jobs:
       - name: make gradle wrapper executable
         run: chmod +x ./gradlew
       - name: build
-        run: ./gradlew publish
+        run: ./gradlew publish

build.gradle.kts

@@ -1,8 +1,12 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     `java-library`
     `maven-publish`
     id("io.izzel.taboolib") version "1.40"
     id("org.jetbrains.kotlin.jvm") version "1.5.10"
+    id("com.github.johnrengelman.shadow") version "7.1.2"
 }
 
 taboolib {
@@ -31,22 +35,40 @@ taboolib {
 
 repositories {
     mavenCentral()
-    maven { url = uri("https://jitpack.io") }
+
+    maven {
+        name = "JitPack"
+        url = uri("https://jitpack.io/")
+    }
+
+    maven {
+        name = "SpigotMC"
+        url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
+    }
+
+    maven {
+        name = "CodeMC NMS"
+        url = uri("https://repo.codemc.org/repository/maven-public/")
+    }
 }
 
 dependencies {
-    compileOnly("ink.ptms:nms-all:1.0.0")
-    compileOnly("ink.ptms.core:v11900:11900-minimize:mapped")
-    compileOnly("ink.ptms.core:v11900:11900-minimize:universal")
-    compileOnly(kotlin("stdlib"))
-    compileOnly(fileTree("libs"))
+    compileOnly ("org.jetbrains.kotlin:kotlin-stdlib")
+    compileOnly ("ink.ptms:nms-all:1.0.0")
+    compileOnly ("ink.ptms.core:v11900:11900-minimize:mapped")
+    compileOnly ("ink.ptms.core:v11900:11900-minimize:universal")
+    compileOnly ("com.github.MilkBowl:VaultAPI:1.7")
+}
+
+tasks.withType<ShadowJar> {
+    manifest.attributes["Main-Class"] = "work.crash.micalhl.fireflyx.FireflyX"
 }
 
 tasks.withType<JavaCompile> {
     options.encoding = "UTF-8"
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+tasks.withType<KotlinCompile> {
     kotlinOptions {
         jvmTarget = "1.8"
         freeCompilerArgs = listOf("-Xjvm-default=all")
@@ -77,4 +99,4 @@ publishing {
             groupId = project.group.toString()
         }
     }
-}
+}

gradle.properties

@@ -1,2 +1,2 @@
 group=work.crash.micalhl
-version=1.0.0-beta1
+version=1.0.0-beta1

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

settings.gradle.kts

@@ -1 +1 @@
-rootProject.name="FireflyX"
+rootProject.name="FireflyX"

src/main/kotlin/work/crash/micalhl/fireflyx/FireflyX.kt

@@ -19,4 +19,4 @@ object FireflyX : Plugin() {
         info("Successfully running ExamplePlugin!")
     }
 
-}
+}

src/main/kotlin/work/crash/micalhl/fireflyx/api/FireflyXAPI.kt

@@ -6,4 +6,4 @@ object FireflyXAPI {
 
     val databaseEconomy = Economy()
 
-}
+}

src/main/kotlin/work/crash/micalhl/fireflyx/compat/Vault.kt

@@ -3,11 +3,9 @@ package work.crash.micalhl.fireflyx.compat
 import net.milkbowl.vault.economy.AbstractEconomy
 import net.milkbowl.vault.economy.EconomyResponse
 import org.bukkit.OfflinePlayer
-import taboolib.module.chat.colored
 import work.crash.micalhl.fireflyx.api.FireflyXAPI
 import work.crash.micalhl.fireflyx.module.config.Settings
 import work.crash.micalhl.fireflyx.util.plugin
-import java.math.BigDecimal
 import java.text.DecimalFormat
 
 @Suppress("deprecation")
@@ -138,4 +136,4 @@ class Vault : AbstractEconomy() {
         return createPlayerAccount(player.name!!)
     }
 
-}
+}

src/main/kotlin/work/crash/micalhl/fireflyx/compat/VaultHook.kt

@@ -19,4 +19,4 @@ object VaultHook {
         plugin().server.servicesManager.unregisterAll(plugin())
     }
 
-}
+}

src/main/kotlin/work/crash/micalhl/fireflyx/module/command/FlyCommand.kt

@@ -47,5 +47,4 @@ object FlyCommand {
             }
         }
     }
-
-}
+}

src/main/kotlin/work/crash/micalhl/fireflyx/module/command/MoneyCommand.kt

@@ -87,5 +87,4 @@ object MoneyCommand {
             }
         }
     }
-
-}
+}

src/main/kotlin/work/crash/micalhl/fireflyx/module/command/PingCommand.kt

@@ -16,5 +16,4 @@ object PingCommand {
             }
         }
     }
-
-}
+}

src/main/kotlin/work/crash/micalhl/fireflyx/module/command/TPSCommand.kt

@@ -17,5 +17,4 @@ object TPSCommand {
             }
         }
     }
-
-}
+}

src/main/kotlin/work/crash/micalhl/fireflyx/module/command/TpCommand.kt

@@ -140,5 +140,4 @@ object TpCommand {
             }
         }
     }
-
-}
+}

src/main/kotlin/work/crash/micalhl/fireflyx/module/config/Settings.kt

@@ -28,4 +28,4 @@ object Settings {
     var captchaIndex = 6
         private set
 
-}
+}

src/main/kotlin/work/crash/micalhl/fireflyx/module/conversation/CaptchaConversation.kt

@@ -28,5 +28,4 @@ class CaptchaConversation(private val user: ProxyPlayer, val func: () -> Unit) :
         }
         return END_OF_CONVERSATION
     }
-
-}
+}

src/main/kotlin/work/crash/micalhl/fireflyx/module/database/Economy.kt

@@ -71,5 +71,4 @@ class Economy {
             where { "user" eq user }
         }
     }
-
-}
+}

src/main/kotlin/work/crash/micalhl/fireflyx/module/listener/EconomyListener.kt

@@ -18,4 +18,4 @@ object EconomyListener {
         }
     }
 
-}
+}

src/main/kotlin/work/crash/micalhl/fireflyx/module/listener/JoinQuitTipListener.kt

@@ -21,4 +21,4 @@ object JoinQuitTipListener {
         e.quitMessage = console().asLangText("message-quit", e.player.name, if (Settings.quitTipFix) onlinePlayers().size - 1 else onlinePlayers().size)
     }
 
-}
+}

src/main/kotlin/work/crash/micalhl/fireflyx/module/ui/BalanceTop.kt

@@ -61,4 +61,4 @@ object BalanceTop {
         }
     }
 
-}
+}

src/main/kotlin/work/crash/micalhl/fireflyx/util/Captcha.kt

@@ -15,4 +15,4 @@ object Captcha {
         return captcha.toString()
     }
 
-}
+}

src/main/kotlin/work/crash/micalhl/fireflyx/util/Map.kt

@@ -8,4 +8,4 @@ inline fun <reified T, R> Map<T, R>.getKeys(value: Any): List<T> {
         }
     }
     return result
-}
+}

src/main/kotlin/work/crash/micalhl/fireflyx/util/Player.kt

@@ -9,7 +9,5 @@ fun ProxyPlayer.toOfflinePlayer(): OfflinePlayer = plugin().server.getOfflinePla
 fun ProxyPlayer.toBKPlayer(): Player? {
     return if (isOnline()) {
         return plugin().server.getPlayer(uniqueId)
-    } else {
-        null
-    }
-}
+    } else null
+}

src/main/kotlin/work/crash/micalhl/fireflyx/util/Plugin.kt

@@ -12,4 +12,4 @@ fun getTPS(): List<Double> {
     return result
 }
 
-fun plugin() = FireflyX.plugin
+fun plugin() = FireflyX.plugin

src/main/kotlin/work/crash/micalhl/fireflyx/util/Util.kt

@@ -9,4 +9,4 @@ fun String.isDouble(): Boolean {
     } catch (e: Throwable) {
         false
     }
-}
+}

src/main/resources/config.yml

@@ -3,4 +3,4 @@ TeleportTime: 120
 QuitTipFix: true
 FirstJoinMoney: 100.0
 CurrencyName: "硬币"
-CaptchaIndex: 6
+CaptchaIndex: 6