Translate ITEM_BREAK particles correctly

Closes bundabrg/GeyserReversion#38
bundabrg · Feb 17, 2021 · 1d7e06a · 1d7e06a
1 parent dc8123f
commit 1d7e06a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/...ain/java/au/com/grieve/reversion/editions/bedrock/handlers/LevelEventHandler_Bedrock.java b/...ain/java/au/com/grieve/reversion/editions/bedrock/handlers/LevelEventHandler_Bedrock.java
@@ -36,14 +36,24 @@ public LevelEventHandler_Bedrock(BedrockTranslator translator) {
 
     @Override
     public boolean fromDownstream(LevelEventPacket packet) {
+        int id;
+        int face;
+        int damage;
         switch (packet.getType()) {
-            case PARTICLE_DESTROY_BLOCK:
+            case PARTICLE_DESTROY_BLOCK: // block
+            case PARTICLE_DESTROY_BLOCK_NO_SOUND:
+            case PARTICLE_FALLING_DUST:
                 packet.setData(getTranslator().getRegisteredTranslator().getBlockMapper().mapRuntimeIdToUpstream(packet.getData()));
                 break;
-            case PARTICLE_CRACK_BLOCK:
-                int block = packet.getData() & 16777215;
-                int face = packet.getData() >> 24;
-                packet.setData(getTranslator().getRegisteredTranslator().getBlockMapper().mapRuntimeIdToUpstream(block) | (face << 24));
+            case PARTICLE_CRACK_BLOCK: // (face << 24) | block
+                id = packet.getData() & 16777215;
+                face = packet.getData() >> 24;
+                packet.setData(getTranslator().getRegisteredTranslator().getBlockMapper().mapRuntimeIdToUpstream(id) | (face << 24));
+                break;
+            case PARTICLE_ITEM_BREAK: // (id << 16) | damage
+                id = packet.getData() >> 16;
+                damage = packet.getData() & 65535;
+                packet.setData((getTranslator().getRegisteredTranslator().getItemMapper().mapRuntimeIdToUpstream(id) << 16) | damage);
                 break;
         }
         return false;

diff --git a/...on-bedrock/src/main/java/au/com/grieve/reversion/editions/bedrock/mappers/ItemMapper.java b/...on-bedrock/src/main/java/au/com/grieve/reversion/editions/bedrock/mappers/ItemMapper.java
@@ -557,6 +557,15 @@ public NbtMap mapEnchantmentNbtToUpstream(NbtMap original) {
         return original;
     }
 
+    public int mapRuntimeIdToUpstream(int original) {
+        List<RuntimeItemMapperEntry> translatedItems = itemToUpstreamMap.get(original);
+        if (translatedItems == null) {
+            return original;
+        }
+
+        return translatedItems.get(0).getUpstream().getId();
+    }
+
 
     /**
      * Provides an entry for the ItemMapper