Skip to content

Commit

Permalink
chore: upgrade adventure to 4.17.0
Browse files Browse the repository at this point in the history
Solves some issues with JSON (de)serializing in recent MC versions.
  • Loading branch information
diogotcorreia committed Sep 11, 2024
1 parent b474694 commit ecffa0d
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 26 deletions.
16 changes: 8 additions & 8 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ dependencies {
compileOnly project(":api")

// Adventure / MiniMessage
compileOnly 'net.kyori:adventure-text-serializer-gson:4.15.0'
compileOnly 'net.kyori:adventure-text-serializer-legacy:4.15.0'
compileOnly 'net.kyori:adventure-text-serializer-plain:4.15.0'
compileOnly('net.kyori:adventure-text-minimessage:4.15.0') {
compileOnly 'net.kyori:adventure-text-serializer-gson:4.17.0'
compileOnly 'net.kyori:adventure-text-serializer-legacy:4.17.0'
compileOnly 'net.kyori:adventure-text-serializer-plain:4.17.0'
compileOnly('net.kyori:adventure-text-minimessage:4.17.0') {
exclude group: 'net.kyori', module: 'adventure-api'
exclude group: 'net.kyori', module: 'adventure-key'
exclude group: 'net.kyori', module: 'adventure-text-serialize-gson'
Expand Down Expand Up @@ -46,10 +46,10 @@ dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.0'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'

testImplementation 'net.kyori:adventure-api:4.15.0'
testImplementation 'net.kyori:adventure-text-serializer-gson:4.15.0'
testImplementation 'net.kyori:adventure-text-serializer-legacy:4.15.0'
testImplementation 'net.kyori:adventure-text-serializer-plain:4.15.0'
testImplementation 'net.kyori:adventure-api:4.17.0'
testImplementation 'net.kyori:adventure-text-serializer-gson:4.17.0'
testImplementation 'net.kyori:adventure-text-serializer-legacy:4.17.0'
testImplementation 'net.kyori:adventure-text-serializer-plain:4.17.0'
}

shadowJar {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ public enum Dependency {
ADVENTURE(
"net{}kyori",
"adventure-api",
"4.15.0",
"TDRoKSrXCMxo/4+pd4/tKvfbcagSYfeQRmzQM/8BgZQ=",
"4.17.0",
"FcjC6xpp2LG8kU9VQ1PajufPB0wFyAdNqYmK7lxw0Ng=",
relocate("net{}kyori{}adventure", "adventure"),
relocate("net{}kyori{}examination", "kyori{}examination")
),
ADVENTURE_TEXT_SERIALIZER_GSON(
"net{}kyori",
"adventure-text-serializer-gson",
"4.15.0",
"0t/P0pGWrqe0zNNySTUrWmEFbM7ijGXv9KmJ9zfuIDo=",
"4.17.0",
"YifWv9LWrm0SHT3NpZDTP/g3POpliUhd8/e3Wwnn0hA=",
relocate("net{}kyori{}option", "kyori{}option"),
relocateIf("net{}kyori{}adventure", "adventure", LoaderFlag.RELOCATE_ADVENTURE),
relocateIf("net{}kyori{}examination", "kyori{}examination", LoaderFlag.RELOCATE_ADVENTURE),
Expand All @@ -35,25 +35,25 @@ public enum Dependency {
ADVENTURE_TEXT_SERIALIZER_LEGACY(
"net{}kyori",
"adventure-text-serializer-legacy",
"4.15.0",
"05buwHoYTm1E8/wJBJDZiCzMlinvDhmR51kIhceIDgs=",
"4.17.0",
"nUlVVC5A61tB2+0XKygmrPHL40BeAC8zYOsupXjVNro=",
relocateIf("net{}kyori{}adventure", "adventure", LoaderFlag.RELOCATE_ADVENTURE),
relocateIf("net{}kyori{}examination", "kyori{}examination", LoaderFlag.RELOCATE_ADVENTURE),
relocateIfNot("net{}kyori{}adventure{}text{}serializer{}legacy", "adventure{}text{}serializer{}legacy", LoaderFlag.RELOCATE_ADVENTURE)
),
ADVENTURE_TEXT_SERIALIZER_PLAIN(
"net{}kyori",
"adventure-text-serializer-plain",
"4.15.0",
"T9uUMFA3ehElOSOfEOcy0tukCyoh8lKDlYooIypz+Ok=",
"4.17.0",
"Im1KPSxCt3J98RoCppjGxkR1OEcF3RK/Asf2l0R5nC4=",
relocateIf("net{}kyori{}adventure", "adventure", LoaderFlag.RELOCATE_ADVENTURE),
relocateIf("net{}kyori{}examination", "kyori{}examination", LoaderFlag.RELOCATE_ADVENTURE),
relocateIfNot("net{}kyori{}adventure{}text{}serializer{}plain", "adventure{}text{}serializer{}plain", LoaderFlag.RELOCATE_ADVENTURE)
),
ADVENTURE_TEXT_SERIALIZER_BUNGEECORD(
"net{}kyori",
"adventure-text-serializer-bungeecord",
"4.3.2",
"4.3.4",
"4bw3bG3HohAAFgFXNc5MzFNNKya/WrgqrHUcUDIFbDk=",
relocate("net{}kyori{}option", "kyori{}option"),
relocateIf("net{}kyori{}adventure", "adventure", LoaderFlag.RELOCATE_ADVENTURE),
Expand All @@ -66,8 +66,8 @@ public enum Dependency {
ADVENTURE_MINI_MESSAGE(
"net{}kyori",
"adventure-text-minimessage",
"4.15.0",
"vsTSXxNV6TlBJFEobBkwnQa1qg3vXd6GBJnQDych2so=",
"4.17.0",
"g3Kp6bwMCuIdYObObihKgcbJbR7DmPgIglAVxvYCUvU=",
relocate("net{}kyori{}option", "kyori{}option"),
relocateIf("net{}kyori{}adventure", "adventure", LoaderFlag.RELOCATE_ADVENTURE),
relocateIf("net{}kyori{}examination", "kyori{}examination", LoaderFlag.RELOCATE_ADVENTURE),
Expand All @@ -81,16 +81,16 @@ public enum Dependency {
ADVENTURE_KEY(
"net{}kyori",
"adventure-key",
"4.15.0",
"fG80fIMSZFVT941uItSDVVbUNtUBioL6sHxK3uDW/tc=",
"4.17.0",
"jlz1cGEtbM7flDrBcWpEneLdWpAge33m9zwCNpNbdm4=",
relocate("net{}kyori{}adventure", "adventure"),
relocateIf("net{}kyori{}examination", "kyori{}examination", LoaderFlag.RELOCATE_ADVENTURE)
),
ADVENTURE_TEXT_SERIALIZER_JSON(
"net{}kyori",
"adventure-text-serializer-json",
"4.15.0",
"IjUGO0PYrqRiXPrCgKHlJ1NmDq0b4rk4Gz544ouMI6Y=",
"4.17.0",
"bJHT4jsGTXarfBVOvpQPVSIyrheLldIbUN/c/sKSXZY=",
relocate("net{}kyori{}option", "kyori{}option"),
relocateIf("net{}kyori{}adventure", "adventure", LoaderFlag.RELOCATE_ADVENTURE),
relocateIf("net{}kyori{}examination", "kyori{}examination", LoaderFlag.RELOCATE_ADVENTURE),
Expand Down
6 changes: 3 additions & 3 deletions triton-spigot/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ dependencies {

compileOnly 'org.spigotmc:spigot-api:1.21.1-R0.1-SNAPSHOT'

compileOnly 'net.kyori:adventure-text-serializer-gson:4.15.0'
compileOnly 'net.kyori:adventure-text-serializer-legacy:4.15.0'
compileOnly 'net.kyori:adventure-text-serializer-bungeecord:4.3.2'
compileOnly 'net.kyori:adventure-text-serializer-gson:4.17.0'
compileOnly 'net.kyori:adventure-text-serializer-legacy:4.17.0'
compileOnly 'net.kyori:adventure-text-serializer-bungeecord:4.3.4'

compileOnly 'com.comphenix.protocol:ProtocolLib:5.3.0-SNAPSHOT'
compileOnly 'me.clip:placeholderapi:2.11.1'
Expand Down

0 comments on commit ecffa0d

Please sign in to comment.