From 139167d09057c6fd739df5e134bff5598a9cbd92 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Tue, 15 Jun 2021 14:48:18 -0400
Subject: [PATCH] Don't hardcode the bell block ID

---
 .../java/world/JavaBlockValueTranslator.java         |  4 ++--
 .../translators/world/block/BlockTranslator.java     | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaBlockValueTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaBlockValueTranslator.java
index 6c14f17ca..ddcf55837 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaBlockValueTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaBlockValueTranslator.java
@@ -36,6 +36,7 @@ import com.nukkitx.protocol.bedrock.packet.BlockEventPacket;
 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.network.translators.world.block.entity.NoteblockBlockEntityTranslator;
 
 import java.util.concurrent.TimeUnit;
@@ -76,8 +77,7 @@ public class JavaBlockValueTranslator extends PacketTranslator<ServerBlockValueP
         } else if (packet.getValue() instanceof EndGatewayValue) {
             blockEventPacket.setEventType(1);
             session.sendUpstreamPacket(blockEventPacket);
-        } else if (packet.getValue() instanceof GenericBlockValue && packet.getBlockId() == 677) {
-            // TODO: Remove hardcode? Remove hardcodes for all of these? (EndGatewayValue for example still hardcodes the block)
+        } else if (packet.getValue() instanceof GenericBlockValue && packet.getBlockId() == BlockTranslator.JAVA_BELL_BLOCK_ID) {
             // Bells - needed to show ring from other players
             GenericBlockValue bellValue = (GenericBlockValue) packet.getValue();
             Position position = packet.getPosition();
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/BlockTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/BlockTranslator.java
index ed7818924..f5b567490 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/BlockTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/BlockTranslator.java
@@ -89,6 +89,7 @@ public abstract class BlockTranslator {
     private final EmptyChunkProvider emptyChunkProvider;
 
     public static final int JAVA_COBWEB_BLOCK_ID;
+    public static final int JAVA_BELL_BLOCK_ID;
 
     public static final int JAVA_RUNTIME_FURNACE_ID;
     public static final int JAVA_RUNTIME_FURNACE_LIT_ID;
@@ -115,6 +116,7 @@ public abstract class BlockTranslator {
         }
 
         int javaRuntimeId = -1;
+        int bellBlockId = -1;
         int cobwebBlockId = -1;
         int furnaceRuntimeId = -1;
         int furnaceLitRuntimeId = -1;
@@ -181,7 +183,10 @@ public abstract class BlockTranslator {
 
             JAVA_RUNTIME_ID_TO_BLOCK_MAPPING.put(javaRuntimeId, builder.build());
 
-            if (javaId.contains("cobweb")) {
+            if (javaId.startsWith("minecraft:bell[")) {
+                bellBlockId = uniqueJavaId;
+
+            } else if (javaId.contains("cobweb")) {
                 cobwebBlockId = uniqueJavaId;
 
             } else if (javaId.startsWith("minecraft:furnace[facing=north")) {
@@ -199,6 +204,11 @@ public abstract class BlockTranslator {
             }
         }
 
+        if (bellBlockId == -1) {
+            throw new AssertionError("Unable to find bell in palette");
+        }
+        JAVA_BELL_BLOCK_ID = bellBlockId;
+
         if (cobwebBlockId == -1) {
             throw new AssertionError("Unable to find cobwebs in palette");
         }