0.1-RC1

Author: as7ar

build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "io.github.grassproject"
-version = "0.1-BETA"
+version = "0.1-RC1"
 
 repositories {
     mavenCentral()
@@ -17,6 +17,7 @@ repositories {
 dependencies {
     compileOnly("io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    compileOnly("com.github.GrassProject:GPFramework:0.2-RC2")
 }
 
 

src/main/java/io/github/grassproject/queueLib/manager/QueueManager.java

@@ -31,6 +31,12 @@ public void addQueue(Queue queue) {
         this.queueList.add(queue.getUid());
     }
 
+    public Queue getQueue(UUID uuid) {
+        return this.queueList.stream()
+                .map(u -> new QueueData(u).getQueue()).filter(Objects::nonNull)
+                .filter(q-> q.getUid().equals(uuid)).toList().getFirst();
+    }
+
     public void removeQueue(Queue queue) {
         this.queueList.remove(queue.getUid());
     }

src/main/java/io/github/grassproject/queueLib/queue/Queue.java

@@ -8,6 +8,7 @@
 import io.github.grassproject.queueLib.exception.NotEnoughPlayer;
 import io.github.grassproject.queueLib.exception.NotExistPlayer;
 import io.github.grassproject.queueLib.exception.QueueMaxed;
+import io.github.grassproject.queueLib.manager.QueueManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -34,6 +35,7 @@ public class Queue {
     private final boolean disposable;
 
     private final JavaPlugin plugin= QueueLib.getPlugin();
+    private final QueueManager manager= QueueLib.getManager();
     private final QueueData data;
 
     public static Queue fromUUID(UUID uuid) {
@@ -57,6 +59,7 @@ public Queue(
         this.joinedPlayer = new HashSet<>();
 
         QueueData.save(this);
+        manager.addQueue(this);
         data=new QueueData(uid);
     }
 

src/main/kotlin/io/github/grassproject/queueLib/QueueLib.kt

@@ -1,18 +1,21 @@
 package io.github.grassproject.queueLib
 
-import org.bukkit.plugin.java.JavaPlugin
+import io.github.grassproject.framework.core.GPPlugin
+import io.github.grassproject.queueLib.manager.QueueManager
 
-class QueueLib : JavaPlugin() {
+abstract class QueueLib : GPPlugin() {
     companion object {
         @JvmStatic
         lateinit var plugin:QueueLib
             private set
-    }
 
-    override fun onLoad() {
-        plugin=this
+        @JvmStatic
+        lateinit var manager: QueueManager
+            private set
     }
 
-    override fun onEnable() {
+    override fun load() {
+        plugin=this
+        manager= QueueManager()
     }
 }

src/main/kotlin/io/github/grassproject/queueLib/data/UserData.kt

@@ -1,10 +1,11 @@
 package io.github.grassproject.queueLib.data
 
+import io.github.grassproject.framework.config.GPConfig
 import io.github.grassproject.queueLib.QueueLib
 import io.github.grassproject.queueLib.player.Waiter
+import org.bukkit.configuration.file.FileConfiguration
 import org.bukkit.configuration.file.YamlConfiguration
 import org.bukkit.entity.Player
-import java.io.File
 
 class UserData(private val waiter: Waiter) {
     companion object {
@@ -15,16 +16,14 @@ class UserData(private val waiter: Waiter) {
     }
 
     private val plugin=QueueLib.plugin
-    internal val file= File(plugin.dataFolder, "userdata/${waiter.getPlayer().uniqueId}")
-    private val config=YamlConfiguration.loadConfiguration(file)
-    private fun YamlConfiguration.reload() {
-        this.load(file)
+    internal val userdata= GPConfig(plugin.dataFolder, "userdata/${waiter.getPlayer().uniqueId}")
+    private val config= userdata.config
+    private fun FileConfiguration.reload() {
+        userdata.reload(userdata.file)
     }
 
-    fun getConfig():YamlConfiguration {
+    fun getConfig():FileConfiguration {
         config.reload()
         return config
     }
-
-
 }

src/main/kotlin/io/github/grassproject/queueLib/events/PlayerQueueJoinEvent.kt

@@ -1,5 +1,6 @@
 package io.github.grassproject.queueLib.events
 
+import io.github.grassproject.framework.core.events.GPPlayerEvent
 import org.bukkit.entity.Player
 import org.bukkit.event.HandlerList
 import org.bukkit.event.player.PlayerEvent
@@ -8,14 +9,4 @@ import java.util.*
 class PlayerQueueJoinEvent(
     player:Player,
     val queue: UUID
-): PlayerEvent(player) {
-    override fun getEventName() = "PlayerQueueJoinEvent"
-    override fun getHandlers(): HandlerList = getHandlerList()
-    companion object {
-        private val handlers = HandlerList()
-        @JvmStatic
-        fun getHandlerList(): HandlerList {
-            return handlers
-        }
-    }
-}
+): GPPlayerEvent(player, "PlayerQueueJoinEvent")

src/main/kotlin/io/github/grassproject/queueLib/events/PlayerQueueLeaveEvent.kt

@@ -1,5 +1,6 @@
 package io.github.grassproject.queueLib.events
 
+import io.github.grassproject.framework.core.events.GPPlayerEvent
 import org.bukkit.entity.Player
 import org.bukkit.event.HandlerList
 import org.bukkit.event.player.PlayerEvent
@@ -8,14 +9,4 @@ import java.util.*
 class PlayerQueueLeaveEvent(
     player: Player,
     val queue: UUID
-): PlayerEvent(player) {
-    override fun getEventName() = "PlayerQueueLeaveEvent"
-    override fun getHandlers(): HandlerList = getHandlerList()
-    companion object {
-        private val handlers = HandlerList()
-        @JvmStatic
-        fun getHandlerList(): HandlerList {
-            return handlers
-        }
-    }
-}
+): GPPlayerEvent(player, "PlayerQueueLeaveEvent")

src/main/kotlin/io/github/grassproject/queueLib/events/QueueStartEvent.kt

@@ -1,5 +1,6 @@
 package io.github.grassproject.queueLib.events
 
+import io.github.grassproject.framework.core.events.GPEvent
 import org.bukkit.entity.Player
 import org.bukkit.event.Event
 import org.bukkit.event.HandlerList
@@ -9,14 +10,4 @@ class QueueStartEvent(
     uid: UUID,
     players:Set<Player>,
     mapUID: UUID
-):Event() {
-    override fun getEventName() = "QueueStartEvent"
-    override fun getHandlers(): HandlerList = getHandlerList()
-    companion object {
-        private val handlers = HandlerList()
-        @JvmStatic
-        fun getHandlerList(): HandlerList {
-            return handlers
-        }
-    }
-}
+): GPEvent("QueueStartEvent")

src/main/kotlin/io/github/grassproject/queueLib/player/Waiter.kt

@@ -16,14 +16,16 @@ class Waiter(private val player:Player) {
 
     fun setQueue(uuid:UUID?) {
         val userData=UserData(this)
-        userData.getConfig().apply {
+        userData.userdata.apply {
             set("user.queue", uuid?.toString())
-        }.save(userData.file)
+        }.save()
     }
 
     fun getQueue():UUID? {
-        val str=UserData(this)
-            .getConfig().getString("user.queue") ?: return null
+        val str= UserData(this).userdata.getValue(
+            "user.queue",
+            String::class
+        )
         return UUID.fromString(str)
     }
 }