From c8016647f21c67ee2f7452c30b5be9a40a65610c Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Tue, 5 Jan 2021 19:08:54 -0500
Subject: [PATCH] Clean up and add mobile button for horse opening

---
 .../entity/player/BedrockInteractTranslator.java     | 12 +++++++++---
 .../network/translators/item/RecipeRegistry.java     |  5 ++++-
 .../item/translators/TippedArrowTranslator.java      |  1 -
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockInteractTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockInteractTranslator.java
index c7c596d8..ca71a197 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockInteractTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockInteractTranslator.java
@@ -39,6 +39,7 @@ import com.nukkitx.protocol.bedrock.packet.InteractPacket;
 import lombok.Getter;
 import org.geysermc.connector.entity.Entity;
 import org.geysermc.connector.entity.living.animal.horse.AbstractHorseEntity;
+import org.geysermc.connector.entity.living.animal.horse.HorseEntity;
 import org.geysermc.connector.entity.type.EntityType;
 import org.geysermc.connector.inventory.GeyserItemStack;
 import org.geysermc.connector.network.session.GeyserSession;
@@ -212,6 +213,11 @@ public class BedrockInteractTranslator extends PacketTranslator<InteractPacket>
                             case SKELETON_HORSE:
                             case TRADER_LLAMA:
                             case ZOMBIE_HORSE:
+                                boolean tamed = entityMetadata.getFlags().getFlag(EntityFlag.TAMED);
+                                if (session.isSneaking() && tamed && (interactEntity instanceof HorseEntity || entityMetadata.getFlags().getFlag(EntityFlag.CHESTED))) {
+                                    interactiveTag = InteractiveTag.OPEN_CONTAINER;
+                                    break;
+                                }
                                 // have another switch statement as, while these share mount attributes they don't share food
                                 switch (interactEntity.getEntityType()) {
                                     case LLAMA:
@@ -230,9 +236,9 @@ public class BedrockInteractTranslator extends PacketTranslator<InteractPacket>
                                 }
                                 if (!entityMetadata.getFlags().getFlag(EntityFlag.BABY)) {
                                     // Can't ride a baby
-                                    if (entityMetadata.getFlags().getFlag(EntityFlag.TAMED)) {
+                                    if (tamed) {
                                         interactiveTag = InteractiveTag.RIDE_HORSE;
-                                    } else if (!entityMetadata.getFlags().getFlag(EntityFlag.TAMED) && itemEntry.equals(ItemEntry.AIR)) {
+                                    } else if (itemEntry.equals(ItemEntry.AIR)) {
                                         // Can't hide an untamed entity without having your hand empty
                                         interactiveTag = InteractiveTag.MOUNT;
                                     }
@@ -351,7 +357,7 @@ public class BedrockInteractTranslator extends PacketTranslator<InteractPacket>
                 } else {
                     if (!session.getPlayerEntity().getMetadata().getString(EntityData.INTERACTIVE_TAG).isEmpty()) {
                         // No interactive tag should be sent
-                        session.getPlayerEntity().getMetadata().remove(EntityData.INTERACTIVE_TAG);
+                        session.getPlayerEntity().getMetadata().put(EntityData.INTERACTIVE_TAG, "");
                         session.getPlayerEntity().updateBedrockMetadata(session);
                     }
                 }
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/RecipeRegistry.java b/connector/src/main/java/org/geysermc/connector/network/translators/item/RecipeRegistry.java
index cb866e6b..110014bf 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/item/RecipeRegistry.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/item/RecipeRegistry.java
@@ -59,6 +59,10 @@ public class RecipeRegistry {
      */
     public static int LAST_RECIPE_NET_ID = 0;
 
+    /**
+     * A list of all the following crafting recipes, but in a format understood by Java servers.
+     * Used for console autocrafting.
+     */
     public static final Int2ObjectMap<Recipe> ALL_CRAFTING_RECIPES = new Int2ObjectOpenHashMap<>();
 
     /**
@@ -163,7 +167,6 @@ public class RecipeRegistry {
         for (JsonNode entry : items.get("tipped_arrows")) {
             TIPPED_ARROW_RECIPES.add(getCraftingDataFromJsonNode(entry));
         }
-        System.out.println(ALL_CRAFTING_RECIPES);
     }
 
     /**
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/TippedArrowTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/TippedArrowTranslator.java
index c33b71ac..dd151dcd 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/TippedArrowTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/TippedArrowTranslator.java
@@ -70,7 +70,6 @@ public class TippedArrowTranslator extends ItemTranslator {
 
     @Override
     public ItemStack translateToJava(ItemData itemData, ItemEntry itemEntry) {
-        GeyserConnector.getInstance().getLogger().warning(itemData.toString() + " " + itemEntry.getJavaIdentifier());
         TippedArrowPotion tippedArrowPotion = TippedArrowPotion.getByBedrockId(itemData.getDamage());
         ItemStack itemStack = super.translateToJava(itemData, itemEntry);
         if (tippedArrowPotion != null) {