Bedrock 1.20.30

EaseCation · Sep 21, 2023 · 6f6a4e5 · 6f6a4e5
1 parent 02fe18e
commit 6f6a4e5
Show file tree

Hide file tree

Showing 133 changed files with 809 additions and 268 deletions.
diff --git a/src/main/java/cn/nukkit/GameVersion.java b/src/main/java/cn/nukkit/GameVersion.java
@@ -47,6 +47,7 @@ public enum GameVersion {
     V1_19_80(582, "1.19.80"),
     V1_20_0(589, "1.20.0", "1.20"),
     V1_20_10(594, "1.20.10"),
+    V1_20_30(618, "1.20.30"),
     ;
 
     private static GameVersion FEATURE_VERSION = ENABLE_BLOCK_STATE_PERSISTENCE ? GameVersion.V1_18_0 : GameVersion.V1_12_0;

diff --git a/src/main/java/cn/nukkit/SharedConstants.java b/src/main/java/cn/nukkit/SharedConstants.java
@@ -43,6 +43,8 @@ public final class SharedConstants {
 
     public static final int RESOURCE_PACK_CHUNK_SIZE = 128 * 1024; // 128KB
 
+    public static final boolean ENABLE_BLOCK_DESTROY_SPEED_COMPATIBILITY = true;
+
     public static final boolean ENABLE_BLOCK_STATE_PERSISTENCE = true;
 
     public static final boolean ENABLE_ITEM_NAME_PERSISTENCE = true;

diff --git a/src/main/java/cn/nukkit/block/BlockAncientDebris.java b/src/main/java/cn/nukkit/block/BlockAncientDebris.java
@@ -25,7 +25,7 @@ public double getHardness() {
 
     @Override
     public double getResistance() {
-        return 3600;
+        return 6000;
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/block/BlockBamboo.java b/src/main/java/cn/nukkit/block/BlockBamboo.java
@@ -15,6 +15,9 @@
 
 import java.util.concurrent.ThreadLocalRandom;
 
+import static cn.nukkit.GameVersion.*;
+import static cn.nukkit.SharedConstants.*;
+
 public class BlockBamboo extends BlockTransparentMeta {
 
     public static final int STALK_THICKNESS_BIT = 0b1;
@@ -50,12 +53,15 @@ public int getToolType() {
 
     @Override
     public double getHardness() {
+        if (ENABLE_BLOCK_DESTROY_SPEED_COMPATIBILITY || V1_20_30.isAvailable()) {
+            return 1;
+        }
         return 2;
     }
 
     @Override
     public double getResistance() {
-        return 10;
+        return 5;
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/block/BlockBambooSapling.java b/src/main/java/cn/nukkit/block/BlockBambooSapling.java
@@ -9,6 +9,8 @@
 import cn.nukkit.math.BlockFace;
 import cn.nukkit.utils.BlockColor;
 
+import static cn.nukkit.GameVersion.*;
+
 public class BlockBambooSapling extends BlockFlowable {
 
     public static final int AGE_BIT = 0b1;
@@ -31,6 +33,19 @@ public String getName() {
         return "Bamboo Sapling";
     }
 
+    @Override
+    public double getHardness() {
+        if (V1_20_30.isAvailable()) {
+            return 1;
+        }
+        return 0;
+    }
+
+    @Override
+    public double getResistance() {
+        return 5;
+    }
+
     @Override
     public int getBurnChance() {
         return 5;

diff --git a/src/main/java/cn/nukkit/block/BlockBeeNest.java b/src/main/java/cn/nukkit/block/BlockBeeNest.java
@@ -29,7 +29,7 @@ public double getHardness() {
 
     @Override
     public double getResistance() {
-        return 13.5;
+        return 1.5;
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/block/BlockBeehive.java b/src/main/java/cn/nukkit/block/BlockBeehive.java
@@ -58,7 +58,7 @@ public double getHardness() {
 
     @Override
     public double getResistance() {
-        return 27;
+        return 3;
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/block/BlockBell.java b/src/main/java/cn/nukkit/block/BlockBell.java
@@ -20,6 +20,8 @@
 
 import javax.annotation.Nullable;
 
+import static cn.nukkit.GameVersion.*;
+
 public class BlockBell extends BlockTransparentMeta implements Faceable {
 
     public static final int DIRECTION_MASK = 0b11;
@@ -57,12 +59,15 @@ public int getToolType() {
 
     @Override
     public double getHardness() {
+        if (V1_20_30.isAvailable()) {
+            return 5;
+        }
         return 1;
     }
 
     @Override
     public double getResistance() {
-        return 15;
+        return 25;
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/block/BlockBlackstonePolished.java b/src/main/java/cn/nukkit/block/BlockBlackstonePolished.java
@@ -4,6 +4,8 @@
 import cn.nukkit.item.ItemTool;
 import cn.nukkit.utils.BlockColor;
 
+import static cn.nukkit.GameVersion.*;
+
 public class BlockBlackstonePolished extends BlockSolid {
     public BlockBlackstonePolished() {
     }
@@ -20,6 +22,9 @@ public String getName() {
 
     @Override
     public double getHardness() {
+        if (V1_20_30.isAvailable()) {
+            return 2;
+        }
         return 1.5;
     }
 

diff --git a/src/main/java/cn/nukkit/block/BlockBricksDeepslate.java b/src/main/java/cn/nukkit/block/BlockBricksDeepslate.java
@@ -25,7 +25,7 @@ public double getHardness() {
 
     @Override
     public double getResistance() {
-        return 18;
+        return 30;
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/block/BlockBricksEndStone.java b/src/main/java/cn/nukkit/block/BlockBricksEndStone.java
@@ -4,6 +4,8 @@
 import cn.nukkit.item.ItemTool;
 import cn.nukkit.utils.BlockColor;
 
+import static cn.nukkit.GameVersion.*;
+
 public class BlockBricksEndStone extends BlockSolid {
 
     public BlockBricksEndStone() {
@@ -26,12 +28,15 @@ public int getToolType() {
 
     @Override
     public double getHardness() {
+        if (V1_20_30.isAvailable()) {
+            return 3;
+        }
         return 0.8;
     }
 
     @Override
     public double getResistance() {
-        return 4;
+        return 45;
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/block/BlockBricksMud.java b/src/main/java/cn/nukkit/block/BlockBricksMud.java
@@ -4,6 +4,9 @@
 import cn.nukkit.item.ItemTool;
 import cn.nukkit.utils.BlockColor;
 
+import static cn.nukkit.GameVersion.*;
+import static cn.nukkit.SharedConstants.*;
+
 public class BlockBricksMud extends BlockSolid {
     public BlockBricksMud() {
     }
@@ -20,12 +23,15 @@ public String getName() {
 
     @Override
     public double getHardness() {
+        if (ENABLE_BLOCK_DESTROY_SPEED_COMPATIBILITY || V1_20_30.isAvailable()) {
+            return 1.5;
+        }
         return 2;
     }
 
     @Override
     public double getResistance() {
-        return 10;
+        return 15;
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/block/BlockCampfire.java b/src/main/java/cn/nukkit/block/BlockCampfire.java
@@ -31,6 +31,7 @@
 import javax.annotation.Nullable;
 
 import static cn.nukkit.GameVersion.*;
+import static cn.nukkit.SharedConstants.*;
 
 public class BlockCampfire extends BlockTransparentMeta implements Faceable {
 
@@ -67,12 +68,15 @@ public int getToolType() {
 
     @Override
     public double getHardness() {
+        if (ENABLE_BLOCK_DESTROY_SPEED_COMPATIBILITY || V1_20_30.isAvailable()) {
+            return 2;
+        }
         return 5;
     }
 
     @Override
     public double getResistance() {
-        return 25;
+        return 10;
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/block/BlockChain.java b/src/main/java/cn/nukkit/block/BlockChain.java
@@ -43,7 +43,7 @@ public double getHardness() {
 
     @Override
     public double getResistance() {
-        return 15;
+        return 30;
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/block/BlockComposter.java b/src/main/java/cn/nukkit/block/BlockComposter.java
@@ -16,6 +16,9 @@
 
 import java.util.concurrent.ThreadLocalRandom;
 
+import static cn.nukkit.GameVersion.*;
+import static cn.nukkit.SharedConstants.*;
+
 public class BlockComposter extends BlockTransparentMeta {
 
     private static final Int2FloatMap COMPOSTABLES = new Int2FloatOpenHashMap();
@@ -40,12 +43,15 @@ public int getId() {
 
     @Override
     public double getHardness() {
+        if (ENABLE_BLOCK_DESTROY_SPEED_COMPATIBILITY || V1_20_30.isAvailable()) {
+            return 0.6;
+        }
         return 2;
     }
 
     @Override
     public double getResistance() {
-        return 10;
+        return 3;
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/block/BlockConcretePowder.java b/src/main/java/cn/nukkit/block/BlockConcretePowder.java
@@ -5,6 +5,8 @@
 import cn.nukkit.item.ItemTool;
 import cn.nukkit.level.Level;
 import cn.nukkit.math.BlockFace;
+import cn.nukkit.utils.BlockColor;
+import cn.nukkit.utils.DyeColor;
 
 /**
  * Created by CreeperFace on 2.6.2017.
@@ -42,7 +44,7 @@ public int getId() {
 
     @Override
     public String getName() {
-        return "Concrete Powder";
+        return getDyeColor().getName() + " Concrete Powder";
     }
 
     @Override
@@ -99,4 +101,13 @@ public boolean place(Item item, Block b, Block target, BlockFace face, double fx
 
         return true;
     }
+
+    @Override
+    public BlockColor getColor() {
+        return getDyeColor().getColor();
+    }
+
+    public DyeColor getDyeColor() {
+        return DyeColor.getByWoolData(getDamage());
+    }
 }
diff --git a/src/main/java/cn/nukkit/block/BlockCopper.java b/src/main/java/cn/nukkit/block/BlockCopper.java
@@ -32,7 +32,7 @@ public double getHardness() {
 
     @Override
     public double getResistance() {
-        return 18;
+        return 30;
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/block/BlockCoralBlock.java b/src/main/java/cn/nukkit/block/BlockCoralBlock.java
@@ -5,11 +5,13 @@
 import cn.nukkit.item.ItemTool;
 import cn.nukkit.level.Level;
 import cn.nukkit.math.BlockFace;
-import cn.nukkit.math.Vector3;
 import cn.nukkit.utils.BlockColor;
 
 import java.util.concurrent.ThreadLocalRandom;
 
+import static cn.nukkit.GameVersion.*;
+import static cn.nukkit.SharedConstants.*;
+
 public class BlockCoralBlock extends BlockSolidMeta {
 
     public static final int COLOR_MASK = 0b111;
@@ -52,12 +54,15 @@ public String getName() {
 
     @Override
     public double getHardness() {
+        if (ENABLE_BLOCK_DESTROY_SPEED_COMPATIBILITY || V1_20_30.isAvailable()) {
+            return 1.5;
+        }
         return 7;
     }
 
     @Override
     public double getResistance() {
-        return 4.5;
+        return 30;
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/block/BlockCoralFan.java b/src/main/java/cn/nukkit/block/BlockCoralFan.java
@@ -3,7 +3,6 @@
 import cn.nukkit.Player;
 import cn.nukkit.item.Item;
 import cn.nukkit.level.Level;
-import cn.nukkit.math.AxisAlignedBB;
 import cn.nukkit.math.BlockFace;
 import cn.nukkit.math.Mth;
 import cn.nukkit.math.Vector3;
@@ -55,11 +54,6 @@ public String getName() {
         return NAMES[getCoralColor()];
     }
 
-    @Override
-    public double getResistance() {
-        return 4.5;
-    }
-
     @Override
     public boolean canSilkTouch() {
         return true;

diff --git a/src/main/java/cn/nukkit/block/BlockCoralFanHang.java b/src/main/java/cn/nukkit/block/BlockCoralFanHang.java
@@ -2,7 +2,6 @@
 
 import cn.nukkit.item.Item;
 import cn.nukkit.level.Level;
-import cn.nukkit.math.AxisAlignedBB;
 import cn.nukkit.math.BlockFace;
 import cn.nukkit.utils.BlockColor;
 import cn.nukkit.utils.Faceable;
@@ -37,11 +36,6 @@ public String getName() {
         return getCoralType() == BLUE ? "Hang Tube Coral Fan" : "Hang Brain Coral Fan";
     }
 
-    @Override
-    public double getResistance() {
-        return 4.5;
-    }
-
     @Override
     public boolean canSilkTouch() {
         return true;

diff --git a/src/main/java/cn/nukkit/block/BlockCraftingTable.java b/src/main/java/cn/nukkit/block/BlockCraftingTable.java
@@ -39,7 +39,7 @@ public double getHardness() {
 
     @Override
     public double getResistance() {
-        return 15;
+        return 12.5;
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/block/BlockDeadBush.java b/src/main/java/cn/nukkit/block/BlockDeadBush.java
@@ -88,6 +88,6 @@ public boolean isVegetation() {
 
     private boolean canSurvive() {
         int id = down().getId();
-        return id == SAND || id == HARDENED_CLAY || id == STAINED_HARDENED_CLAY || id == DIRT || id == PODZOL || id == MYCELIUM || id == DIRT_WITH_ROOTS;
+        return id == SAND || id == HARDENED_CLAY || id == STAINED_HARDENED_CLAY || id == DIRT || id == PODZOL || id == MYCELIUM || id == DIRT_WITH_ROOTS || id == MUD || id == GRASS;
     }
 }