From b4c7682130d4e8931da2f5dfa10d984eb2e17f9d Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+DoctorMacc@users.noreply.github.com>
Date: Tue, 22 Sep 2020 14:16:57 -0400
Subject: [PATCH] Implement experience sounds (#1320)

Bedrock sends a level event for the experience sound around the same time as a Java entity collect item packet is sent.
---
 .../JavaEntityCollectItemTranslator.java}     | 35 ++++++++++++++-----
 1 file changed, 26 insertions(+), 9 deletions(-)
 rename connector/src/main/java/org/geysermc/connector/network/translators/java/{world/JavaCollectItemTranslator.java => entity/JavaEntityCollectItemTranslator.java} (61%)

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaCollectItemTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityCollectItemTranslator.java
similarity index 61%
rename from connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaCollectItemTranslator.java
rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityCollectItemTranslator.java
index a90c7016..270c33a7 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaCollectItemTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityCollectItemTranslator.java
@@ -23,26 +23,32 @@
  * @link https://github.com/GeyserMC/Geyser
  */
 
-package org.geysermc.connector.network.translators.java.world;
+package org.geysermc.connector.network.translators.java.entity;
 
 import com.github.steveice10.mc.protocol.packet.ingame.server.entity.ServerEntityCollectItemPacket;
+import com.nukkitx.protocol.bedrock.data.LevelEventType;
+import com.nukkitx.protocol.bedrock.packet.LevelEventPacket;
 import com.nukkitx.protocol.bedrock.packet.TakeItemEntityPacket;
 import org.geysermc.connector.entity.Entity;
+import org.geysermc.connector.entity.ExpOrbEntity;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.PacketTranslator;
 import org.geysermc.connector.network.translators.Translator;
 
+/**
+ * This packet is called whenever a player picks up an item.
+ * In Java, this is called for item entities, experience orbs and arrows
+ * Bedrock uses it for arrows and item entities, but not experience orbs.
+ */
 @Translator(packet = ServerEntityCollectItemPacket.class)
-public class JavaCollectItemTranslator extends PacketTranslator<ServerEntityCollectItemPacket> {
+public class JavaEntityCollectItemTranslator extends PacketTranslator<ServerEntityCollectItemPacket> {
 
     @Override
     public void translate(ServerEntityCollectItemPacket packet, GeyserSession session) {
-        // This is the definition of translating - both packets take the same values
-        TakeItemEntityPacket takeItemEntityPacket = new TakeItemEntityPacket();
-        // Collected entity is the item
+        // Collected entity is the other entity
         Entity collectedEntity = session.getEntityCache().getEntityByJavaId(packet.getCollectedEntityId());
         if (collectedEntity == null) return;
-        // Collector is the entity picking up the item
+        // Collector is the entity 'picking up' the item
         Entity collectorEntity;
         if (packet.getCollectorEntityId() == session.getPlayerEntity().getEntityId()) {
             collectorEntity = session.getPlayerEntity();
@@ -50,8 +56,19 @@ public class JavaCollectItemTranslator extends PacketTranslator<ServerEntityColl
             collectorEntity = session.getEntityCache().getEntityByJavaId(packet.getCollectorEntityId());
         }
         if (collectorEntity == null) return;
-        takeItemEntityPacket.setRuntimeEntityId(collectorEntity.getGeyserId());
-        takeItemEntityPacket.setItemRuntimeEntityId(collectedEntity.getGeyserId());
-        session.sendUpstreamPacket(takeItemEntityPacket);
+        if (collectedEntity instanceof ExpOrbEntity) {
+            // Player just picked up an experience orb
+            LevelEventPacket xpPacket = new LevelEventPacket();
+            xpPacket.setType(LevelEventType.SOUND_EXPERIENCE_ORB_PICKUP);
+            xpPacket.setPosition(collectedEntity.getPosition());
+            xpPacket.setData(0);
+            session.sendUpstreamPacket(xpPacket);
+        } else {
+            // Item is being picked up (visual only)
+            TakeItemEntityPacket takeItemEntityPacket = new TakeItemEntityPacket();
+            takeItemEntityPacket.setRuntimeEntityId(collectorEntity.getGeyserId());
+            takeItemEntityPacket.setItemRuntimeEntityId(collectedEntity.getGeyserId());
+            session.sendUpstreamPacket(takeItemEntityPacket);
+        }
     }
 }