Mirrors/ViaBackwards
3
0
Fork 0
Mirror von https://github.com/ViaVersion/ViaBackwards.git synchronisiert 2024-07-05 23:28:03 +02:00
Code Issues Releases Aktivität

Fix named sound conversion warnings

Quellcode durchsuchen 
Closes #283
Dieser Commit ist enthalten in:
KennyTV 2020-11-04 09:00:32 +01:00
Ursprung 27f7c3e72b
Commit a982d8c0f0
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 6BE3B555EBC5982B
2 geänderte Dateien mit 18 neuen und 1 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

8
core/src/main/java/nl/matsv/viabackwards/api/rewriters/SoundRewriter.java
Datei anzeigen

@ -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

11
core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/SoundPackets1_13.java
Datei anzeigen

@ -25,6 +25,10 @@ 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);
@ -51,7 +55,12 @@ public class SoundPackets1_13 extends Rewriter<Protocol1_12_2To1_13> {
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 = "";
}