Properly implement basic block breaking. Everything works, but it doesn't take into account effects or enchantments

lukeeey · lukeeey · commit b31a67d4a9bc · 2020-04-26T18:16:13.000+01:00
diff --git a/proxy/src/main/java/org/dragonet/proxy/DragonProxy.java b/proxy/src/main/java/org/dragonet/proxy/DragonProxy.java
@@ -165,8 +165,8 @@ private void initialize() throws IOException {
         sessionManager = new SessionManager();
 
         new PacketTranslatorRegistry();
-        new ItemTranslatorRegistry();
         new BlockTranslator();
+        new ItemTranslatorRegistry();
         new SkinUtils();
         new MinecraftLanguage();
         new MapDataUtils();
diff --git a/proxy/src/main/java/org/dragonet/proxy/data/item/ToolTier.java b/proxy/src/main/java/org/dragonet/proxy/data/item/ToolTier.java
@@ -0,0 +1,9 @@
+package org.dragonet.proxy.data.item;
+
+public enum ToolTier {
+    WOODEN,
+    STONE,
+    GOLDEN,
+    IRON,
+    DIAMOND
+}
diff --git a/proxy/src/main/java/org/dragonet/proxy/data/item/ToolType.java b/proxy/src/main/java/org/dragonet/proxy/data/item/ToolType.java
@@ -0,0 +1,10 @@
+package org.dragonet.proxy.data.item;
+
+public enum ToolType {
+    SWORD,
+    SHOVEL,
+    AXE,
+    HOE,
+    PICKAXE,
+    SHEARS
+}
diff --git a/proxy/src/main/java/org/dragonet/proxy/network/session/ProxySession.java b/proxy/src/main/java/org/dragonet/proxy/network/session/ProxySession.java
@@ -36,7 +36,6 @@
 import com.nukkitx.math.vector.Vector2f;
 import com.nukkitx.math.vector.Vector3f;
 import com.nukkitx.math.vector.Vector3i;
-import com.nukkitx.nbt.tag.CompoundTag;
 import com.nukkitx.network.util.DisconnectReason;
 import com.nukkitx.protocol.PlayerSession;
 import com.nukkitx.protocol.bedrock.BedrockPacket;
@@ -64,7 +63,6 @@
 import org.dragonet.proxy.util.TextFormat;
 
 import javax.annotation.Nonnull;
-import java.awt.*;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
diff --git a/proxy/src/main/java/org/dragonet/proxy/network/translator/ItemTranslatorRegistry.java b/proxy/src/main/java/org/dragonet/proxy/network/translator/ItemTranslatorRegistry.java
@@ -19,17 +19,15 @@
 package org.dragonet.proxy.network.translator;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
-import com.github.steveice10.mc.protocol.data.message.Message;
 import com.github.steveice10.opennbt.tag.builtin.*;
 import com.nukkitx.nbt.CompoundTagBuilder;
 import com.nukkitx.protocol.bedrock.data.ItemData;
-import com.nukkitx.protocol.util.Int2ObjectBiMap;
 import it.unimi.dsi.fastutil.ints.*;
 import lombok.Getter;
 import lombok.extern.log4j.Log4j2;
-import org.dragonet.proxy.DragonProxy;
+import org.dragonet.proxy.data.item.ToolTier;
+import org.dragonet.proxy.data.item.ToolType;
 import org.dragonet.proxy.network.translator.misc.IItemTranslator;
 import org.dragonet.proxy.network.translator.misc.MessageTranslator;
 import org.dragonet.proxy.network.translator.misc.item.ItemEntry;
@@ -40,11 +38,8 @@
 import org.dragonet.proxy.util.registry.MappingEntry;
 import org.dragonet.proxy.util.registry.Registry;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
 @Log4j2
@@ -57,7 +52,9 @@ public class ItemTranslatorRegistry extends Registry {
 
     // Java to Bedrock and vice versa
     private static final Int2ObjectMap<ItemEntry> javaToBedrockMap = new Int2ObjectLinkedOpenHashMap<>();
-    private static final Int2ObjectMap<ItemEntry> bedrockToJavaMap = new Int2ObjectLinkedOpenHashMap<>();
+
+    // TODO: HACK: THIS SHOULD BE PRIVATE
+    public static final Int2ObjectMap<ItemEntry> bedrockToJavaMap = new Int2ObjectLinkedOpenHashMap<>();
 
     // The mappings are generated sequentially starting from air (id 0)
     // This counter is increment for every item we loop over
@@ -79,8 +76,10 @@ public class ItemTranslatorRegistry extends Registry {
                 ItemMappingEntry itemMappingEntry = (ItemMappingEntry) value;
                 int javaProtocolId = javaIdAllocator.getAndIncrement(); // Entries are loaded sequentially in the mapping file
 
-                javaToBedrockMap.put(javaProtocolId, new ItemEntry(key, javaProtocolId, itemMappingEntry.getBedrockId(), itemMappingEntry.getBedrockData()));
-                bedrockToJavaMap.put(itemMappingEntry.getBedrockId(), new ItemEntry(key, javaProtocolId, itemMappingEntry.getBedrockId(), itemMappingEntry.getBedrockData()));
+                ItemEntry entry = new ItemEntry(key, javaProtocolId, itemMappingEntry.getBedrockId(), itemMappingEntry.getBedrockData(), itemMappingEntry.getToolType(), itemMappingEntry.getToolTier());
+
+                javaToBedrockMap.put(javaProtocolId, entry);
+                bedrockToJavaMap.put(itemMappingEntry.getBedrockId(), entry);
             });
         });
 
@@ -203,5 +202,11 @@ private static class ItemMappingEntry implements MappingEntry {
 
         @JsonProperty("bedrock_data")
         private int bedrockData;
+
+        @JsonProperty("tool_type")
+        private ToolType toolType;
+
+        @JsonProperty("tool_tier")
+        private ToolTier toolTier;
     }
 }
diff --git a/proxy/src/main/java/org/dragonet/proxy/network/translator/bedrock/player/PEMobEquipmentTranslator.java b/proxy/src/main/java/org/dragonet/proxy/network/translator/bedrock/player/PEMobEquipmentTranslator.java
@@ -32,6 +32,7 @@ public class PEMobEquipmentTranslator extends PacketTranslator<MobEquipmentPacke
     @Override
     public void translate(ProxySession session, MobEquipmentPacket packet) {
         if(packet.getContainerId() == 0) {
+            session.getCachedEntity().setMainHand(packet.getItem());
             session.getCachedEntity().setSelectedHotbarSlot(packet.getHotbarSlot());
             session.sendRemotePacket(new ClientPlayerChangeHeldItemPacket(packet.getHotbarSlot()));
         }
diff --git a/proxy/src/main/java/org/dragonet/proxy/network/translator/java/entity/PCEntityEquipmentTranslator.java b/proxy/src/main/java/org/dragonet/proxy/network/translator/java/entity/PCEntityEquipmentTranslator.java
@@ -18,6 +18,7 @@
  */
 package org.dragonet.proxy.network.translator.java.entity;
 
+import com.github.steveice10.mc.protocol.data.game.entity.EquipmentSlot;
 import com.github.steveice10.mc.protocol.packet.ingame.server.entity.ServerEntityEquipmentPacket;
 import com.nukkitx.protocol.bedrock.packet.MobEquipmentPacket;
 import lombok.extern.log4j.Log4j2;
diff --git a/proxy/src/main/java/org/dragonet/proxy/network/translator/java/player/PCPlayerActionAckTranslator.java b/proxy/src/main/java/org/dragonet/proxy/network/translator/java/player/PCPlayerActionAckTranslator.java
@@ -24,7 +24,9 @@
 import com.nukkitx.protocol.bedrock.packet.LevelEventPacket;
 import lombok.extern.log4j.Log4j2;
 import org.dragonet.proxy.network.session.ProxySession;
+import org.dragonet.proxy.network.translator.misc.BlockTranslator;
 import org.dragonet.proxy.network.translator.misc.PacketTranslator;
+import org.dragonet.proxy.util.BlockUtils;
 import org.dragonet.proxy.util.registry.PacketRegisterInfo;
 import org.dragonet.proxy.util.TextFormat;
 
@@ -44,10 +46,11 @@ public void translate(ProxySession session, ServerPlayerActionAckPacket packet)
 
         switch(packet.getAction()) {
             case START_DIGGING:
-                // TODO: ServerBlockBreakAnimPacket?
+                double breakTime = Math.ceil(BlockUtils.getBreakTime(session.getCachedEntity().getMainHand(), BlockTranslator.translateToBedrock(packet.getNewState())) * 20);
+
                 levelEventPacket.setType(LevelEventType.BLOCK_START_BREAK);
                 levelEventPacket.setPosition(position);
-                levelEventPacket.setData((int) (65535 / Math.ceil(0.5 * 20))); // TODO: break times
+                levelEventPacket.setData((int) (65535 / breakTime));
                 break;
             case CANCEL_DIGGING:
                 levelEventPacket.setType(LevelEventType.BLOCK_STOP_BREAK);
diff --git a/proxy/src/main/java/org/dragonet/proxy/network/translator/misc/BlockTranslator.java b/proxy/src/main/java/org/dragonet/proxy/network/translator/misc/BlockTranslator.java
@@ -26,18 +26,15 @@
 import com.nukkitx.nbt.stream.NBTInputStream;
 import com.nukkitx.nbt.tag.CompoundTag;
 import com.nukkitx.nbt.tag.ListTag;
-import it.unimi.dsi.fastutil.ints.Int2IntMap;
-import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.ints.*;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
-import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.extern.log4j.Log4j2;
 import org.dragonet.proxy.DragonProxy;
+import org.dragonet.proxy.data.item.ToolType;
 import org.dragonet.proxy.util.FileUtils;
 
 import java.io.IOException;
@@ -72,6 +69,10 @@ public class BlockTranslator {
 
     private static Object2IntMap<String> bedrockId2RuntimeMap = new Object2IntOpenHashMap<>();
     private static Int2ObjectMap<String> bedrockRuntime2IdMap = new Int2ObjectOpenHashMap<>();
+
+    // TOOD: HACK
+    public static Int2ObjectMap<BlockMappingEntry> ID_TO_ENTRY = new Int2ObjectLinkedOpenHashMap<>();
+
     @Getter
     private static Int2IntMap beds = new Int2IntOpenHashMap();
 
@@ -150,6 +151,9 @@ public class BlockTranslator {
             bedrockRuntime2IdMap.put(bedrockRuntimeId, bedrockIdentifier);
             java2BedrockMap.put(javaProtocolId, bedrockRuntimeId);
 
+            // TODO: HACK
+            ID_TO_ENTRY.put(bedrockRuntimeId, blockMappingEntry);
+
             bedrockIdAllocator.incrementAndGet();
         });
 
@@ -203,12 +207,15 @@ public static boolean isWaterlogged(BlockState state) {
     }
 
     @Getter
-    private static class BlockMappingEntry {
+    public static class BlockMappingEntry {
         @JsonProperty("bedrock_identifier")
         private String bedrockIdentifier;
 
-        @JsonProperty("block_hardness")
         private double hardness;
+
+        @JsonProperty("tool_type")
+        private ToolType toolType;
+
         private boolean waterlogged;
         private List<BlockStateEntry> bedrockStates = new ArrayList<>();
 
@@ -220,7 +227,7 @@ private void loadBedrockStates(Map<String, Object> map) {
 
     @Getter
     @AllArgsConstructor
-    private static class BlockStateEntry {
+    public static class BlockStateEntry {
         private String name;
         private Object value;
     }
diff --git a/proxy/src/main/java/org/dragonet/proxy/network/translator/misc/item/ItemEntry.java b/proxy/src/main/java/org/dragonet/proxy/network/translator/misc/item/ItemEntry.java
@@ -18,26 +18,22 @@
  */
 package org.dragonet.proxy.network.translator.misc.item;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.nukkitx.nbt.tag.CompoundTag;
 import com.nukkitx.protocol.bedrock.data.ItemData;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import org.dragonet.proxy.data.item.ToolTier;
+import org.dragonet.proxy.data.item.ToolType;
 
 @Getter
 @AllArgsConstructor
 public class ItemEntry {
-    @JsonProperty
     private String javaIdentifier;
-    @JsonProperty("javaId")
     private int javaProtocolId;
-
-    // TODO: add back support for bedrock identifier, as the geyser mappings dont include it
-    //private String bedrockIdentifier;
-    @JsonProperty("bedrockId")
     private int bedrockRuntimeId;
-    @JsonProperty
     private int bedrockData;
+    private ToolType toolType;
+    private ToolTier toolTier;
 
     public ItemData toItemData(int amount) {
         return ItemData.of(bedrockRuntimeId, (short) bedrockData, amount);
diff --git a/proxy/src/main/java/org/dragonet/proxy/util/BlockUtils.java b/proxy/src/main/java/org/dragonet/proxy/util/BlockUtils.java
@@ -0,0 +1,62 @@
+package org.dragonet.proxy.util;
+
+import com.google.common.base.Preconditions;
+import com.nukkitx.protocol.bedrock.data.ItemData;
+import lombok.extern.log4j.Log4j2;
+import org.dragonet.proxy.data.item.ToolTier;
+import org.dragonet.proxy.data.item.ToolType;
+import org.dragonet.proxy.network.translator.ItemTranslatorRegistry;
+import org.dragonet.proxy.network.translator.misc.BlockTranslator;
+import org.dragonet.proxy.network.translator.misc.item.ItemEntry;
+
+@Log4j2
+public class BlockUtils {
+
+    public static boolean isCorrectTool(ItemEntry itemEntry, BlockTranslator.BlockMappingEntry blockEntry) {
+        return blockEntry.getToolType() == null || blockEntry.getToolType().equals(itemEntry.getToolType());
+    }
+
+    /**
+     * Modified from NukkitX.
+     */
+    private static double toolBreakTimeBonus0(ToolType toolType, ToolTier toolTier, boolean isWoolBlock, boolean isCobweb) {
+        if (toolType == ToolType.SWORD) return isCobweb ? 15.0 : 1.0;
+        if (toolType == ToolType.SHEARS) return isWoolBlock ? 5.0 : 15.0;
+        if (toolType == null) return 1.0;
+
+        switch (toolTier) {
+            case WOODEN:
+                return 2.0;
+            case STONE:
+                return 4.0;
+            case IRON:
+                return 6.0;
+            case DIAMOND:
+                return 8.0;
+            case GOLDEN:
+                return 12.0;
+        }
+        return 1.0;
+    }
+
+    public static double getBreakTime(ItemData item, int blockId) {
+        BlockTranslator.BlockMappingEntry blockEntry = BlockTranslator.ID_TO_ENTRY.get(blockId);
+        ItemEntry itemEntry = ItemTranslatorRegistry.bedrockToJavaMap.get(item.getId());
+
+        boolean woolBlock = blockEntry.getBedrockIdentifier().equals("minecraft:wool");
+        boolean cobwebBlock = blockEntry.getBedrockIdentifier().equals("minecraft:cobweb");
+        boolean correctTool = isCorrectTool(itemEntry, blockEntry);
+
+        double hardness = blockEntry.getHardness();
+        double baseTime = (correctTool ? 1.5 : 5.0) * hardness;
+        double speed = 1.0 / baseTime;
+
+        if(hardness == 0) {
+            return 0;
+        }
+        if(correctTool) {
+            speed *= toolBreakTimeBonus0(itemEntry.getToolType(), itemEntry.getToolTier(), woolBlock, cobwebBlock);
+        }
+        return 1.0 / speed;
+    }
+}
diff --git a/proxy/src/main/resources/mappings/1.15/block_mappings.json b/proxy/src/main/resources/mappings/1.15/block_mappings.json
diff --git a/proxy/src/main/resources/mappings/1.15/item_mappings.json b/proxy/src/main/resources/mappings/1.15/item_mappings.json

-Original file line number
+Diff line change
@@ @@ -0,0 +1,9 @@ @@
 +package org.dragonet.proxy.data.item;
++
 +public enum ToolTier {
 +    WOODEN,
 +    STONE,
 +    GOLDEN,
 +    IRON,
 +    DIAMOND
 +}
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ public class PEMobEquipmentTranslator extends PacketTranslator<MobEquipmentPacke`
`32`	`32`	`@Override`
`33`	`33`	`public void translate(ProxySession session, MobEquipmentPacket packet) {`
`34`	`34`	`if(packet.getContainerId() == 0) {`
	`35`	`+ session.getCachedEntity().setMainHand(packet.getItem());`
`35`	`36`	`session.getCachedEntity().setSelectedHotbarSlot(packet.getHotbarSlot());`
`36`	`37`	`session.sendRemotePacket(new ClientPlayerChangeHeldItemPacket(packet.getHotbarSlot()));`
`37`	`38`	`}`