From 7c807740a45e38f44dacd75fc0df92186b57f19d Mon Sep 17 00:00:00 2001
From: EOT3000 <43685885+EOT3000@users.noreply.github.com>
Date: Wed, 7 Aug 2019 19:56:44 -0400
Subject: [PATCH] even more mappings!

---
 .../translators/item/ItemTranslator.java      |  1 +
 .../geysermc/connector/utils/RemapUtils.java  | 53 ++++++++++---------
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/ItemTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/item/ItemTranslator.java
index 19658b8ca..3cb662bca 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/item/ItemTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/item/ItemTranslator.java
@@ -77,6 +77,7 @@ public class ItemTranslator {
 
     public BedrockItem getBedrockItem(ItemStack stack) {
         Map<String, Object> m = Remapper.JAVA_TO_BEDROCK.get(stack.getId());
+        System.out.println(stack.getId());
         return new BedrockItem((String) m.get("name"), (Integer) m.get("id"), (Integer) m.get("data"));
     }
 
diff --git a/connector/src/main/java/org/geysermc/connector/utils/RemapUtils.java b/connector/src/main/java/org/geysermc/connector/utils/RemapUtils.java
index f02b3b557..34f155f1e 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/RemapUtils.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/RemapUtils.java
@@ -1,9 +1,6 @@
 package org.geysermc.connector.utils;
 
-import org.geysermc.connector.network.translators.item.BedrockItem;
-import org.geysermc.connector.network.translators.item.DyeColor;
-import org.geysermc.connector.network.translators.item.JavaItem;
-import org.geysermc.connector.network.translators.item.WoodType;
+import org.geysermc.connector.network.translators.item.*;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -30,12 +27,31 @@ class RemapUtils {
                 }
             }
 
+        });
+        //stone
+        Remapper.predicates.put((x) -> x.getF().contains("stone"), (x, y) -> {
+            //System.out.println(x.getIdentifier());
+            if(customStoneIfNeeded(y)) return;
+
+            if (y.getIdentifier().replaceAll("stone_", "")
+                    .equalsIgnoreCase(x.getIdentifier()) && x.getData() == 0) {
+
+                /*for (WoodType woodType : WoodType.values()) {
+                    JavaItem j = new JavaItem(y.getIdentifier().replaceAll("oak", woodType.getName()), y.getId());
+                    Remapper.convertions.computeIfAbsent(j, (q) -> new ArrayList<>());
+                    Remapper.convertions.get(j).add(new BedrockItem(x.getIdentifier(), x.getId(), woodType.getId()));
+                }*/
+            }
+
         });
         //shared name
         Remapper.predicates.put((x) -> x.getF().equalsIgnoreCase(x.getS()), (x, y) -> {
-            if(customColorIfNeeded(y)) return;
-            Remapper.convertions.computeIfAbsent(y, (q) -> new ArrayList<>());
-            Remapper.convertions.get(y).add(x);
+            try {
+                Remapper.convertions.computeIfAbsent(y, (q) -> new ArrayList<>());
+                Remapper.convertions.get(y).add(x);
+            } catch (Exception e) {
+                //
+            }
         });
         //wood
         Remapper.predicates.put((x) -> x.getF().contains("oak"), (x, y) -> {
@@ -53,26 +69,10 @@ class RemapUtils {
             }
 
         });
-        Remapper.predicates.put((x) -> x.getF().contains("stone"), (x, y) -> {
-            //System.out.println(x.getIdentifier());
-            if(customStoneIfNeeded(y)) return;
-
-            if (y.getIdentifier().replaceAll("stone_", "")
-                    .equalsIgnoreCase(x.getIdentifier()) && x.getData() == 0) {
-
-                for (WoodType woodType : WoodType.values()) {
-                    JavaItem j = new JavaItem(y.getIdentifier().replaceAll("oak", woodType.getName()), y.getId());
-                    Remapper.convertions.computeIfAbsent(j, (q) -> new ArrayList<>());
-                    Remapper.convertions.get(j).add(new BedrockItem(x.getIdentifier(), x.getId(), woodType.getId()));
-                }
-            }
-
-        });
     }
 
     private static boolean customColorIfNeeded(JavaItem j) {
         if(j.getIdentifier().equalsIgnoreCase(MINECRAFT + "shulker_box")) {
-            System.out.println(j.getIdentifier());
             Remapper.convertions.put(j, Arrays.asList(new BedrockItem(MINECRAFT + "undyed_shulker_box", 205, 0)));
             return true;
         }
@@ -90,8 +90,11 @@ class RemapUtils {
     }
 
     private static boolean customStoneIfNeeded(JavaItem j) {
-        if(j.getIdentifier().equalsIgnoreCase("")) {
-
+        if (j.getIdentifier().equalsIgnoreCase(MINECRAFT + "stone")) {
+            for (StoneType type : StoneType.values()) {
+                Remapper.convertions.put(new JavaItem(MINECRAFT + type.getName(), type.getId() + 1), Arrays.asList(new BedrockItem(MINECRAFT + "stone", 1, type.getId())));
+            }
+            return true;
         }
         return false;
     }