一批修改与完善

EaseCation · Jul 28, 2023 · 555121c · 555121c
1 parent 530399d
commit 555121c
Show file tree

Hide file tree

Showing 79 changed files with 1,657 additions and 507 deletions.
diff --git a/src/main/java/cn/nukkit/block/Block.java b/src/main/java/cn/nukkit/block/Block.java
@@ -506,6 +506,14 @@ public int getFullId() {
         return this.getId() << BLOCK_META_BITS;
     }
 
+    public static int getIdFromFullId(int fullId) {
+        return fullId >> BLOCK_META_BITS;
+    }
+
+    public static int getDamageFromFullId(int fullId) {
+        return fullId & BLOCK_META_MASK;
+    }
+
     public void addVelocityToEntity(Entity entity, Vector3 vector) {
 
     }
@@ -567,6 +575,8 @@ private static double toolBreakTimeBonus0(int toolType, int toolTier, int blockI
                 return 6.0;
             case ItemTool.TIER_DIAMOND:
                 return 8.0;
+            case ItemTool.TIER_NETHERITE:
+                return 9;
             case ItemTool.TIER_GOLD:
                 return 12.0;
             default:
@@ -675,6 +685,9 @@ public double getBreakTime(Item item) {
                     case ItemTool.TIER_DIAMOND:
                         base /= 8;
                         break;
+                    case ItemTool.TIER_NETHERITE:
+                        base /= 9;
+                        break;
                     case ItemTool.TIER_GOLD:
                         base /= 12;
                         break;