Merge remote-tracking branch 'origin/master'

.github/workflows/gradle-deploy.yml

@@ -55,7 +55,7 @@ jobs:
         echo $URL
         echo $REPO_NAME
         ls build/libs
-        file=$(ls build/libs/ls-christmas-plugin-1.0-SNAPSHOT.jar)
+        file=$(ls build/libs/flyte-christmas-plugin.jar)
         curl "$URL&directory=/plugins" \
           -H 'Content-Type: multipart/form-data' \
           -F "files=@$file" \

build.gradle.kts

@@ -0,0 +1,55 @@
+plugins {
+    alias(libs.plugins.kotlin)
+    alias(libs.plugins.shadow)
+    alias(libs.plugins.paperweight)
+    alias(libs.plugins.run.paper)
+}
+
+group = "gg.flyte"
+version = "1.0.0"
+
+repositories {
+    maven("https://jitpack.io")
+    maven("https://repo.flyte.gg/releases")
+    maven("https://repo.papermc.io/repository/maven-public/")
+    maven("https://oss.sonatype.org/content/groups/public/")
+    maven("https://repo.codemc.io/repository/maven-snapshots/")
+}
+
+dependencies {
+    paperweight.paperDevBundle("1.20.1-R0.1-SNAPSHOT")
+
+    implementation(libs.twilight)
+    implementation(libs.paperlib)
+
+    implementation(libs.lamp.common)
+    implementation(libs.lamp.bukkit)
+
+    implementation(libs.anvil.gui)
+    implementation(libs.mongodb)
+    compileOnly(libs.noteblock.api)
+}
+
+tasks {
+    build { dependsOn(shadowJar) }
+    assemble { dependsOn(reobfJar) }
+    runServer { minecraftVersion("1.20.1") }
+    compileKotlin { kotlinOptions.jvmTarget = "17" }
+    reobfJar { outputJar.set(layout.buildDirectory.file("libs/flyte-christmas-plugin.jar")) }
+
+
+    shadowJar {
+        val pack = "gg.flyte.event.shaded."
+        relocate("gg.flyte.twilight", "${pack}twilight")
+        relocate("revxrsal.commands", "${pack}lamp")
+        relocate("com.google.gson", "${pack}gson")
+        relocate("kotlin", "${pack}kotlin")
+        relocate("com.mongodb", "${pack}mongodb")
+        relocate("io.github.cdimascio.dotenv", "${pack}dotenv")
+        relocate("net.wesjd.anvilgui", "${pack}anvilgui")
+        relocate("org.bson", "${pack}bson")
+        relocate("org.intellij.lang.annotations", "${pack}jetbrains.annotations")
+        relocate("org.jetbrains.annotations", "${pack}jetbrains.annotations")
+        relocate("io.papermc.lib", "${pack}paperlib")
+    }
+}

gradle/libs.versions.toml

@@ -0,0 +1,36 @@
+[versions]
+# Plugins
+kotlin = "1.9.20"
+shadow = "8.1.1"
+paperweight = "1.5.10"
+run-paper = "2.2.2"
+
+# Libraries
+twilight = "1.0.30"
+paperlib = "1.0.7"
+bstats = "3.0.2"
+lamp = "3.1.8"
+adventure = "4.14.0"
+adventure-platform-bukkit = "4.3.1"
+
+[libraries]
+twilight = { module = "gg.flyte:twilight", version.ref = "twilight" }
+paperlib = { module = "io.papermc:paperlib", version.ref = "paperlib" }
+bstats = { module = "org.bstats:bstats-bukkit", version.ref = "bstats" }
+
+lamp-common = { module = "com.github.Revxrsal.Lamp:common", version.ref = "lamp" }
+lamp-bukkit = { module = "com.github.Revxrsal.Lamp:bukkit", version.ref = "lamp" }
+
+adventure = { module = "net.kyori:adventure", version.ref = "adventure" }
+adventure-text-minimessage = { module = "net.kyori:adventure-text-minimessage", version.ref = "adventure" }
+adventure-platform-bukkit = { module = "net.kyori:adventure-platform-bukkit", version.ref = "adventure-platform-bukkit" }
+
+anvil-gui = { module = "net.wesjd:anvilgui", version = "1.7.0-SNAPSHOT" }
+mongodb = { module = "org.mongodb:mongodb-driver-sync", version = "4.9.0" }
+noteblock-api = { module = "com.github.koca2000:NoteBlockAPI", version = "1.6.2" }
+
+[plugins]
+kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
+paperweight = { id = "io.papermc.paperweight.userdev", version.ref = "paperweight" }
+run-paper = { id = "xyz.jpenilla.run-paper", version.ref = "run-paper" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -1,3 +1,2 @@
-
-rootProject.name = "ls-christmas-plugin"
+rootProject.name = "flyte-christmas-plugin"
 

src/main/kotlin/com/learnspigot/event/ChristmasEvent.kt → src/main/kotlin/gg/flyte/event/ChristmasEvent.kt

@@ -1,12 +1,13 @@
-package com.learnspigot.event
+package gg.flyte.event
 
-import com.learnspigot.event.debug.DebugCommand
-import com.learnspigot.event.game.GameCommand
-import com.learnspigot.event.game.GameType
-import com.learnspigot.event.listener.ConnectionListener
-import com.learnspigot.event.listener.MapListener
-import com.learnspigot.event.util.MapLocation
-import com.learnspigot.event.util.npc.NPCListener
+import gg.flyte.event.debug.DebugCommand
+import gg.flyte.event.game.GameCommand
+import gg.flyte.event.game.GameType
+import gg.flyte.event.listener.ConnectionListener
+import gg.flyte.event.listener.MapListener
+import gg.flyte.event.util.MapLocation
+
+import gg.flyte.event.util.npc.NPCListener
 import gg.flyte.twilight.event.custom.admin.listener.OpEventListener
 import gg.flyte.twilight.event.disableCustomEventListeners
 import gg.flyte.twilight.extension.enumValue
@@ -38,7 +39,7 @@ class ChristmasEvent : JavaPlugin() {
         disableCustomEventListeners(OpEventListener)
 
         listeners()
-        commands()
+        CommandManager
 
         // TEST REMOVE
         /*NPC(
@@ -53,35 +54,6 @@ class ChristmasEvent : JavaPlugin() {
         // TEST REMOVE
     }
 
-    override fun onDisable() {
-
-    }
-
-    private fun commands() {
-        BukkitCommandHandler.create(this).apply {
-            registerValueResolver(GameType::class.java) {
-                enumValue<GameType>(it.pop()) ?: throw CommandErrorException("Invalid game type!", it.pop())
-            }
-
-            registerValueResolver(DebugCommand.WorldName::class.java) { DebugCommand.WorldName(it.pop()) }
-
-            autoCompleter {
-                registerParameterSuggestions(GameType::class.java) { _, _, _ ->
-                    GameType.entries.map { it.name.uppercase() }
-                }
-
-                registerParameterSuggestions(DebugCommand.WorldName::class.java) { _, _, _ ->
-                    Bukkit.getWorlds().map { it.name }
-                }
-            }
-
-            register(
-                GameCommand,
-                DebugCommand
-            )
-        }
-    }
-
     private fun listeners() {
         ConnectionListener
         NPCListener

src/main/kotlin/gg/flyte/event/CommandManager.kt

@@ -0,0 +1,48 @@
+package gg.flyte.event
+
+import gg.flyte.event.debug.DebugCommand
+import gg.flyte.event.game.GameCommand
+import gg.flyte.event.game.GameType
+import gg.flyte.twilight.Twilight
+import gg.flyte.twilight.extension.enumValue
+import org.bukkit.Bukkit
+import revxrsal.commands.bukkit.BukkitCommandHandler
+import revxrsal.commands.exception.CommandErrorException
+import revxrsal.commands.ktx.autoCompleter
+
+object CommandManager {
+
+    init {
+        BukkitCommandHandler.create(Twilight.plugin).apply {
+            registerAutoComplete()
+            registerCommands()
+            registerBrigadier()
+        }
+    }
+
+    private fun BukkitCommandHandler.registerCommands() {
+        register(
+            GameCommand,
+            DebugCommand
+        )
+    }
+
+    private fun BukkitCommandHandler.registerAutoComplete() {
+        registerValueResolver(GameType::class.java) {
+            enumValue<GameType>(it.pop()) ?: throw CommandErrorException("Invalid game type!", it.pop())
+        }
+
+        registerValueResolver(DebugCommand.WorldName::class.java) { DebugCommand.WorldName(it.pop()) }
+
+        autoCompleter {
+            registerParameterSuggestions(GameType::class.java) { _, _, _ ->
+                GameType.entries.map { it.name.uppercase() }
+            }
+
+            registerParameterSuggestions(DebugCommand.WorldName::class.java) { _, _, _ ->
+                Bukkit.getWorlds().map { it.name }
+            }
+        }
+    }
+
+}

src/main/kotlin/com/learnspigot/event/debug/DebugCommand.kt → src/main/kotlin/gg/flyte/event/debug/DebugCommand.kt

@@ -1,4 +1,4 @@
-package com.learnspigot.event.debug
+package gg.flyte.event.debug
 
 import org.bukkit.Bukkit
 import org.bukkit.WorldCreator

src/main/kotlin/com/learnspigot/event/game/Game.kt → src/main/kotlin/gg/flyte/event/game/Game.kt

@@ -1,4 +1,4 @@
-package com.learnspigot.event.game
+package gg.flyte.event.game
 
 import gg.flyte.twilight.event.TwilightListener
 import org.bukkit.entity.Player

src/main/kotlin/com/learnspigot/event/game/GameCommand.kt → src/main/kotlin/gg/flyte/event/game/GameCommand.kt

@@ -1,6 +1,6 @@
-package com.learnspigot.event.game
+package gg.flyte.event.game
 
-import com.learnspigot.event.game.main.MainGameEngine
+import gg.flyte.event.game.main.MainGameEngine
 import net.kyori.adventure.text.Component
 import net.kyori.adventure.text.format.NamedTextColor
 import org.bukkit.Bukkit
@@ -15,8 +15,8 @@ import revxrsal.commands.ktx.commandError
 @CommandPermission("admin")
 object GameCommand {
 
-    @DefaultFor
-    fun game() {
+    @DefaultFor("~", "~ help")
+    fun game(sender: CommandSender) {
         commandError("Invalid usage. Use /game set/start/stop [game].")
     }
 

src/main/kotlin/com/learnspigot/event/game/GameType.kt → src/main/kotlin/gg/flyte/event/game/GameType.kt

@@ -1,11 +1,11 @@
-package com.learnspigot.event.game
+package gg.flyte.event.game
 
-import com.learnspigot.event.game.lobby.type.PresentHuntGame
-import com.learnspigot.event.game.main.MainGame
-import com.learnspigot.event.game.main.type.KingOfTheHillGame
-import com.learnspigot.event.game.main.type.MusicalMinecartsGame
-import com.learnspigot.event.game.main.type.SledRacingGame
-import com.learnspigot.event.util.MapLocation
+import gg.flyte.event.game.lobby.type.PresentHuntGame
+import gg.flyte.event.game.main.MainGame
+import gg.flyte.event.game.main.type.KingOfTheHillGame
+import gg.flyte.event.game.main.type.MusicalMinecartsGame
+import gg.flyte.event.game.main.type.SledRacingGame
+import gg.flyte.event.util.MapLocation
 import net.kyori.adventure.text.Component
 import org.bukkit.GameMode
 import org.bukkit.util.BoundingBox

src/main/kotlin/com/learnspigot/event/game/lobby/LobbyGame.kt → src/main/kotlin/gg/flyte/event/game/lobby/LobbyGame.kt

@@ -1,6 +1,6 @@
-package com.learnspigot.event.game.lobby
+package gg.flyte.event.game.lobby
 
-import com.learnspigot.event.game.Game
+import gg.flyte.event.game.Game
 import org.bukkit.entity.Player
 
 abstract class LobbyGame : Game() {

src/main/kotlin/com/learnspigot/event/game/lobby/LobbyGameEngine.kt → src/main/kotlin/gg/flyte/event/game/lobby/LobbyGameEngine.kt

@@ -1,8 +1,8 @@
-package com.learnspigot.event.game.lobby
+package gg.flyte.event.game.lobby
 
-import com.learnspigot.event.ChristmasEvent
-import com.learnspigot.event.game.GameCategory
-import com.learnspigot.event.game.GameType
+import gg.flyte.event.ChristmasEvent
+import gg.flyte.event.game.GameCategory
+import gg.flyte.event.game.GameType
 import gg.flyte.twilight.event.TwilightListener
 import gg.flyte.twilight.extension.applyForEach
 import gg.flyte.twilight.extension.clearActionBar