From 03bf12ee6571bd3a12bb99e1a8e000bdc7793584 Mon Sep 17 00:00:00 2001
From: RednedEpic <redned235@gmail.com>
Date: Fri, 13 Sep 2019 18:49:46 -0500
Subject: [PATCH] Implement more block mappings

---
 .../java/world/JavaChunkDataTranslator.java   |  1 -
 .../geysermc/connector/utils/Remapper.java    | 20 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaChunkDataTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaChunkDataTranslator.java
index 815d1742..bced26fe 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaChunkDataTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaChunkDataTranslator.java
@@ -67,7 +67,6 @@ public class JavaChunkDataTranslator extends PacketTranslator<ServerChunkDataPac
             } catch (Exception ex) {
                 ex.printStackTrace();
             }
-            GeyserLogger.DEFAULT.info("Sent chunk packet!");
         });
     }
 }
diff --git a/connector/src/main/java/org/geysermc/connector/utils/Remapper.java b/connector/src/main/java/org/geysermc/connector/utils/Remapper.java
index ab733321..98d6faa1 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/Remapper.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/Remapper.java
@@ -34,6 +34,7 @@ public class Remapper {
             BedrockItem bedrockItem = bedrockItemEntry.getValue();
             String identifier = bedrockItem.getIdentifier();
 
+            // Colorable block remapping
             for (ColoredBlock coloredBlock : ColoredBlock.values()) {
                 if (!getBedrockIdentifier(coloredBlock.name()).equalsIgnoreCase(bedrockItem.getIdentifier().replace(MINECRAFT, "")))
                     continue;
@@ -48,6 +49,7 @@ public class Remapper {
                 }
             }
 
+            // Wood remapping
             for (WoodBlock woodBlock : WoodBlock.values()) {
                 if (!getBedrockIdentifier(woodBlock.name()).equalsIgnoreCase(bedrockItem.getIdentifier().replace(MINECRAFT, "")))
                     continue;
@@ -66,6 +68,7 @@ public class Remapper {
                 }
             }
 
+            // Stone remapping
             if (bedrockItem.getIdentifier().replace(MINECRAFT, "").equalsIgnoreCase("stone") && !isTool(bedrockItem.getIdentifier())) {
                 for (StoneType stoneType : StoneType.values()) {
                     if (stoneType.getId() != bedrockItem.getData())
@@ -76,6 +79,23 @@ public class Remapper {
                 }
             }
 
+            // Grass remapping
+            if (bedrockItem.getIdentifier().replace(MINECRAFT, "").equalsIgnoreCase("grass")) {
+                identifier = MINECRAFT + "grass_block";
+            }
+
+            if (bedrockItem.getIdentifier().replace(MINECRAFT, "").equalsIgnoreCase("tallgrass")) {
+                identifier = MINECRAFT + "grass";
+            }
+
+            // Dirt remapping
+            if (bedrockItem.getIdentifier().replace(MINECRAFT, "").equalsIgnoreCase("dirt")) {
+                if (bedrockItem.getData() == 0)
+                    identifier = MINECRAFT + "dirt";
+                else
+                    identifier = MINECRAFT + "coarse_dirt";
+            }
+
             for (Map.Entry<String, JavaItem> javaItemEntry : javaItems.entrySet()) {
                 if (identifier.equalsIgnoreCase(javaItemEntry.getKey())) {
                     bedrockToJava.put(bedrockItemEntry.getValue(), javaItemEntry.getValue());