From a982d8c0f0e9e7bb460308197fd46e7c25a09626 Mon Sep 17 00:00:00 2001 From: KennyTV Date: Wed, 4 Nov 2020 09:00:32 +0100 Subject: [PATCH] Fix named sound conversion warnings Closes #283 --- .../viabackwards/api/rewriters/SoundRewriter.java | 8 ++++++++ .../packets/SoundPackets1_13.java | 11 ++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/nl/matsv/viabackwards/api/rewriters/SoundRewriter.java b/core/src/main/java/nl/matsv/viabackwards/api/rewriters/SoundRewriter.java index 0fedd858..3f60949f 100644 --- a/core/src/main/java/nl/matsv/viabackwards/api/rewriters/SoundRewriter.java +++ b/core/src/main/java/nl/matsv/viabackwards/api/rewriters/SoundRewriter.java @@ -21,6 +21,10 @@ public class SoundRewriter extends us.myles.ViaVersion.api.rewriters.SoundRewrit map(Type.STRING); // Sound identifier handler(wrapper -> { String soundId = wrapper.get(Type.STRING, 0); + if (soundId.startsWith("minecraft:")) { + soundId = soundId.substring(10); + } + String mappedId = protocol.getMappingData().getMappedNamedSound(soundId); if (mappedId == null) return; if (!mappedId.isEmpty()) { @@ -46,6 +50,10 @@ public class SoundRewriter extends us.myles.ViaVersion.api.rewriters.SoundRewrit } String soundId = wrapper.read(Type.STRING); + if (soundId.startsWith("minecraft:")) { + soundId = soundId.substring(10); + } + String mappedId = protocol.getMappingData().getMappedNamedSound(soundId); if (mappedId == null) { // No mapping found diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/SoundPackets1_13.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/SoundPackets1_13.java index 898e45b4..79d8414b 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/SoundPackets1_13.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/SoundPackets1_13.java @@ -25,6 +25,10 @@ public class SoundPackets1_13 extends Rewriter { map(Type.STRING); handler(wrapper -> { String newSound = wrapper.get(Type.STRING, 0); + if (newSound.startsWith("minecraft:")) { + newSound = newSound.substring(10); + } + String oldSound = NamedSoundMapping.getOldId(newSound); if (oldSound != null || (oldSound = protocol.getMappingData().getMappedNamedSound(newSound)) != null) { wrapper.set(Type.STRING, 0, oldSound); @@ -51,7 +55,12 @@ public class SoundPackets1_13 extends Rewriter { String sound; if ((flags & 0x02) != 0) { - sound = protocol.getMappingData().getMappedNamedSound(wrapper.read(Type.STRING)); + String newSound = wrapper.read(Type.STRING); + if (newSound.startsWith("minecraft:")) { + newSound = newSound.substring(10); + } + + sound = protocol.getMappingData().getMappedNamedSound(newSound); if (sound == null) { sound = ""; }