Skip to content

Commit 87010ec

Browse files
committed
update GPF
1 parent d659c10 commit 87010ec

File tree

7 files changed

+22
-18
lines changed

7 files changed

+22
-18
lines changed

build.gradle.kts

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2+
import org.gradle.kotlin.dsl.register
3+
14
plugins {
25
kotlin("jvm") version "2.2.10"
36
id("com.gradleup.shadow") version "8.3.0"
47
}
58

69
group = "io.github.grassproject"
7-
version = "0.1-RC1"
10+
version = "0.1-RC3"
811

912
repositories {
1013
mavenCentral()
@@ -17,7 +20,7 @@ repositories {
1720
dependencies {
1821
compileOnly("io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT")
1922
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
20-
compileOnly("com.github.GrassProject:GPFramework:0.2-RC2")
23+
compileOnly("com.github.GrassProject:GPFramework:0.2-RC5")
2124
}
2225

2326

@@ -26,8 +29,16 @@ kotlin {
2629
jvmToolchain(targetJavaVersion)
2730
}
2831

32+
tasks.register<ShadowJar>("shadowJarPlugin") {
33+
archiveFileName.set("QueueLib-${project.version}.jar")
34+
35+
from(sourceSets.main.get().output)
36+
configurations = listOf(project.configurations.runtimeClasspath.get())
37+
38+
}
39+
2940
tasks.build {
30-
dependsOn("shadowJar")
41+
dependsOn("shadowJarPlugin")
3142
}
3243

3344
tasks.processResources {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ class QueueLib : GPPlugin() {
1616
}
1717

1818
override fun load() {
19-
plugin=this
20-
manager= QueueManager()
19+
plugin = this
20+
manager = QueueManager()
2121
}
2222

2323
override fun enable() {

src/main/kotlin/io/github/grassproject/queueLib/commands/QueueCommand.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.grassproject.queueLib.commands
22

3-
import io.github.grassproject.framework.core.command.GPCommand
3+
import io.github.grassproject.framework.command.GPCommand
44
import io.github.grassproject.queueLib.QueueLib
55
import org.bukkit.Bukkit
66
import org.bukkit.command.CommandSender

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package io.github.grassproject.queueLib.data
22

3-
import io.github.grassproject.framework.config.GPConfig
3+
import io.github.grassproject.framework.config.GPFile
44
import io.github.grassproject.queueLib.QueueLib
55
import io.github.grassproject.queueLib.player.Waiter
66
import org.bukkit.configuration.file.FileConfiguration
7-
import org.bukkit.configuration.file.YamlConfiguration
87
import org.bukkit.entity.Player
98

109
class UserData(private val waiter: Waiter) {
@@ -16,7 +15,7 @@ class UserData(private val waiter: Waiter) {
1615
}
1716

1817
private val plugin=QueueLib.plugin
19-
internal val userdata= GPConfig(plugin.dataFolder, "userdata/${waiter.getPlayer().uniqueId}")
18+
internal val userdata= GPFile(plugin.dataFolder, "userdata/${waiter.getPlayer().uniqueId}")
2019
private val config= userdata.config
2120
private fun FileConfiguration.reload() {
2221
userdata.reload(userdata.file)

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package io.github.grassproject.queueLib.events
22

3-
import io.github.grassproject.framework.core.events.GPPlayerEvent
3+
import io.github.grassproject.framework.events.GPPlayerEvent
44
import org.bukkit.entity.Player
5-
import org.bukkit.event.HandlerList
6-
import org.bukkit.event.player.PlayerEvent
75
import java.util.*
86

97
class PlayerQueueJoinEvent(

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package io.github.grassproject.queueLib.events
22

3-
import io.github.grassproject.framework.core.events.GPPlayerEvent
3+
import io.github.grassproject.framework.events.GPPlayerEvent
44
import org.bukkit.entity.Player
5-
import org.bukkit.event.HandlerList
6-
import org.bukkit.event.player.PlayerEvent
75
import java.util.*
86

97
class PlayerQueueLeaveEvent(

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package io.github.grassproject.queueLib.events
22

3-
import io.github.grassproject.framework.core.events.GPEvent
3+
import io.github.grassproject.framework.events.GPEvent
44
import org.bukkit.entity.Player
5-
import org.bukkit.event.Event
6-
import org.bukkit.event.HandlerList
75
import java.util.*
86

97
class QueueStartEvent(

0 commit comments

Comments
 (0)