From 4b40b07bf80c1adbe551950be3f9e0e545ce7286 Mon Sep 17 00:00:00 2001
From: William Johnstone <william@endevrr.com>
Date: Sat, 21 Mar 2020 21:37:55 +0000
Subject: [PATCH] Refactor code and improve sword breaking

---
 .../translators/block/BlockTranslator.java    |  5 +--
 .../network/translators/item/ItemEntry.java   | 13 +++---
 .../translators/item/ToolItemEntry.java       | 15 +++++++
 .../player/JavaPlayerActionAckTranslator.java | 43 +++++++++++--------
 .../org/geysermc/connector/utils/Toolbox.java | 29 ++++++++++---
 5 files changed, 69 insertions(+), 36 deletions(-)
 create mode 100644 connector/src/main/java/org/geysermc/connector/network/translators/item/ToolItemEntry.java

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java
index 330987615..5132e90d5 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java
@@ -53,7 +53,7 @@ public class BlockTranslator {
 
     private static final Map<BlockState, String> JAVA_ID_TO_BLOCK_ENTITY_MAP = new HashMap<>();
     public static final Int2DoubleMap JAVA_RUNTIME_ID_TO_HARDNESS = new Int2DoubleOpenHashMap();
-    public static final Int2BooleanMap JAVA_RUNTIME_ID_TO_CAN_BREAK_WITH_HAND = new Int2BooleanOpenHashMap();
+    public static final Int2BooleanMap JAVA_RUNTIME_ID_TO_CAN_HARVEST_WITH_HAND = new Int2BooleanOpenHashMap();
     public static final Int2ObjectMap<String> JAVA_RUNTIME_ID_TO_TOOL_TYPE = new Int2ObjectOpenHashMap<>();
 
     // For block breaking animation math
@@ -109,7 +109,7 @@ public class BlockTranslator {
                 JAVA_RUNTIME_ID_TO_HARDNESS.put(javaRuntimeId, hardnessNode.doubleValue());
             }
 
-            JAVA_RUNTIME_ID_TO_CAN_BREAK_WITH_HAND.put(javaRuntimeId, entry.getValue().get("can_break_with_hand").booleanValue());
+            JAVA_RUNTIME_ID_TO_CAN_HARVEST_WITH_HAND.put(javaRuntimeId, entry.getValue().get("can_break_with_hand").booleanValue());
 
             JsonNode toolTypeNode = entry.getValue().get("tool_type");
             if (toolTypeNode != null) {
@@ -120,7 +120,6 @@ public class BlockTranslator {
                 JAVA_RUNTIME_WOOL_IDS.add(javaRuntimeId);
             }
 
-
             if (javaId.contains("cobweb")) {
                 cobwebRuntimeId = javaRuntimeId;
             }
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/ItemEntry.java b/connector/src/main/java/org/geysermc/connector/network/translators/item/ItemEntry.java
index b5a9eb42c..e579c20ee 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/item/ItemEntry.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/item/ItemEntry.java
@@ -32,16 +32,13 @@ import lombok.Getter;
 @AllArgsConstructor
 public class ItemEntry {
 
-    public static ItemEntry AIR = new ItemEntry("minecraft:air", 0, 0, 0, "none", "none");
+    public static ItemEntry AIR = new ItemEntry("minecraft:air", 0, 0, 0);
 
-    private String javaIdentifier;
-    private int javaId;
+    private final String javaIdentifier;
+    private final int javaId;
 
-    private int bedrockId;
-    private int bedrockData;
-
-    private String toolType;
-    private String toolTier;
+    private final int bedrockId;
+    private final int bedrockData;
 
     @Override
     public boolean equals(Object obj) {
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/ToolItemEntry.java b/connector/src/main/java/org/geysermc/connector/network/translators/item/ToolItemEntry.java
new file mode 100644
index 000000000..5d1ddd262
--- /dev/null
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/item/ToolItemEntry.java
@@ -0,0 +1,15 @@
+package org.geysermc.connector.network.translators.item;
+
+import lombok.Getter;
+
+@Getter
+public class ToolItemEntry extends ItemEntry {
+    private final String toolType;
+    private final String toolTier;
+
+    public ToolItemEntry(String javaIdentifier, int javaId, int bedrockId, int bedrockData, String toolType, String toolTier) {
+        super(javaIdentifier, javaId, bedrockId, bedrockData);
+        this.toolType = toolType;
+        this.toolTier = toolTier;
+    }
+}
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerActionAckTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerActionAckTranslator.java
index 34b1646ad..2e28584e9 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerActionAckTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerActionAckTranslator.java
@@ -36,6 +36,7 @@ import org.geysermc.connector.network.translators.PacketTranslator;
 import org.geysermc.connector.network.translators.TranslatorsInit;
 import org.geysermc.connector.network.translators.block.BlockTranslator;
 import org.geysermc.connector.network.translators.item.ItemEntry;
+import org.geysermc.connector.network.translators.item.ToolItemEntry;
 import org.geysermc.connector.utils.ChunkUtils;
 
 public class JavaPlayerActionAckTranslator extends PacketTranslator<ServerPlayerActionAckPacket> {
@@ -59,6 +60,8 @@ public class JavaPlayerActionAckTranslator extends PacketTranslator<ServerPlayer
 
                 PlayerInventory inventory = session.getInventory();
                 ItemStack item = inventory.getItemInHand();
+                System.out.println("item.getNbt() = " + item.getNbt());
+
                 ItemEntry itemEntry = null;
                 if (item != null) {
                     itemEntry = TranslatorsInit.getItemTranslator().getItem(item);
@@ -106,10 +109,9 @@ public class JavaPlayerActionAckTranslator extends PacketTranslator<ServerPlayer
                 blockToolType.equals("");
     }
 
-    private double toolBreakTimeBonus0(String toolType, String toolTier, boolean isWoolBlock, boolean isCobweb) {
-        if (toolType.equals("sword")) return isCobweb ? 15.0 : 1.0;
+    private double toolBreakTimeBonus(String toolType, String toolTier, boolean isWoolBlock) {
         if (toolType.equals("shears")) return isWoolBlock ? 5.0 : 15.0;
-        if (toolType.equals("none")) return 1.0;
+        if (toolType.equals("")) return 1.0;
         switch (toolTier) {
             case "wooden":
                 return 2.0;
@@ -127,7 +129,7 @@ public class JavaPlayerActionAckTranslator extends PacketTranslator<ServerPlayer
     }
 
     //http://minecraft.gamepedia.com/Breaking
-    private double breakTime0(double blockHardness, String toolTier, boolean canHarvestWithHand, boolean correctTool,
+    private double calculateBreakTime(double blockHardness, String toolTier, boolean canHarvestWithHand, boolean correctTool,
                               String toolType, boolean isWoolBlock, boolean isCobweb
                               /*int efficiencyLoreLevel, int hasteEffectLevel,
                                      boolean insideOfWaterWithoutAquaAffinity, boolean outOfWaterButNotOnGround*/) {
@@ -137,7 +139,11 @@ public class JavaPlayerActionAckTranslator extends PacketTranslator<ServerPlayer
         double speed = 1.0 / baseTime;
         System.out.println("speed = " + speed);
 
-        if (correctTool) speed *= toolBreakTimeBonus0(toolType,toolTier, isWoolBlock, isCobweb);
+        if (correctTool) {
+            speed *= toolBreakTimeBonus(toolType, toolTier, isWoolBlock);
+        } else if (toolType.equals("sword")) {
+            speed*= (isCobweb ? 15.0 : 1.5);
+        }
         System.out.println("speed = " + speed);
         // TODO implement this math
         //speed += speedBonusByEfficiencyLore0(efficiencyLoreLevel);
@@ -148,26 +154,25 @@ public class JavaPlayerActionAckTranslator extends PacketTranslator<ServerPlayer
     }
 
     private double getBreakTime(double blockHardness, int blockId, ItemEntry item) {
+        boolean isWoolBlock = BlockTranslator.JAVA_RUNTIME_WOOL_IDS.contains(blockId);
+        boolean isCobweb = blockId == BlockTranslator.JAVA_RUNTIME_COBWEB_ID;
         String blockToolType = BlockTranslator.JAVA_RUNTIME_ID_TO_TOOL_TYPE.getOrDefault(blockId, "");
-        boolean canHarvestWithHand = BlockTranslator.JAVA_RUNTIME_ID_TO_CAN_BREAK_WITH_HAND.get(blockId);
+        boolean canHarvestWithHand = BlockTranslator.JAVA_RUNTIME_ID_TO_CAN_HARVEST_WITH_HAND.get(blockId);
+        String toolType = "";
+        String toolTier = "";
+        boolean correctTool = false;
+        if (item instanceof ToolItemEntry) {
+            ToolItemEntry toolItem = (ToolItemEntry) item;
+            toolType = toolItem.getToolType();
+            toolTier = toolItem.getToolTier();
+            correctTool = correctTool(blockToolType, toolType);
+        }
         System.out.println("canHarvestWithHand = " + canHarvestWithHand);
-        String toolTier = "none";
-        if (item != null) {
-            toolTier = item.getToolTier();
-        }
-        String toolType = "none";
-        if (item != null) {
-            toolType = item.getToolType();
-        }
-        boolean correctTool = correctTool(blockToolType, toolType);
         System.out.println("correctTool = " + correctTool);
         System.out.println("itemToolType = " + toolType);
         System.out.println("toolTier = " + toolTier);
-        boolean isWoolBlock = BlockTranslator.JAVA_RUNTIME_WOOL_IDS.contains(blockId);
-        boolean isCobweb = blockId == BlockTranslator.JAVA_RUNTIME_COBWEB_ID;
         System.out.println("isWoolBlock = " + isWoolBlock);
         System.out.println("isCobweb = " + isCobweb);
-
         //int efficiencyLoreLevel = Optional.ofNullable(item.getEnchantment(Enchantment.ID_EFFICIENCY))
         //        .map(Enchantment::getLevel).orElse(0);
         //int hasteEffectLevel = Optional.ofNullable(player.getEffect(Effect.HASTE))
@@ -178,7 +183,7 @@ public class JavaPlayerActionAckTranslator extends PacketTranslator<ServerPlayer
         //boolean outOfWaterButNotOnGround = (!player.isInsideOfWater()) && (!player.isOnGround());
         //return breakTime0(blockHardness, correctTool, canHarvestWithHand, blockId, itemToolType, itemTier,
         //        efficiencyLoreLevel, hasteEffectLevel, insideOfWaterWithoutAquaAffinity, outOfWaterButNotOnGround);
-        double returnValue = breakTime0(blockHardness, toolTier, canHarvestWithHand, correctTool, toolType, isWoolBlock, isCobweb);
+        double returnValue = calculateBreakTime(blockHardness, toolTier, canHarvestWithHand, correctTool, toolType, isWoolBlock, isCobweb);
         System.out.println("returnValue = " + returnValue);
         return returnValue;
     }
diff --git a/connector/src/main/java/org/geysermc/connector/utils/Toolbox.java b/connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
index ee4917c74..be74ebb48 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
@@ -40,6 +40,7 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.network.translators.item.ItemEntry;
+import org.geysermc.connector.network.translators.item.ToolItemEntry;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -103,12 +104,28 @@ public class Toolbox {
         Iterator<Map.Entry<String, JsonNode>> iterator = items.fields();
         while (iterator.hasNext()) {
             Map.Entry<String, JsonNode> entry = iterator.next();
-            ITEM_ENTRIES.put(itemIndex, new ItemEntry(
-                    entry.getKey(), itemIndex,
-                    entry.getValue().get("bedrock_id").intValue(),
-                    entry.getValue().get("bedrock_data").intValue(),
-                    entry.getValue().get("tool_type").textValue(),
-                    entry.getValue().get("tool_tier").textValue()));
+            if (entry.getValue().has("tool_type")) {
+                if (entry.getValue().has("tool_tier")) {
+                    ITEM_ENTRIES.put(itemIndex, new ToolItemEntry(
+                            entry.getKey(), itemIndex,
+                            entry.getValue().get("bedrock_id").intValue(),
+                            entry.getValue().get("bedrock_data").intValue(),
+                            entry.getValue().get("tool_type").textValue(),
+                            entry.getValue().get("tool_tier").textValue()));
+                } else {
+                    ITEM_ENTRIES.put(itemIndex, new ToolItemEntry(
+                            entry.getKey(), itemIndex,
+                            entry.getValue().get("bedrock_id").intValue(),
+                            entry.getValue().get("bedrock_data").intValue(),
+                            entry.getValue().get("tool_type").textValue(),
+                            ""));
+                }
+            } else {
+                ITEM_ENTRIES.put(itemIndex, new ItemEntry(
+                        entry.getKey(), itemIndex,
+                        entry.getValue().get("bedrock_id").intValue(),
+                        entry.getValue().get("bedrock_data").intValue()));
+            }
             itemIndex++;
         }