From 25d3e0708f2b00e9e95ce489d0f33998d8e7cd21 Mon Sep 17 00:00:00 2001
From: RednedEpic <redned235@gmail.com>
Date: Sun, 3 May 2020 23:56:07 -0500
Subject: [PATCH] Map most all missing sounds

---
 .../world/JavaPlayBuiltinSoundTranslator.java | 12 +++--
 .../java/world/JavaPlayEffectTranslator.java  | 20 ++++++--
 .../block/ComparatorSoundInteractHandler.java | 48 +++++++++++++++++++
 .../block/DoorSoundInteractionHandler.java    |  2 +-
 .../block/LeverSoundInteractionHandler.java   |  2 +-
 connector/src/main/resources/mappings         |  2 +-
 6 files changed, 75 insertions(+), 11 deletions(-)
 create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/sound/block/ComparatorSoundInteractHandler.java

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 2e3d3d5f..aa4ade4a 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
@@ -34,6 +34,7 @@ import com.nukkitx.protocol.bedrock.packet.LevelSoundEventPacket;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.PacketTranslator;
 import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.connector.network.translators.world.block.BlockTranslator;
 import org.geysermc.connector.utils.SoundUtils;
 
 @Translator(packet = ServerPlayBuiltinSoundPacket.class)
@@ -72,22 +73,23 @@ public class JavaPlayBuiltinSoundTranslator extends PacketTranslator<ServerPlayB
                             + " was not a playable level sound, or has yet to be mapped to an enum in "
                             + "NukkitX SoundEvent ");
 
-        } else {
-            session.getConnector().getLogger().debug("[Builtin] Sound for original " + packetSound + " to mappings " + soundPacket
-                            + " was not found in NukkitX SoundEvent, but original packet sound name was.");
         }
-
         soundPacket.setSound(sound);
         soundPacket.setPosition(Vector3f.from(packet.getX(), packet.getY(), packet.getZ()));
+        soundPacket.setIdentifier(soundMapping.getIdentifier());
         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 if (sound == SoundEvent.PLACE && soundMapping.getExtraData() == -1) {
+            soundPacket.setExtraData(BlockTranslator.getBedrockBlockId(BlockTranslator.getJavaBlockState(soundMapping.getIdentifier())));
+            soundPacket.setIdentifier(":");
         } else {
             soundPacket.setExtraData(soundMapping.getExtraData());
         }
-        soundPacket.setIdentifier(soundMapping.getIdentifier()); // ???
+
+
         soundPacket.setBabySound(false); // might need to adjust this in the future
         soundPacket.setRelativeVolumeDisabled(false);
         session.getUpstream().sendPacket(soundPacket);
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayEffectTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayEffectTranslator.java
index cead9fe7..e22db97e 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayEffectTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlayEffectTranslator.java
@@ -57,7 +57,6 @@ public class JavaPlayEffectTranslator extends PacketTranslator<ServerPlayEffectP
             } else {
                 switch (particleEffect) {
                     // TODO: BREAK_SPLASH_POTION has additional data
-                    // TODO: Block break doesn't work when you're the player.
                     case BONEMEAL_GROW:
                         effect.setType(LevelEventType.BONEMEAL);
                         BonemealGrowEffectData growEffectData = (BonemealGrowEffectData) packet.getData();
@@ -69,7 +68,6 @@ public class JavaPlayEffectTranslator extends PacketTranslator<ServerPlayEffectP
                         BreakBlockEffectData breakBlockEffectData = (BreakBlockEffectData) packet.getData();
                         effect.setData(BlockTranslator.getBedrockBlockId(breakBlockEffectData.getBlockState()));
                         break;
-                    // TODO: Check these three
                     case EXPLOSION:
                         effect.setType(LevelEventType.PARTICLE_LARGE_EXPLOSION);
                         break;
@@ -81,7 +79,24 @@ public class JavaPlayEffectTranslator extends PacketTranslator<ServerPlayEffectP
                         // Might need to be SHOOT
                         effect.setType(LevelEventType.PARTICLE_SMOKE);
                         break;
+                    case COMPOSTER:
+                        effect.setType(LevelEventType.BONEMEAL);
+
+                        ComposterEffectData composterEffectData = (ComposterEffectData) packet.getData();
+                        LevelSoundEventPacket soundEvent = new LevelSoundEventPacket();
+                        soundEvent.setSound(SoundEvent.valueOf("COMPOSTER_" + composterEffectData.name()));
+                        soundEvent.setPosition(Vector3f.from(packet.getPosition().getX(), packet.getPosition().getY(), packet.getPosition().getZ()));
+                        soundEvent.setIdentifier(":");
+                        soundEvent.setExtraData(-1);
+                        soundEvent.setBabySound(false);
+                        soundEvent.setRelativeVolumeDisabled(false);
+                        session.getUpstream().sendPacket(soundEvent);
+                        break;
                     case BLOCK_LAVA_EXTINGUISH:
+                        effect.setType(LevelEventType.SHOOT);
+                        effect.setPosition(Vector3f.from(packet.getPosition().getX(), packet.getPosition().getY() + 1, packet.getPosition().getZ()));
+                        session.getUpstream().sendPacket(effect);
+
                         LevelSoundEventPacket soundEventPacket = new LevelSoundEventPacket();
                         soundEventPacket.setSound(SoundEvent.EXTINGUISH_FIRE);
                         soundEventPacket.setPosition(Vector3f.from(packet.getPosition().getX(), packet.getPosition().getY(), packet.getPosition().getZ()));
@@ -103,7 +118,6 @@ public class JavaPlayEffectTranslator extends PacketTranslator<ServerPlayEffectP
             if (geyserEffect != null) {
                 // Some events are LevelEventTypes, some are SoundEvents.
                 if (geyserEffect.getType().equals("soundLevel")) {
-                    // TODO: Opening doors also does not work as the player
                     effect.setType(LevelEventType.valueOf(geyserEffect.getBedrockName()));
                 } else if (geyserEffect.getType().equals("soundEvent")) {
                     LevelSoundEventPacket soundEvent = new LevelSoundEventPacket();
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/ComparatorSoundInteractHandler.java b/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/ComparatorSoundInteractHandler.java
new file mode 100644
index 00000000..260ad814
--- /dev/null
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/ComparatorSoundInteractHandler.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ *
+ *  @author GeyserMC
+ *  @link https://github.com/GeyserMC/Geyser
+ *
+ */
+
+package org.geysermc.connector.network.translators.sound.block;
+
+import com.nukkitx.math.vector.Vector3f;
+import com.nukkitx.protocol.bedrock.data.LevelEventType;
+import com.nukkitx.protocol.bedrock.packet.LevelEventPacket;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.sound.BlockSoundInteractionHandler;
+import org.geysermc.connector.network.translators.sound.SoundHandler;
+
+@SoundHandler(blocks = "comparator")
+public class ComparatorSoundInteractHandler implements BlockSoundInteractionHandler {
+
+    @Override
+    public void handleInteraction(GeyserSession session, Vector3f position, String identifier) {
+        boolean powered = identifier.contains("mode=compare");
+        LevelEventPacket levelEventPacket = new LevelEventPacket();
+        levelEventPacket.setPosition(position);
+        levelEventPacket.setType(LevelEventType.REDSTONE_TRIGGER);
+        levelEventPacket.setData(powered ? 500 : 550);
+        session.getUpstream().sendPacket(levelEventPacket);
+    }
+}
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/DoorSoundInteractionHandler.java b/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/DoorSoundInteractionHandler.java
index 3cf5955f..b8e2854d 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/DoorSoundInteractionHandler.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/DoorSoundInteractionHandler.java
@@ -33,7 +33,7 @@ import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.sound.BlockSoundInteractionHandler;
 import org.geysermc.connector.network.translators.sound.SoundHandler;
 
-@SoundHandler(blocks = "door")
+@SoundHandler(blocks = {"door", "fence_gate"})
 public class DoorSoundInteractionHandler implements BlockSoundInteractionHandler {
 
     @Override
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/LeverSoundInteractionHandler.java b/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/LeverSoundInteractionHandler.java
index 0175f927..cfbe7727 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/LeverSoundInteractionHandler.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/sound/block/LeverSoundInteractionHandler.java
@@ -42,7 +42,7 @@ public class LeverSoundInteractionHandler implements BlockSoundInteractionHandle
         LevelEventPacket levelEventPacket = new LevelEventPacket();
         levelEventPacket.setPosition(position);
         levelEventPacket.setType(LevelEventType.REDSTONE_TRIGGER);
-        levelEventPacket.setData(powered ? 500 : 600);
+        levelEventPacket.setData(powered ? 600 : 500);
         session.getUpstream().sendPacket(levelEventPacket);
     }
 }
diff --git a/connector/src/main/resources/mappings b/connector/src/main/resources/mappings
index 84898429..311b83fb 160000
--- a/connector/src/main/resources/mappings
+++ b/connector/src/main/resources/mappings
@@ -1 +1 @@
-Subproject commit 848984295e2b2223cda81fd8514d2dc29b5f1a47
+Subproject commit 311b83fb85897531d5a803afc27f666bb5626b97