Upstream/ViaBackwards
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaBackwards.git synced 2024-07-03 11:35:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix named sound remapping

Browse Source
This commit is contained in:
KennyTV 2021-02-14 19:10:37 +01:00
parent 859a79d7da
commit 8dfacde007
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
4 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/nl/matsv/viabackwards/api/data/BackwardsMappings.java
View File

@ -113,7 +113,15 @@ public class BackwardsMappings extends MappingData {
@Nullable
public String getMappedNamedSound(String id) {
return backwardsSoundMappings != null ? backwardsSoundMappings.get(id) : null;
if (backwardsItemMappings == null) {
return null;
}
if (id.indexOf(':') == -1) {
id = "minecraft:" + id;
}
return backwardsSoundMappings.get(id);
}
@Nullable

8
core/src/main/java/nl/matsv/viabackwards/api/rewriters/SoundRewriter.java
View File

@ -37,10 +37,6 @@ public class SoundRewriter extends us.myles.ViaVersion.api.rewriters.SoundRewrit
public PacketHandler getNamedSoundHandler() {
return 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()) {
@ -61,10 +57,6 @@ 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

3
core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/NamedSoundMapping.java
View File

@ -21,6 +21,9 @@ public class NamedSoundMapping {
}
public static String getOldId(String sound1_13) {
if (sound1_13.startsWith("minecraft:")) {
sound1_13 = sound1_13.substring(10);
}
return SOUNDS.get(sound1_13);
}
}

8
core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/SoundPackets1_13.java
View File

@ -25,10 +25,6 @@ public class SoundPackets1_13 extends Rewriter<Protocol1_12_2To1_13> {
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);
@ -56,10 +52,6 @@ public class SoundPackets1_13 extends Rewriter<Protocol1_12_2To1_13> {
String sound;
if ((flags & 0x02) != 0) {
String newSound = wrapper.read(Type.STRING);
if (newSound.startsWith("minecraft:")) {
newSound = newSound.substring(10);
}
sound = protocol.getMappingData().getMappedNamedSound(newSound);
if (sound == null) {
sound = "";