0.2-RC2

as7ar · as7ar · commit 5bd0236ccb9e · 2025-08-30T22:25:20.000+09:00
diff --git a/.idea/dictionaries/project.xml b/.idea/dictionaries/project.xml
diff --git a/Core/src/main/kotlin/io/github/grassproject/framework/config/Config.kt b/Core/src/main/kotlin/io/github/grassproject/framework/config/Config.kt
@@ -4,6 +4,8 @@ import io.github.grassproject.framework.core.GPPlugin
 import org.bukkit.configuration.file.FileConfiguration
 import org.bukkit.configuration.file.YamlConfiguration
 import java.io.File
+import kotlin.reflect.KClass
+import kotlin.reflect.full.cast
 
 fun GPPlugin.saveResource(resource: String, file: File) {
     if (file.exists()) return
@@ -23,7 +25,7 @@ fun GPPlugin.saveResource(resource: String, file: File) {
     }
 }
 
-fun GPPlugin.init(vararg configs: GPFile) {
+fun GPPlugin.init(vararg configs: GPConfig) {
     configs.forEach { yaml ->
         val file = File(dataFolder, yaml.name)
         if (!file.exists()) saveResource(yaml.name, file)
@@ -60,6 +62,10 @@ abstract class Config {
     open fun double(path: String, def: Double = 0.0) = config.getDouble(path, def)
     open fun doubleList(path: String) = config.getDoubleList(path)
 
+    open fun <T: Any> getValue(path: String, clazz: KClass<T>): T {
+        return clazz.cast(config.get(path))
+    }
+
     inline fun <reified T : Enum<T>> enum(path: String, def: T): T {
         val str = string(path, def.name)
         return runCatching { enumValueOf<T>(str.uppercase()) }.getOrDefault(def)
@@ -87,7 +93,7 @@ open class ConfigFile(open val file: File) : Config() {
     }
 }
 
-open class GPFile(pluginFolder: File, open var name: String) :
+open class GPConfig(pluginFolder: File, open var name: String) :
     ConfigFile(File(pluginFolder, name)) {
 
     constructor(pluginFolder: File, name: String, autoCreate: Boolean = true) : this(pluginFolder, name) {
diff --git a/Core/src/main/kotlin/io/github/grassproject/framework/config/ConfigExt.kt b/Core/src/main/kotlin/io/github/grassproject/framework/config/ConfigExt.kt
@@ -4,7 +4,6 @@ import org.bukkit.configuration.ConfigurationSection
 import org.bukkit.configuration.MemoryConfiguration
 import org.bukkit.configuration.file.FileConfiguration
 import org.bukkit.configuration.file.YamlConfiguration
-import kotlin.collections.iterator
 
 fun ConfigurationSection.keysForEach(path: String, boolean: Boolean, function: (String) -> Unit) {
     val section = getConfigurationSection(path) ?: return
diff --git a/Core/src/main/kotlin/io/github/grassproject/framework/core/GPFrameworkEngine.kt b/Core/src/main/kotlin/io/github/grassproject/framework/core/GPFrameworkEngine.kt
@@ -1,20 +1,18 @@
 package io.github.grassproject.framework.core
 
-import org.slf4j.LoggerFactory
+import io.github.grassproject.framework.util.GPLogger
 
 object GPFrameworkEngine {
-
-    private val logger = LoggerFactory.getLogger("GPFramework")
     private val plugins = mutableMapOf<String, GPPlugin>()
 
     fun register(plugin: GPPlugin) {
         plugins[plugin.name] = plugin
-        logger.info("Registered plugin ${plugin.name}")
+        GPLogger.suc("Registered plugin ${plugin.name}")
     }
 
     fun unregister(plugin: GPPlugin) {
         plugins.remove(plugin.name)
-        logger.info("Unregistered plugin ${plugin.name}")
+        GPLogger.bug("Unregistered plugin ${plugin.name}")
     }
 
     fun getPlugin(name: String): GPPlugin? = plugins[name]
diff --git a/Core/src/main/kotlin/io/github/grassproject/framework/core/GPPlugin.kt b/Core/src/main/kotlin/io/github/grassproject/framework/core/GPPlugin.kt
@@ -1,17 +1,22 @@
 package io.github.grassproject.framework.core
 
+import io.github.grassproject.framework.util.GPLogger
 import io.github.grassproject.framework.util.bukkit.MinecraftVersion
 import org.bukkit.plugin.java.JavaPlugin
 
 abstract class GPPlugin : JavaPlugin(), GPFramework {
+    val version=pluginMeta.version
+    val authors=pluginMeta.authors
+    val description=pluginMeta.description
+    val apiVersion=pluginMeta.apiVersion
 
     override fun onLoad() {
         load()
     }
 
     override fun onEnable() {
         if (!MinecraftVersion.V1_21_1.isAbove()) {
-            logger.warning("서버 버전이 너무 낮습니다. 1.21.1 이상을 사용하세요.")
+            GPLogger.warning("서버 버전이 너무 낮습니다. 1.21.1 이상을 사용하세요.")
             server.pluginManager.disablePlugin(this)
             return
         }
diff --git a/Core/src/main/kotlin/io/github/grassproject/framework/core/command/GPbrigadier.kt b/Core/src/main/kotlin/io/github/grassproject/framework/core/command/GPbrigadier.kt
@@ -0,0 +1,54 @@
+package io.github.grassproject.framework.core.command
+
+import com.mojang.brigadier.arguments.ArgumentType
+import com.mojang.brigadier.builder.LiteralArgumentBuilder
+import com.mojang.brigadier.tree.LiteralCommandNode
+import io.papermc.paper.command.brigadier.CommandSourceStack
+import org.bukkit.plugin.java.JavaPlugin
+
+@Deprecated("Experimental")
+abstract class GPBrigadier {
+
+    abstract val plugin: JavaPlugin
+    abstract val commandName: String
+    open val permission: String? = null
+
+    protected val rootBuilder: LiteralArgumentBuilder<CommandSourceStack> by lazy {
+        LiteralArgumentBuilder.literal<CommandSourceStack>(commandName)
+    }
+
+    val commandNode: LiteralCommandNode<CommandSourceStack>
+        get() = rootBuilder.build()
+
+    fun literal(name: String, block: LiteralArgumentBuilder<CommandSourceStack>.() -> Unit) {
+        val builder = LiteralArgumentBuilder.literal<CommandSourceStack>(name)
+        builder.block()
+        rootBuilder.then(builder)
+    }
+
+    fun <T> argument(name: String, type: ArgumentType<T>, executes: ((CommandSourceStack, ArgumentType<T>) -> Int)? = null) {
+        val argBuilder = com.mojang.brigadier.builder.RequiredArgumentBuilder.argument<CommandSourceStack, T>(name, type)
+        if (executes != null) {
+            argBuilder.executes { ctx ->
+                val value = ctx.getArgument(name, type.javaClass)
+                executes(ctx.source, value)
+            }
+        }
+        rootBuilder.then(argBuilder)
+    }
+
+    open fun executes(exec: (CommandSourceStack, Array<String>) -> Int) {
+        rootBuilder.executes { ctx ->
+            val args = ctx.input.split(" ").drop(1).toTypedArray()
+            exec(ctx.source, args)
+        }
+    }
+
+    fun register(): LiteralCommandNode<CommandSourceStack> {
+//        plugin.server.pluginManager.registerEvents(object : org.bukkit.event.Listener {}, plugin)
+//        plugin.getLifecycleManager().registerEventHandler(io.papermc.paper.command.brigadier.) { commands ->
+//            commands.registrar().register(commandNode, "GPBrigadier: $commandName")
+//        }
+        return this.rootBuilder.build()
+    }
+}
diff --git a/Core/src/main/kotlin/io/github/grassproject/framework/database/DatabaseManager.kt b/Core/src/main/kotlin/io/github/grassproject/framework/database/DatabaseManager.kt
@@ -2,14 +2,12 @@ package io.github.grassproject.framework.database
 
 import com.zaxxer.hikari.HikariConfig
 import com.zaxxer.hikari.HikariDataSource
-import io.github.grassproject.framework.config.GPFile
-import io.github.grassproject.framework.core.GPPlugin
+import io.github.grassproject.framework.config.GPConfig
 import org.jetbrains.exposed.v1.core.Table
 import org.jetbrains.exposed.v1.jdbc.Database
 import org.jetbrains.exposed.v1.jdbc.SchemaUtils
 import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import java.io.File
-import java.io.IOException
 
 object DatabaseManager {
 
@@ -19,7 +17,7 @@ object DatabaseManager {
         this.driver = driver
     }
 
-    fun initConfig(config: GPFile) {
+    fun initConfig(config: GPConfig) {
         val type = config.enum("database.type", DataType.SQLITE)
 
         val host = config.string("database.credentials.host", "localhost")
diff --git a/Core/src/main/kotlin/io/github/grassproject/framework/item/ItemBuilder.kt b/Core/src/main/kotlin/io/github/grassproject/framework/item/ItemBuilder.kt
@@ -15,7 +15,6 @@ import org.bukkit.inventory.meta.ItemMeta
 import org.bukkit.inventory.meta.components.CustomModelDataComponent
 import org.bukkit.persistence.PersistentDataContainer
 import org.bukkit.persistence.PersistentDataType
-import kotlin.collections.iterator
 
 class ItemBuilder(private val itemStack: ItemStack) {
 
diff --git a/Core/src/main/kotlin/io/github/grassproject/framework/item/ItemHandler.kt b/Core/src/main/kotlin/io/github/grassproject/framework/item/ItemHandler.kt
@@ -1,6 +1,8 @@
 package io.github.grassproject.framework.item
 
-import io.github.grassproject.framework.item.factory.*
+import io.github.grassproject.framework.item.factory.CraftEngineFactory
+import io.github.grassproject.framework.item.factory.IAFactory
+import io.github.grassproject.framework.item.factory.NexoFactory
 import org.bukkit.Material
 import org.bukkit.inventory.ItemStack
 
diff --git a/Core/src/main/kotlin/io/github/grassproject/framework/util/GPLogger.kt b/Core/src/main/kotlin/io/github/grassproject/framework/util/GPLogger.kt
@@ -0,0 +1,28 @@
+package io.github.grassproject.framework.util
+
+import io.github.grassproject.framework.util.component.toMiniMessage
+import org.bukkit.Bukkit
+
+object GPLogger {
+    private val prefix="<#96f19c>GPFramework</#96f19c><#989c99> > </#989c99>"
+
+    @JvmStatic
+    fun info(string: String) {
+        Bukkit.getConsoleSender().sendMessage { "${prefix}<white>${string}</white>".toMiniMessage() }
+    }
+
+    @JvmStatic
+    fun warning(string: String) {
+        Bukkit.getConsoleSender().sendMessage { "${prefix}<yellow>${string}</yellow>".toMiniMessage() }
+    }
+
+    @JvmStatic
+    fun suc(string: String) {
+        Bukkit.getConsoleSender().sendMessage { "${prefix}<green>${string}</green>".toMiniMessage() }
+    }
+
+    @JvmStatic
+    fun bug(string: String) {
+        Bukkit.getConsoleSender().sendMessage { "${prefix}<red>${string}</red>".toMiniMessage() }
+    }
+}
diff --git a/Core/src/main/kotlin/io/github/grassproject/framework/util/Register.kt b/Core/src/main/kotlin/io/github/grassproject/framework/util/Register.kt
@@ -7,7 +7,7 @@ import org.bukkit.command.TabExecutor
 import org.bukkit.event.Listener
 import org.bukkit.plugin.java.JavaPlugin
 
-@Deprecated("Framework")
+@Deprecated("Framework", level = DeprecationLevel.WARNING)
 class Register(val plugin: JavaPlugin) {
 
     fun resisterEventListener(listener: Listener): Register {
diff --git a/Core/src/main/kotlin/io/github/grassproject/framework/util/component/Str2Component.kt b/Core/src/main/kotlin/io/github/grassproject/framework/util/component/Str2Component.kt
@@ -7,8 +7,6 @@ import net.kyori.adventure.text.format.Style
 import net.kyori.adventure.text.format.TextColor
 import net.kyori.adventure.text.format.TextDecoration
 import net.kyori.adventure.text.minimessage.MiniMessage
-import kotlin.collections.get
-import kotlin.text.iterator
 
 object Str2Component {
     private val miniMessage = MiniMessage.miniMessage()
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "io.github.grassproject"
-version = "0.2-RC1"
+version = "0.2-RC2"
 
 val exposed = "1.0.0-beta-5"
 
@@ -73,8 +73,11 @@ tasks {
         val props = mapOf("version" to version)
         inputs.properties(props)
         filteringCharset = "UTF-8"
-        filesMatching("^(paper-plugin|plugin)\\.yml$") {
+        filesMatching("paper-plugin.yml") {
+            expand(props)
+        }
+        filesMatching("plugin.yml") {
             expand(props)
         }
     }
-}
+}
diff --git a/jitpack.yml b/jitpack.yml
@@ -0,0 +1,2 @@
+jdk:
+  - openjdk21
diff --git a/src/main/kotlin/io/github/grassproject/framework/GPFrameworkBootstrap.kt b/src/main/kotlin/io/github/grassproject/framework/GPFrameworkBootstrap.kt
@@ -2,8 +2,6 @@ package io.github.grassproject.framework
 
 import io.papermc.paper.plugin.bootstrap.BootstrapContext
 import io.papermc.paper.plugin.bootstrap.PluginBootstrap
-import io.papermc.paper.plugin.bootstrap.PluginProviderContext
-import org.bukkit.plugin.java.JavaPlugin
 
 class GPFrameworkBootstrap : PluginBootstrap {
     override fun bootstrap(context: BootstrapContext) {}
diff --git a/src/main/kotlin/io/github/grassproject/framework/GPFrameworkPlugin.kt b/src/main/kotlin/io/github/grassproject/framework/GPFrameworkPlugin.kt
@@ -1,27 +1,36 @@
 package io.github.grassproject.framework
 
-import io.github.grassproject.framework.config.GPFile
+import io.github.grassproject.framework.commands.GPFCommand
+import io.github.grassproject.framework.config.GPConfig
 import io.github.grassproject.framework.config.init
 import io.github.grassproject.framework.core.GPPlugin
 import io.github.grassproject.framework.database.DatabaseManager
+import io.github.grassproject.framework.util.GPLogger
 
 class GPFrameworkPlugin : GPPlugin() {
-
     companion object {
         lateinit var instance: GPFrameworkPlugin
             private set
     }
 
     override fun load() {
         instance = this
+        saveResource("lang/ko.json", true)
+        GPLogger.info("Loading Framework...")
     }
 
     override fun enable() {
-        val config = GPFile(dataFolder, "config.yml")
+        val config = GPConfig(dataFolder, "config.yml")
         init(config)
         DatabaseManager.initConfig(config)
         DatabaseManager.connect()
+
+        GPLogger.info("GPFramework successfully enabled")
+
+        GPFCommand()
     }
 
-    override fun disable() {}
+    override fun disable() {
+        GPLogger.warning("GPFramework disabled")
+    }
 }
diff --git a/src/main/kotlin/io/github/grassproject/framework/commands/GPFCommand.kt b/src/main/kotlin/io/github/grassproject/framework/commands/GPFCommand.kt
@@ -0,0 +1,45 @@
+package io.github.grassproject.framework.commands
+
+import io.github.grassproject.framework.GPFrameworkPlugin
+import io.github.grassproject.framework.core.GPFrameworkEngine
+import io.github.grassproject.framework.core.command.GPCommand
+import io.github.grassproject.framework.util.component.toMiniMessage
+import io.github.grassproject.framework.utils.translate
+import org.bukkit.command.CommandSender
+
+class GPFCommand: GPCommand<GPFrameworkPlugin>(
+    GPFrameworkPlugin.instance,
+    "gpf", listOf("gpframework"),
+    "", "gp.framework.commands"
+) {
+    private val prefix="<#96f19c>GPF</#96f19c><#989c99> | </#989c99>".toMiniMessage()
+    override fun execute(sender: CommandSender, args: Array<out String>): Boolean {
+        if (args.size == 1) {
+            if (args[0]=="info") {
+                translate.fromList(
+                    "command.gpf.info", mapOf(
+                        "server" to sender.server.name,
+                        "version" to sender.server.version,
+                        "nms" to sender.server.bukkitVersion,
+                        "name" to plugin.name,
+                        "ver" to plugin.version,
+                        "list" to GPFrameworkEngine.listPlugins().joinToString(", ")
+                    )
+                ).forEach { sender.sendMessage(prefix.append { it.toMiniMessage() }) }
+            }
+
+            if (args[0]=="") {
+
+            }
+        }
+        return true
+    }
+
+    override fun tabComplete(sender: CommandSender, args: Array<out String>): List<String> {
+        val tab = mutableListOf<String>()
+        if (args.size==1) {
+            tab.addAll(arrayOf("info"))
+        }
+        return tab
+    }
+}
diff --git a/src/main/kotlin/io/github/grassproject/framework/utils/translate.kt b/src/main/kotlin/io/github/grassproject/framework/utils/translate.kt
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
diff --git a/src/main/resources/lang/ko.json b/src/main/resources/lang/ko.json
