Skip to content

Commit 8ecb759

Browse files
committed
fix: update imports to use new API structure and bump version to 26.1-3.0.0-SNAPSHOT
1 parent 82b62a1 commit 8ecb759

94 files changed

Lines changed: 299 additions & 285 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("dev.slne.surf.surfapi.gradle.paper-plugin") version "1.21.11+"
2+
id("dev.slne.surf.api.gradle.paper-plugin")
33
}
44

55
group = "dev.slne.surf.essentials"
@@ -12,5 +12,5 @@ surfPaperPluginApi {
1212

1313
useCanvasMc()
1414

15-
authors.addAll("twisti", "red")
15+
authors.addAll("twisti", "red", "mikey")
1616
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
kotlin.code.style=official
22
kotlin.stdlib.default.dependency=false
33
org.gradle.parallel=true
4-
version=1.21.11-2.0.17-SNAPSHOT
4+
version=26.1-3.0.0-SNAPSHOT

settings.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,9 @@ pluginManagement {
33
gradlePluginPortal()
44
maven("https://repo.slne.dev/repository/maven-public/") { name = "maven-public" }
55
}
6+
}
7+
8+
plugins {
9+
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
10+
id("dev.slne.surf.api.gradle.settings") version "26.1+"
611
}

src/main/kotlin/dev/slne/surf/essentials/PaperListenerManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dev.slne.surf.essentials
22

3+
import dev.slne.surf.api.paper.event.register
34
import dev.slne.surf.essentials.listener.*
4-
import dev.slne.surf.surfapi.bukkit.api.event.register
55

66
object PaperListenerManager {
77
fun registerAll() {

src/main/kotlin/dev/slne/surf/essentials/PaperMain.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package dev.slne.surf.essentials
22

33
import com.github.shynixn.mccoroutine.folia.SuspendingJavaPlugin
4+
import dev.slne.surf.api.paper.SurfApiPaper
5+
import dev.slne.surf.api.paper.event.register
6+
import dev.slne.surf.api.paper.extensions.pluginManager
47
import dev.slne.surf.essentials.listener.CanvasListener
5-
import dev.slne.surf.surfapi.bukkit.api.event.register
6-
import dev.slne.surf.surfapi.bukkit.api.extensions.pluginManager
7-
import dev.slne.surf.surfapi.bukkit.api.surfBukkitApi
88
import org.bukkit.plugin.java.JavaPlugin
99

1010
val plugin get() = JavaPlugin.getPlugin(PaperMain::class.java)
@@ -18,7 +18,7 @@ class PaperMain : SuspendingJavaPlugin() {
1818
PaperCommandManager.registerAll()
1919
PaperListenerManager.registerAll()
2020

21-
if (surfBukkitApi.isCanvasMc) {
21+
if (SurfApiPaper.isCanvasMc) {
2222
CanvasListener.register()
2323
}
2424
}

src/main/kotlin/dev/slne/surf/essentials/command/BackCommand.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package dev.slne.surf.essentials.command
22

33
import dev.jorel.commandapi.kotlindsl.commandTree
44
import dev.jorel.commandapi.kotlindsl.playerExecutor
5+
import dev.slne.surf.api.core.messages.adventure.sendText
56
import dev.slne.surf.essentials.service.lastLocationService
67
import dev.slne.surf.essentials.util.permission.EssentialsPermissionRegistry
7-
import dev.slne.surf.surfapi.core.api.messages.adventure.sendText
88

99
fun backCommand() = commandTree("back") {
1010
withPermission(EssentialsPermissionRegistry.BACK_COMMAND)

src/main/kotlin/dev/slne/surf/essentials/command/BroadcastCommand.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package dev.slne.surf.essentials.command
22

33
import dev.jorel.commandapi.kotlindsl.*
4+
import dev.slne.surf.api.core.messages.adventure.sendText
5+
import dev.slne.surf.api.core.messages.adventure.showTitle
6+
import dev.slne.surf.api.paper.extensions.server
7+
import dev.slne.surf.api.paper.util.forEachPlayer
48
import dev.slne.surf.essentials.util.permission.EssentialsPermissionRegistry
5-
import dev.slne.surf.surfapi.bukkit.api.extensions.server
6-
import dev.slne.surf.surfapi.bukkit.api.util.forEachPlayer
7-
import dev.slne.surf.surfapi.core.api.messages.adventure.sendText
8-
import dev.slne.surf.surfapi.core.api.messages.adventure.showTitle
99
import net.kyori.adventure.text.minimessage.MiniMessage
1010

1111
fun broadcastCommand() = commandTree("broadcast") {

src/main/kotlin/dev/slne/surf/essentials/command/ChangeSlotCommand.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import dev.jorel.commandapi.kotlindsl.anyExecutor
44
import dev.jorel.commandapi.kotlindsl.commandTree
55
import dev.jorel.commandapi.kotlindsl.getValue
66
import dev.jorel.commandapi.kotlindsl.integerArgument
7+
import dev.slne.surf.api.core.messages.adventure.sendText
78
import dev.slne.surf.essentials.util.permission.EssentialsPermissionRegistry
8-
import dev.slne.surf.surfapi.core.api.messages.adventure.sendText
99
import org.bukkit.Bukkit
1010

1111
fun changeSlotCommand() = commandTree("changeslot") {

src/main/kotlin/dev/slne/surf/essentials/command/EffectCommand.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package dev.slne.surf.essentials.command
22

33
import dev.jorel.commandapi.kotlindsl.*
4+
import dev.slne.surf.api.core.messages.Colors
5+
import dev.slne.surf.api.core.messages.adventure.sendText
46
import dev.slne.surf.essentials.command.argument.durationArgument
57
import dev.slne.surf.essentials.util.permission.EssentialsPermissionRegistry
68
import dev.slne.surf.essentials.util.util.ticks
79
import dev.slne.surf.essentials.util.util.userContent
8-
import dev.slne.surf.surfapi.core.api.messages.Colors
9-
import dev.slne.surf.surfapi.core.api.messages.adventure.sendText
1010
import org.bukkit.entity.Player
1111
import org.bukkit.potion.PotionEffect
1212
import org.bukkit.potion.PotionEffectType

src/main/kotlin/dev/slne/surf/essentials/command/FillstackCommand.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package dev.slne.surf.essentials.command
22

33
import dev.jorel.commandapi.kotlindsl.commandTree
44
import dev.jorel.commandapi.kotlindsl.playerExecutor
5+
import dev.slne.surf.api.core.messages.adventure.sendText
56
import dev.slne.surf.essentials.util.permission.EssentialsPermissionRegistry
6-
import dev.slne.surf.surfapi.core.api.messages.adventure.sendText
77

88
fun fillStackCommand() = commandTree("fillstack") {
99
withPermission(EssentialsPermissionRegistry.FILLSTACK_COMMAND)

0 commit comments

Comments
 (0)