From 7993f384378c47a8665e9ea8a667751345bf5901 Mon Sep 17 00:00:00 2001
From: DoctorMacc <toy.fighter1@gmail.com>
Date: Wed, 8 Apr 2020 15:30:36 -0400
Subject: [PATCH] Prepare for PR

---
 .../java/world/JavaPlayBuiltinSoundTranslator.java       | 9 ++++++++-
 .../main/java/org/geysermc/connector/sound/SoundMap.java | 7 +++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java
index c862a334..b824c89d 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayBuiltinSoundTranslator.java
@@ -47,7 +47,14 @@ public class JavaPlayBuiltinSoundTranslator extends PacketTranslator<ServerPlayB
 
         soundPacket.setSound(sound);
         soundPacket.setPosition(Vector3f.from(packet.getX(), packet.getY(), packet.getZ()));
-        soundPacket.setExtraData(-1);
+        if (sound == SoundEvent.NOTE) {
+            // Minecraft Wiki: 2^(x/12) = Java pitch where x is -12 to 12
+            // Java sends the note value as above starting with -12 and ending at 12
+            // Bedrock has a number for each type of note, then proceeds up the scale by adding to that number
+            soundPacket.setExtraData(soundMapping.getExtraData() + (int)(Math.round((Math.log10(packet.getPitch()) / Math.log10(2)) * 12)) + 12);
+        } else {
+            soundPacket.setExtraData(soundMapping.getExtraData());
+        }
         soundPacket.setIdentifier(":"); // ???
         soundPacket.setBabySound(false); // might need to adjust this in the future
         soundPacket.setRelativeVolumeDisabled(false);
diff --git a/connector/src/main/java/org/geysermc/connector/sound/SoundMap.java b/connector/src/main/java/org/geysermc/connector/sound/SoundMap.java
index ab11fe52..45b9b5bd 100644
--- a/connector/src/main/java/org/geysermc/connector/sound/SoundMap.java
+++ b/connector/src/main/java/org/geysermc/connector/sound/SoundMap.java
@@ -43,7 +43,8 @@ public class SoundMap {
                     new SoundMapping(
                             next.getKey(),
                             brMap.has("bedrock_mapping") && brMap.get("bedrock_mapping").isTextual() ? brMap.get("bedrock_mapping").asText() : null,
-                            brMap.has("playsound_mapping") && brMap.get("playsound_mapping").isTextual() ? brMap.get("playsound_mapping").asText() : null
+                            brMap.has("playsound_mapping") && brMap.get("playsound_mapping").isTextual() ? brMap.get("playsound_mapping").asText() : null,
+                            brMap.has("extra_data") && brMap.get("extra_data").isInt() ? brMap.get("extra_data").asInt() : -1
                     )
             );
         }
@@ -98,11 +99,13 @@ public class SoundMap {
         private final String java;
         private final String bedrock;
         private final String playsound;
+        private final int extraData;
 
-        public SoundMapping(String java, String bedrock, String playsound) {
+        public SoundMapping(String java, String bedrock, String playsound, int extraData) {
             this.java = java;
             this.bedrock = bedrock == null || bedrock.equalsIgnoreCase("") ? null : bedrock;
             this.playsound = playsound == null || playsound.equalsIgnoreCase("") ? null : playsound;
+            this.extraData = extraData;
         }
     }