Use paper-plugin, geary 0.27

MineInAbyss · Nov 4, 2023 · 1469e90 · 1469e90
1 parent c38072e
commit 1469e90
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 18 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
 group=com.mineinabyss
 version=1.8
-idofrontVersion=0.19.14
+idofrontVersion=0.20.6
diff --git a/gradle/bfLibs.versions.toml b/gradle/bfLibs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-gearyPaper = "0.26.0"
+gearyPaper = "0.27.0"
 blocky = "0.8.4"
 protocolburrito = "0.8.0"
 

diff --git a/src/main/kotlin/com/mineinabyss/bonfire/BonfirePlugin.kt b/src/main/kotlin/com/mineinabyss/bonfire/BonfirePlugin.kt
@@ -8,27 +8,24 @@ import com.mineinabyss.geary.autoscan.autoscan
 import com.mineinabyss.geary.modules.geary
 import com.mineinabyss.idofront.config.config
 import com.mineinabyss.idofront.di.DI
-import com.mineinabyss.idofront.platforms.Platforms
 import com.mineinabyss.idofront.plugin.listeners
 import org.bukkit.plugin.java.JavaPlugin
 
 class BonfirePlugin : JavaPlugin() {
     override fun onLoad() {
-        Platforms.load(this, "mineinabyss")
+        registerBonfireContext()
+        geary {
+            autoscan(classLoader, "com.mineinabyss.bonfire") {
+                all()
+            }
+        }
     }
 
     override fun onEnable() {
-        registerBonfireContext()
-
         BonfireCommands()
 
         listeners(PlayerListener(), BonfireListener(), DebugListener())
 
-        geary {
-            autoscan(classLoader, "com.mineinabyss.bonfire") {
-                all()
-            }
-        }
     }
 
     fun registerBonfireContext() {

diff --git a/src/main/resources/plugin.yml → src/main/resources/paper-plugin.yml b/src/main/resources/plugin.yml → src/main/resources/paper-plugin.yml
@@ -1,14 +1,8 @@
 name: Bonfire
-version: ${plugin_version}
+version: "${plugin_version}"
 main: com.mineinabyss.bonfire.BonfirePlugin
 api-version: "1.20"
 authors: [ boy0000, Scyu_, Norazan, Ru_Kira ]
-depend: [ Geary, Blocky ]
-softdepend: [ DeeperWorld ]
-
-commands:
-  bonfire:
-    aliases: [ bf ]
 
 permissions:
   bonfire.*:
@@ -18,3 +12,18 @@ permissions:
   bonfire.remove:
     description: Allow staff to remove bonfires.
     default: op
+
+dependencies:
+  server:
+    Geary:
+      required: true
+      load: BEFORE
+      join-classpath: true
+    Blocky:
+      required: true
+      load: BEFORE
+      join-classpath: true
+    DeeperWorld:
+      required: false
+      load: BEFORE
+      join-classpath: true