Skip to content

Commit

Permalink
Update libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
@renbinden
renbinden committed Dec 20, 2022
1 parent 8d1d6eb commit b8a79ff
Show file tree
Hide file tree
Showing 90 changed files with 397 additions and 453 deletions.
47 changes: 2 additions & 45 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ buildscript {
}

plugins {
id "com.github.breadmoirai.github-release" version "2.2.12"
id "org.jetbrains.kotlin.jvm" version "1.7.0" apply false
id "org.jetbrains.kotlin.jvm" version "1.7.22" apply false
id "maven-publish"
id "org.jetbrains.dokka" version "1.7.0" apply false
id "org.jetbrains.dokka" version "1.7.20" apply false
}

repositories {
Expand Down Expand Up @@ -66,45 +65,3 @@ subprojects {
}
}
}

def githubToken = ""
def githubPropertiesFile = new File("github.properties")
if (githubPropertiesFile.exists()) {
def githubProperties = new Properties()
githubProperties.load(new FileInputStream(githubPropertiesFile))
githubToken = githubProperties.get("token")
}

githubRelease {
token githubToken
owner "RP-Kit"
repo "RPKit"
releaseName "Version " + version
releaseAssets subprojects.stream()
.flatMap { subproject ->
subproject.evaluate()
def noSource = true
def sourceSets = subproject.sourceSets
for (sourceSet in sourceSets) {
noSource = !sourceSet.allSource.isEmpty() || !noSource
}
if (!noSource) {
def files = subproject.tasks.jar.outputs.getFiles().getFiles().stream()
if (subproject.tasks.findByName("shadowJar")) {
files = subproject.tasks.shadowJar.outputs.getFiles().getFiles().stream()
}
files
} else {
Arrays.stream(new File[0])
}
}.toArray { size -> new File[size] }
}

subprojects.forEach { subproject ->
subproject.evaluate()
if (subproject.tasks.findByName("shadowJar")) {
project.tasks.githubRelease.dependsOn subproject.tasks.shadowJar
} else {
project.tasks.githubRelease.dependsOn subproject.tasks.jar
}
}
6 changes: 3 additions & 3 deletions bukkit/rpk-auction-lib-bukkit/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ if (propertiesFile.exists()) {
}

dependencies {
implementation group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk8", version: "1.7.0"
implementation group: "org.jetbrains.kotlin", name: "kotlin-reflect", version: "1.7.0"
implementation group: "org.spigotmc", name: "spigot-api", version: "1.19-R0.1-SNAPSHOT"
implementation group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk8", version: "1.7.22"
implementation group: "org.jetbrains.kotlin", name: "kotlin-reflect", version: "1.7.22"
implementation group: "org.spigotmc", name: "spigot-api", version: "1.19.3-R0.1-SNAPSHOT"
implementation group: "org.bstats", name: "bstats-bukkit", version: "3.0.0"
implementation project(":rpk-core")
implementation project(":bukkit:rpk-core-bukkit")
Expand Down
8 changes: 4 additions & 4 deletions bukkit/rpk-auctions-bukkit/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ if (propertiesFile.exists()) {
}

dependencies {
implementation group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk8", version: "1.7.0"
implementation group: "org.jetbrains.kotlin", name: "kotlin-reflect", version: "1.7.0"
implementation group: "org.spigotmc", name: "spigot-api", version: "1.19-R0.1-SNAPSHOT"
implementation group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk8", version: "1.7.22"
implementation group: "org.jetbrains.kotlin", name: "kotlin-reflect", version: "1.7.22"
implementation group: "org.spigotmc", name: "spigot-api", version: "1.19.3-R0.1-SNAPSHOT"
implementation group: "org.bstats", name: "bstats-bukkit", version: "3.0.0"
implementation group: "org.jooq", name: "jooq", version: "3.16.6"
implementation group: "org.jooq", name: "jooq", version: "3.17.6"
implementation project(":rpk-core")
implementation project(":bukkit:rpk-core-bukkit")
implementation project(":bukkit:rpk-player-lib-bukkit")
Expand Down
6 changes: 3 additions & 3 deletions bukkit/rpk-bank-lib-bukkit/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ if (propertiesFile.exists()) {
}

dependencies {
implementation group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk8", version: "1.7.0"
implementation group: "org.jetbrains.kotlin", name: "kotlin-reflect", version: "1.7.0"
implementation group: "org.spigotmc", name: "spigot-api", version: "1.19-R0.1-SNAPSHOT"
implementation group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk8", version: "1.7.22"
implementation group: "org.jetbrains.kotlin", name: "kotlin-reflect", version: "1.7.22"
implementation group: "org.spigotmc", name: "spigot-api", version: "1.19.3-R0.1-SNAPSHOT"
implementation group: "org.bstats", name: "bstats-bukkit", version: "3.0.0"
implementation group: "net.milkbowl.vault", name: "VaultAPI", version: "1.7"
implementation project(":rpk-core")
Expand Down
8 changes: 4 additions & 4 deletions bukkit/rpk-banks-bukkit/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ if (propertiesFile.exists()) {
}

dependencies {
implementation group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk8", version: "1.7.0"
implementation group: "org.jetbrains.kotlin", name: "kotlin-reflect", version: "1.7.0"
implementation group: "org.spigotmc", name: "spigot-api", version: "1.19-R0.1-SNAPSHOT"
implementation group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk8", version: "1.7.22"
implementation group: "org.jetbrains.kotlin", name: "kotlin-reflect", version: "1.7.22"
implementation group: "org.spigotmc", name: "spigot-api", version: "1.19.3-R0.1-SNAPSHOT"
implementation group: "org.bstats", name: "bstats-bukkit", version: "3.0.0"
implementation group: "net.milkbowl.vault", name: "VaultAPI", version: "1.7"
implementation group: "org.jooq", name: "jooq", version: "3.16.6"
implementation group: "org.jooq", name: "jooq", version: "3.17.6"
implementation project(":rpk-core")
implementation project(":bukkit:rpk-core-bukkit")
implementation project(":bukkit:rpk-player-lib-bukkit")
Expand Down
6 changes: 3 additions & 3 deletions bukkit/rpk-block-log-lib-bukkit/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ if (propertiesFile.exists()) {
}

dependencies {
implementation group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk8", version: "1.7.0"
implementation group: "org.jetbrains.kotlin", name: "kotlin-reflect", version: "1.7.0"
implementation group: "org.spigotmc", name: "spigot-api", version: "1.19-R0.1-SNAPSHOT"
implementation group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk8", version: "1.7.22"
implementation group: "org.jetbrains.kotlin", name: "kotlin-reflect", version: "1.7.22"
implementation group: "org.spigotmc", name: "spigot-api", version: "1.19.3-R0.1-SNAPSHOT"
implementation group: "org.bstats", name: "bstats-bukkit", version: "3.0.0"
implementation project(":rpk-core")
implementation project(":bukkit:rpk-core-bukkit")
Expand Down
8 changes: 4 additions & 4 deletions bukkit/rpk-block-logging-bukkit/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ if (propertiesFile.exists()) {
}

dependencies {
implementation group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk8", version: "1.7.0"
implementation group: "org.jetbrains.kotlin", name: "kotlin-reflect", version: "1.7.0"
implementation group: "org.spigotmc", name: "spigot-api", version: "1.19-R0.1-SNAPSHOT"
implementation group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk8", version: "1.7.22"
implementation group: "org.jetbrains.kotlin", name: "kotlin-reflect", version: "1.7.22"
implementation group: "org.spigotmc", name: "spigot-api", version: "1.19.3-R0.1-SNAPSHOT"
implementation group: "org.bstats", name: "bstats-bukkit", version: "3.0.0"
implementation group: "org.jooq", name: "jooq", version: "3.16.6"
implementation group: "org.jooq", name: "jooq", version: "3.17.6"
implementation project(":rpk-core")
implementation project(":bukkit:rpk-core-bukkit")
implementation project(":bukkit:rpk-player-lib-bukkit")
Expand Down
30 changes: 6 additions & 24 deletions ...g-bukkit/src/main/kotlin/com/rpkit/blocklog/bukkit/database/table/RPKBlockHistoryTable.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ import com.rpkit.blocklog.bukkit.database.jooq.Tables.RPKIT_BLOCK_HISTORY
import com.rpkit.core.database.Database
import com.rpkit.core.database.Table
import com.rpkit.core.location.RPKBlockLocation
import org.jooq.impl.DSL.select
import org.jooq.impl.DSL.`val`
import java.util.concurrent.CompletableFuture
import java.util.logging.Level

Expand All @@ -46,37 +44,21 @@ class RPKBlockHistoryTable(private val database: Database, private val plugin: R

fun insert(entity: RPKBlockHistory): CompletableFuture<Void> {
return CompletableFuture.runAsync {
val rowCount = database.create
database.create
.insertInto(
RPKIT_BLOCK_HISTORY,
RPKIT_BLOCK_HISTORY.WORLD,
RPKIT_BLOCK_HISTORY.X,
RPKIT_BLOCK_HISTORY.Y,
RPKIT_BLOCK_HISTORY.Z
)
.select(
select(
`val`(entity.world),
`val`(entity.x),
`val`(entity.y),
`val`(entity.z)
).whereNotExists(
database.create.selectFrom(RPKIT_BLOCK_HISTORY)
.where(RPKIT_BLOCK_HISTORY.WORLD.eq(entity.world))
.and(RPKIT_BLOCK_HISTORY.X.eq(entity.x))
.and(RPKIT_BLOCK_HISTORY.Y.eq(entity.y))
.and(RPKIT_BLOCK_HISTORY.Z.eq(entity.z))
)
.values(
entity.world,
entity.x,
entity.y,
entity.z
)
.execute()
if (rowCount == 0) {
val existingBlockHistory = get(RPKBlockLocation(entity.world, entity.x, entity.y, entity.z)).join()
if (existingBlockHistory != null) {
val existingBlockHistoryId = existingBlockHistory.id
entity.id = existingBlockHistoryId
}
return@runAsync
}
val id = database.create.lastID().toInt()
entity.id = RPKBlockHistoryId(id)
cache?.set(id, entity)
Expand Down
6 changes: 3 additions & 3 deletions bukkit/rpk-character-lib-bukkit/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ if (propertiesFile.exists()) {
}

dependencies {
implementation group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk8", version: "1.7.0"
implementation group: "org.jetbrains.kotlin", name: "kotlin-reflect", version: "1.7.0"
implementation group: "org.spigotmc", name: "spigot-api", version: "1.19-R0.1-SNAPSHOT"
implementation group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk8", version: "1.7.22"
implementation group: "org.jetbrains.kotlin", name: "kotlin-reflect", version: "1.7.22"
implementation group: "org.spigotmc", name: "spigot-api", version: "1.19.3-R0.1-SNAPSHOT"
implementation group: "org.bstats", name: "bstats-bukkit", version: "3.0.0"
implementation project(":rpk-core")
implementation project(":bukkit:rpk-core-bukkit")
Expand Down
16 changes: 8 additions & 8 deletions bukkit/rpk-characters-bukkit/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
plugins {
id "com.github.johnrengelman.shadow" version "7.1.2"
id "nu.studer.jooq" version "7.1.1"
id "nu.studer.jooq" version "8.0"
}

import org.apache.tools.ant.filters.ReplaceTokens
Expand All @@ -30,24 +30,24 @@ if (propertiesFile.exists()) {
}

dependencies {
implementation group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk8", version: "1.7.0"
implementation group: "org.jetbrains.kotlin", name: "kotlin-reflect", version: "1.7.0"
implementation group: "org.spigotmc", name: "spigot-api", version: "1.19-R0.1-SNAPSHOT"
implementation group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk8", version: "1.7.22"
implementation group: "org.jetbrains.kotlin", name: "kotlin-reflect", version: "1.7.22"
implementation group: "org.spigotmc", name: "spigot-api", version: "1.19.3-R0.1-SNAPSHOT"
implementation group: "org.bstats", name: "bstats-bukkit", version: "3.0.0"
implementation group: "org.jooq", name: "jooq", version: "3.16.6"
implementation group: "org.jooq", name: "jooq", version: "3.17.6"
implementation platform("org.http4k:http4k-bom:4.27.0.0")
implementation group: "org.http4k", name: "http4k-core"
implementation group: "org.http4k", name: "http4k-server-jetty"
implementation group: "org.http4k", name: "http4k-format-gson"
implementation group: "org.slf4j", name: "slf4j-jdk14", version: "2.0.0-alpha7"
implementation group: "me.clip", name: "placeholderapi", version: "2.11.1"
implementation group: "org.slf4j", name: "slf4j-jdk14", version: "2.0.6"
implementation group: "me.clip", name: "placeholderapi", version: "2.11.2"
implementation group: "com.comphenix.protocol", name: "ProtocolLib", version: "5.0.0-SNAPSHOT"
implementation project(":rpk-core")
implementation project(":bukkit:rpk-core-bukkit")
implementation project(":bukkit:rpk-player-lib-bukkit")
implementation project(":bukkit:rpk-character-lib-bukkit")
implementation project(":bukkit:rpk-permissions-lib-bukkit")
jooqGenerator "org.jooq:jooq-meta-extensions:3.17.4"
jooqGenerator "org.jooq:jooq-meta-extensions:3.17.6"
}

processResources {
Expand Down
7 changes: 7 additions & 0 deletions .../rpk-characters-bukkit/src/main/kotlin/com/rpkit/characters/bukkit/RPKCharactersBukkit.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,13 @@ class RPKCharactersBukkit : JavaPlugin(), RPKPlugin {
if (config.getBoolean("characters.kill-character-on-death")) {
registerListeners(PlayerDeathListener(this))
}

// ProtocolLibrary.getProtocolManager().addPacketListener(object : PacketAdapter(this, ListenerPriority.NORMAL, PacketType.Play.Server.PLAYER_INFO) {
// override fun onPacketSending(event: PacketEvent) {
// plugin.logger.info(event.packet.playerInfoAction.fields.zip(event.packet.playerInfoAction.values).toMap().toString())
// plugin.logger.info(event.packet.playerInfoActions.)
// }
// })
}

private var webConfig: FileConfiguration? = null
Expand Down
26 changes: 12 additions & 14 deletions ...it/rpk-characters-bukkit/src/main/kotlin/com/rpkit/characters/bukkit/protocol/Protocol.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ import com.comphenix.protocol.ProtocolLibrary
import com.comphenix.protocol.events.PacketContainer
import com.comphenix.protocol.wrappers.EnumWrappers
import com.comphenix.protocol.wrappers.EnumWrappers.PlayerInfoAction.ADD_PLAYER
import com.comphenix.protocol.wrappers.EnumWrappers.PlayerInfoAction.REMOVE_PLAYER
import com.comphenix.protocol.wrappers.PlayerInfoData
import com.comphenix.protocol.wrappers.WrappedChatComponent
import com.comphenix.protocol.wrappers.WrappedGameProfile
import com.rpkit.characters.bukkit.character.RPKCharacter
import net.md_5.bungee.api.chat.TextComponent
import net.md_5.bungee.chat.ComponentSerializer
import org.bukkit.entity.Player
import java.util.*

fun reloadPlayer(player: Player, character: RPKCharacter, viewers: List<Player>) {
reloadPlayerInfo(player, character, viewers)
Expand All @@ -53,18 +53,13 @@ private fun sendRemovePlayerPacket(player: Player, recipients: List<Player>) {
}

private fun createRemovePlayerPacket(player: Player): PacketContainer {
val packet = ProtocolLibrary.getProtocolManager().createPacket(PLAYER_INFO)
packet.playerInfoAction.write(0, REMOVE_PLAYER)
val profile = WrappedGameProfile.fromPlayer(player)
val chatComponent = WrappedChatComponent.fromText(profile.name)
val playerInfoData =
PlayerInfoData(profile, player.ping, EnumWrappers.NativeGameMode.fromBukkit(player.gameMode), chatComponent)
packet.playerInfoDataLists.write(0, listOf(playerInfoData))
val packet = ProtocolLibrary.getProtocolManager().createPacket(PLAYER_INFO_REMOVE)
packet.structures.withType<List<UUID>>(List::class.java).write(0, listOf(player.uniqueId))
return packet
}

private fun sendAddPlayerPacket(player: Player, character: RPKCharacter, recipients: List<Player>) {
val packet = createAddPlayerPacket(player, character)
val packet = createAddPlayerPacket(player, character) ?: return
recipients.forEach { onlinePlayer ->
ProtocolLibrary.getProtocolManager().sendServerPacket(onlinePlayer, packet)
}
Expand All @@ -73,19 +68,22 @@ private fun sendAddPlayerPacket(player: Player, character: RPKCharacter, recipie
private fun createAddPlayerPacket(
player: Player,
character: RPKCharacter
): PacketContainer {
): PacketContainer? {
val packet = ProtocolLibrary.getProtocolManager().createPacket(PLAYER_INFO)
packet.playerInfoAction.write(0, ADD_PLAYER)
packet.playerInfoActions.write(0, setOf(ADD_PLAYER))
val profile = WrappedGameProfile.fromPlayer(player).withName(character.name.take(16))
val tabListTextComponent =
WrappedChatComponent.fromJson(ComponentSerializer.toString(TextComponent.fromLegacyText(player.playerListName)))
val playerInfoData = PlayerInfoData(
profile,
player.uniqueId,
player.ping,
true,
EnumWrappers.NativeGameMode.fromBukkit(player.gameMode),
tabListTextComponent
profile,
tabListTextComponent,
null
)
packet.playerInfoDataLists.write(0, listOf(playerInfoData))
packet.playerInfoDataLists.write(1, listOf(playerInfoData))
return packet
}

Expand Down
18 changes: 9 additions & 9 deletions bukkit/rpk-chat-bukkit/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
plugins {
id "com.github.johnrengelman.shadow" version "7.1.2"
id "nu.studer.jooq" version "7.1.1"
id "nu.studer.jooq" version "8.0"
}

import org.apache.tools.ant.filters.ReplaceTokens
Expand All @@ -30,17 +30,17 @@ if (propertiesFile.exists()) {
}

dependencies {
implementation group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk8", version: "1.7.0"
implementation group: "org.jetbrains.kotlin", name: "kotlin-reflect", version: "1.7.0"
implementation group: "org.spigotmc", name: "spigot-api", version: "1.19-R0.1-SNAPSHOT"
implementation group: "org.jetbrains.kotlin", name: "kotlin-stdlib-jdk8", version: "1.7.22"
implementation group: "org.jetbrains.kotlin", name: "kotlin-reflect", version: "1.7.22"
implementation group: "org.spigotmc", name: "spigot-api", version: "1.19.3-R0.1-SNAPSHOT"
implementation group: "org.bstats", name: "bstats-bukkit", version: "3.0.0"
implementation group: "com.github.pircbotx", name: "pircbotx", version: "2.2"
implementation group: "org.jooq", name: "jooq", version: "3.16.6"
implementation(group: "net.dv8tion", name: "JDA", version: "5.0.0-alpha.12") {
implementation group: "org.jooq", name: "jooq", version: "3.17.6"
implementation(group: "net.dv8tion", name: "JDA", version: "5.0.0-beta.2") {
exclude module: "opus-java"
}
implementation group: "org.slf4j", name: "slf4j-jdk14", version: "2.0.0-alpha7"
implementation group: "me.clip", name: "placeholderapi", version: "2.11.1"
implementation group: "org.slf4j", name: "slf4j-jdk14", version: "2.0.6"
implementation group: "me.clip", name: "placeholderapi", version: "2.11.2"
implementation project(":rpk-core")
implementation project(":bukkit:rpk-core-bukkit")
implementation project(":bukkit:rpk-player-lib-bukkit")
Expand All @@ -49,7 +49,7 @@ dependencies {
implementation project(":bukkit:rpk-drink-lib-bukkit")
implementation project(":bukkit:rpk-language-lib-bukkit")
implementation project(":bukkit:rpk-chat-lib-bukkit")
jooqGenerator "org.jooq:jooq-meta-extensions:3.17.4"
jooqGenerator "org.jooq:jooq-meta-extensions:3.17.6"
}

processResources {
Expand Down
5 changes: 3 additions & 2 deletions bukkit/rpk-chat-bukkit/src/main/kotlin/com/rpkit/chat/bukkit/discord/DiscordMessageImpl.kt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020 Ren Binden
* Copyright 2022 Ren Binden
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,13 +17,14 @@
package com.rpkit.chat.bukkit.discord

import net.dv8tion.jda.api.entities.Message
import net.dv8tion.jda.api.entities.emoji.Emoji

class DiscordMessageImpl(val message: Message) : DiscordMessage {
override val id: Long = message.idLong

override fun addReaction(reaction: DiscordReaction) {
when (reaction) {
is DiscordUnicodeReaction -> message.addReaction(reaction.unicode).queue()
is DiscordUnicodeReaction -> message.addReaction(Emoji.fromUnicode(reaction.unicode)).queue()
}
}

Expand Down
Loading

0 comments on commit b8a79ff

Please sign in to comment.