From a4649c81dff798ab37c9b44fbcea08e293b84134 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Mon, 7 Jun 2021 17:28:46 -0400 Subject: [PATCH 1/8] Velocity 1.1.7 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c80394215..b00bc47a8 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ allprojects { apply plugin: "com.github.spotbugs" group 'com.velocitypowered' - version '1.1.7-SNAPSHOT' + version '1.1.7' ext { // dependency versions From 4619053962becf6e10b46411e3bd74f45bb0b505 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Mon, 7 Jun 2021 17:31:29 -0400 Subject: [PATCH 2/8] Velocity 1.1.8-SNAPSHOT --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b00bc47a8..3cab2c1b1 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ allprojects { apply plugin: "com.github.spotbugs" group 'com.velocitypowered' - version '1.1.7' + version '1.1.8-SNAPSHOT' ext { // dependency versions From 8892e2a5c6bbfa33aae293eb9283fecb4a77232c Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Tue, 8 Jun 2021 15:41:54 -0400 Subject: [PATCH 3/8] We don't need the hash to go along with the resource pack response --- .../connection/client/ClientPlaySessionHandler.java | 3 +-- .../proxy/connection/client/ConnectedPlayer.java | 11 +++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java index 7c8729610..6fb7633be 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java @@ -285,8 +285,7 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler { @Override public boolean handle(ResourcePackResponse packet) { - return player.onResourcePackResponse(packet.getStatus(), - ByteBufUtil.decodeHexDump(packet.getHash())); + return player.onResourcePackResponse(packet.getStatus(), packet.getHash()); } @Override diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java index 26ba80c24..64bb15122 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java @@ -924,7 +924,7 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player { .compareTo(ProtocolVersion.MINECRAFT_1_17) >= 0) { break; } - onResourcePackResponse(PlayerResourcePackStatusEvent.Status.DECLINED, new byte[0]); + onResourcePackResponse(PlayerResourcePackStatusEvent.Status.DECLINED); queued = null; } if (queued == null) { @@ -960,9 +960,7 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player { /** * Processes a client response to a sent resource-pack. */ - public boolean onResourcePackResponse(PlayerResourcePackStatusEvent.Status status, - @Nullable byte[] hash) { - + public boolean onResourcePackResponse(PlayerResourcePackStatusEvent.Status status) { final boolean peek = status == PlayerResourcePackStatusEvent.Status.ACCEPTED; final ResourcePackInfo queued = peek ? outstandingResourcePacks.peek() : outstandingResourcePacks.poll(); @@ -979,7 +977,6 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player { } }); - switch (status) { case ACCEPTED: previousResourceResponse = true; @@ -1000,9 +997,7 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player { } if (!peek) { - connection.eventLoop().execute(() -> { - tickResourcePackQueue(); - }); + connection.eventLoop().execute(this::tickResourcePackQueue); } return queued != null && queued.getOrigin() == ResourcePackInfo.Origin.DOWNSTREAM_SERVER; From e1af30e0facd833c1f060d24b9b673e216747009 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Tue, 8 Jun 2021 15:42:20 -0400 Subject: [PATCH 4/8] whoops --- .../proxy/connection/client/ClientPlaySessionHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java index 6fb7633be..e26814244 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java @@ -285,7 +285,7 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler { @Override public boolean handle(ResourcePackResponse packet) { - return player.onResourcePackResponse(packet.getStatus(), packet.getHash()); + return player.onResourcePackResponse(packet.getStatus()); } @Override From d84609ab7c3d9c6cbb92b17aa4abc32c9214c066 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Tue, 8 Jun 2021 15:45:26 -0400 Subject: [PATCH 5/8] Velocity 1.1.8 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3cab2c1b1..cf590d55f 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ allprojects { apply plugin: "com.github.spotbugs" group 'com.velocitypowered' - version '1.1.8-SNAPSHOT' + version '1.1.8' ext { // dependency versions From 9b42bc8c45e502c3de275f7c7773534adb1fde6d Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Tue, 8 Jun 2021 15:45:53 -0400 Subject: [PATCH 6/8] Whatever, let's update Adventure too I guess --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index cf590d55f..ac2d4d8a9 100644 --- a/build.gradle +++ b/build.gradle @@ -17,12 +17,12 @@ allprojects { apply plugin: "com.github.spotbugs" group 'com.velocitypowered' - version '1.1.8' + version '1.1.' ext { // dependency versions textVersion = '3.0.4' - adventureVersion = '4.7.0' + adventureVersion = '4.8.0' adventurePlatformVersion = '4.0.0-SNAPSHOT' junitVersion = '5.7.0' slf4jVersion = '1.7.30' From caf7af12b8352c43321a3979ac0e0dbf0cfaafa2 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Tue, 8 Jun 2021 15:48:02 -0400 Subject: [PATCH 7/8] WTF, actually 1.1.8 please. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ac2d4d8a9..f37991b94 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ allprojects { apply plugin: "com.github.spotbugs" group 'com.velocitypowered' - version '1.1.' + version '1.1.8' ext { // dependency versions From 793ad443c6fbfb2571e0e65dde4d59474d13b52d Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Tue, 8 Jun 2021 15:50:37 -0400 Subject: [PATCH 8/8] Velocity 1.1.9-SNAPSHOT --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f37991b94..e2f9a47bc 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ allprojects { apply plugin: "com.github.spotbugs" group 'com.velocitypowered' - version '1.1.8' + version '1.1.9-SNAPSHOT' ext { // dependency versions