diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..96f7c30 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +prefixes \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..4e63e4b --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..d4b7acc --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..15b44a6 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index f66cb15..82b843c 100644 --- a/README.md +++ b/README.md @@ -69,9 +69,9 @@ This repository is licensed under [Apache 2.0][license]. [banner]: https://github.com/simplecloudapp/branding/blob/main/readme/banner/plugin/prefixes.png?raw=true -[issue-bug-report]: https://github.com/theSimpleCloud/prefixes-plugin/issues/new?labels=bug&projects=template=01_BUG-REPORT.yml&title=%5BBUG%5D+%3Ctitle%3E -[issue-feature-request]: https://github.com/theSimpleCloud/prefixes-plugin/discussions/new?category=ideas -[docs-thisproject]: https://docs.simplecloud.app/plugin/prefixes +[issue-bug-report]: https://github.com/simplecloudapp/prefixes-plugin/issues/new?labels=bug&projects=template=01_BUG-REPORT.yml&title=%5BBUG%5D+%3Ctitle%3E +[issue-feature-request]: https://github.com/simplecloudapp/prefixes-plugin/discussions/new?category=ideas +[docs-thisproject]: https://docs.simplecloud.app/manual/plugins/prefixes [docs-contribute]: https://docs.simplecloud.app/contribute [modrinth]: https://modrinth.com/organization/simplecloud diff --git a/build.gradle.kts b/build.gradle.kts index 0474723..f1f12ed 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -38,9 +38,9 @@ subprojects { compileOnly("net.luckperms:api:5.4") compileOnly("space.chunks.custom-names:custom-names-api:1.0.6") - implementation("net.kyori:adventure-api:4.14.0") + implementation("net.kyori:adventure-api:4.25.0") implementation("com.google.code.gson:gson:2.10.1") - implementation("net.kyori:adventure-text-minimessage:4.14.0") + implementation("net.kyori:adventure-text-minimessage:4.25.0") } java { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e980715..d98a110 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,10 @@ [versions] kotlin = "2.0.20" shadow = "8.3.3" -paper-api = "1.21.4-R0.1-SNAPSHOT" -paperweight = "2.0.0-beta.12" +paper-api = "1.21.10-R0.1-SNAPSHOT" +paperweight = "2.0.0-beta.19" minotaur = "2.8.7" -sonatype-central-portal-publisher = "1.2.3" +sonatype-central-portal-publisher = "1.2.4" [libraries] kotlin-jvm = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 348fbf3..bc24a0e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file diff --git a/prefixes-paper/build.gradle.kts b/prefixes-paper/build.gradle.kts index 23e72cd..84942c7 100644 --- a/prefixes-paper/build.gradle.kts +++ b/prefixes-paper/build.gradle.kts @@ -5,7 +5,7 @@ plugins { dependencies { api(project(":prefixes-api")) - paperweight.paperDevBundle("1.21.4-R0.1-SNAPSHOT") + paperweight.paperDevBundle("1.21.10-R0.1-SNAPSHOT") compileOnly(libs.paper.api) } diff --git a/prefixes-paper/src/main/kotlin/app/simplecloud/plugin/prefixes/paper/PaperPrefixesDisplay.kt b/prefixes-paper/src/main/kotlin/app/simplecloud/plugin/prefixes/paper/PaperPrefixesDisplay.kt index 03ef68f..1b92369 100644 --- a/prefixes-paper/src/main/kotlin/app/simplecloud/plugin/prefixes/paper/PaperPrefixesDisplay.kt +++ b/prefixes-paper/src/main/kotlin/app/simplecloud/plugin/prefixes/paper/PaperPrefixesDisplay.kt @@ -38,7 +38,7 @@ class PaperPrefixesDisplay : PrefixesDisplay val team = getTeam(id) ?: return null val deletePacket = ClientboundSetPlayerTeamPacket.createRemovePacket(team) viewers.forEach { viewer -> - (viewer as CraftPlayer).handle.connection.sendPacket(deletePacket) + (viewer as CraftPlayer).handle.connection.send(deletePacket) } val newTeam = changeTeamPriority(priority, team) ?: return null val createPacket = ClientboundSetPlayerTeamPacket.createAddOrModifyPacket(newTeam, true) @@ -49,8 +49,8 @@ class PaperPrefixesDisplay : PrefixesDisplay ) viewers.forEach { viewer -> with(viewer as CraftPlayer) { - handle.connection.sendPacket(createPacket) - handle.connection.sendPacket(addPlayersPacket) + handle.connection.send(createPacket) + handle.connection.send(addPlayersPacket) } } teams[id] = newTeam @@ -62,7 +62,7 @@ class PaperPrefixesDisplay : PrefixesDisplay team.realColor = color val updatePacket = ClientboundSetPlayerTeamPacket.createAddOrModifyPacket(team, false) viewers.forEach { viewer -> - (viewer as CraftPlayer).handle.connection.sendPacket(updatePacket) + (viewer as CraftPlayer).handle.connection.send(updatePacket) } sendUpdateDisplayNamePackets(team) } @@ -76,7 +76,7 @@ class PaperPrefixesDisplay : PrefixesDisplay if (result) { teams.values.forEach { team -> val deletePacket = ClientboundSetPlayerTeamPacket.createRemovePacket(team) - (player as CraftPlayer).handle.connection.sendPacket(deletePacket) + (player as CraftPlayer).handle.connection.send(deletePacket) getPlayersForTeam(team).filter { Bukkit.getPlayer(it)?.isOnline ?: false } .map { Bukkit.getPlayer(it)!! }.forEach { sendUpdateDisplayNamePacket(it) } } @@ -95,8 +95,8 @@ class PaperPrefixesDisplay : PrefixesDisplay ClientboundSetPlayerTeamPacket.Action.ADD ) with(player as CraftPlayer) { - handle.connection.sendPacket(createPacket) - handle.connection.sendPacket(addPlayersPacket) + handle.connection.send(createPacket) + handle.connection.send(addPlayersPacket) } sendUpdateDisplayNamePackets(team) } @@ -118,7 +118,7 @@ class PaperPrefixesDisplay : PrefixesDisplay player.name, ClientboundSetPlayerTeamPacket.Action.REMOVE ) - viewers.forEach { viewer -> (viewer as CraftPlayer).handle.connection.sendPacket(packet) } + viewers.forEach { viewer -> (viewer as CraftPlayer).handle.connection.send(packet) } sendUpdateDisplayNamePackets(team) } @@ -131,7 +131,7 @@ class PaperPrefixesDisplay : PrefixesDisplay player.name, ClientboundSetPlayerTeamPacket.Action.REMOVE ) - viewers.forEach { viewer -> (viewer as CraftPlayer).handle.connection.sendPacket(delete) } + viewers.forEach { viewer -> (viewer as CraftPlayer).handle.connection.send(delete) } } } @@ -141,7 +141,7 @@ class PaperPrefixesDisplay : PrefixesDisplay player.name, ClientboundSetPlayerTeamPacket.Action.ADD ) - viewers.forEach { viewer -> (viewer as CraftPlayer).handle.connection.sendPacket(packet) } + viewers.forEach { viewer -> (viewer as CraftPlayer).handle.connection.send(packet) } sendUpdateDisplayNamePackets(team) } @@ -155,7 +155,7 @@ class PaperPrefixesDisplay : PrefixesDisplay viewers.forEach { viewer -> with(viewer as CraftPlayer) { - handle.connection.sendPacket(packet) + handle.connection.send(packet) } } sendUpdateDisplayNamePackets(team) @@ -168,7 +168,7 @@ class PaperPrefixesDisplay : PrefixesDisplay val packet = ClientboundSetPlayerTeamPacket.createAddOrModifyPacket(team, false) viewers.forEach { viewer -> with(viewer as CraftPlayer) { - handle.connection.sendPacket(packet) + handle.connection.send(packet) } } sendUpdateDisplayNamePackets(team) @@ -181,7 +181,7 @@ class PaperPrefixesDisplay : PrefixesDisplay val packet = ClientboundSetPlayerTeamPacket.createAddOrModifyPacket(team, false) viewers.forEach { viewer -> with(viewer as CraftPlayer) { - handle.connection.sendPacket(packet) + handle.connection.send(packet) } } sendUpdateDisplayNamePackets(team) @@ -213,7 +213,7 @@ class PaperPrefixesDisplay : PrefixesDisplay ) viewers.forEach { viewer -> with(viewer as CraftPlayer) { - handle.connection.sendPacket(update) + handle.connection.send(update) } } } diff --git a/prefixes-shared/build.gradle.kts b/prefixes-shared/build.gradle.kts index 248cd43..55c493f 100644 --- a/prefixes-shared/build.gradle.kts +++ b/prefixes-shared/build.gradle.kts @@ -1,4 +1,4 @@ dependencies { - implementation("net.kyori:adventure-text-serializer-gson:4.14.0") - implementation("net.kyori:adventure-text-serializer-legacy:4.14.0") + implementation("net.kyori:adventure-text-serializer-gson:4.25.0") + implementation("net.kyori:adventure-text-serializer-legacy:4.25.0") } \ No newline at end of file