From 481b06cd2a706720e8b42a3199a392b68897a698 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Thu, 9 Jan 2025 22:47:11 +0100 Subject: [PATCH] Fix inlined jukebox song backup Fixes #949 --- build-logic/build.gradle.kts | 2 +- .../v1_21to1_20_5/rewriter/BlockItemPacketRewriter1_21.java | 2 +- gradle.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index 8bb9ab72..a55389ab 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -8,5 +8,5 @@ repositories { dependencies { // version must be manually kept in sync with the one in root project settings.gradle.kts - implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.0") + implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.5") } diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21to1_20_5/rewriter/BlockItemPacketRewriter1_21.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21to1_20_5/rewriter/BlockItemPacketRewriter1_21.java index 0f66c99e..108224e2 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21to1_20_5/rewriter/BlockItemPacketRewriter1_21.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21to1_20_5/rewriter/BlockItemPacketRewriter1_21.java @@ -311,7 +311,7 @@ public final class BlockItemPacketRewriter1_21 extends BackwardsStructuredItemRe final Either, String> song; final String songIdentifier = tag.getString("song_identifier"); if (songIdentifier != null) { - song = Either.right(tag.getString(songIdentifier)); + song = Either.right(songIdentifier); } else { song = Either.left(restoreHolder(tag, "song", songTag -> { final Holder soundEvent = restoreHolder(songTag, "sound_event", soundTag -> { diff --git a/gradle.properties b/gradle.properties index 1fbbad77..b317b5d9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=5.2.1 +projectVersion=5.2.2-SNAPSHOT # Smile emoji mcVersions=1.21.4,1.21.3,1.21.2,1.21.1,1.21,1.20.6,1.20.5,1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10