Bedrock 1.26.10

Author: wode490390

src/main/java/cn/nukkit/GameVersion.java

@@ -68,6 +68,7 @@ public enum GameVersion {
     V1_21_124(860, "1.21.124"),
     V1_21_130(898, "1.21.130"),
     V1_26_0(924, "1.26.0", "1.26"),
+    V1_26_10(944, "1.26.10"),
     ;
 
     private static GameVersion FEATURE_VERSION = GameVersion.V1_20_10;

src/main/java/cn/nukkit/block/BlockBookshelfChiseled.java

@@ -113,6 +113,10 @@ public boolean onActivate(Item item, BlockFace face, float fx, float fy, float f
             return false;
         }
 
+        if (false || item.hasLock()) {
+            return true;
+        }
+
         BlockEntityChiseledBookshelf blockEntity = getBlockEntity();
         if (blockEntity == null) {
             blockEntity = createBlockEntity(null);

src/main/java/cn/nukkit/block/BlockDandelionGolden.java

@@ -0,0 +1,36 @@
+package cn.nukkit.block;
+
+public class BlockDandelionGolden extends BlockDandelion {
+    BlockDandelionGolden() {
+    }
+
+    @Override
+    public int getId() {
+        return GOLDEN_DANDELION;
+    }
+
+    @Override
+    public String getName() {
+        return "Golden Dandelion";
+    }
+
+    @Override
+    public boolean canBeActivated() {
+        return false;
+    }
+
+    @Override
+    public boolean isFertilizable() {
+        return false;
+    }
+
+    @Override
+    public int getCompostableChance() {
+        return 0;
+    }
+
+    @Override
+    protected Block getUncommonFlower() {
+        return this;
+    }
+}

src/main/java/cn/nukkit/block/BlockDeadBush.java

@@ -109,6 +109,6 @@ public boolean isVegetation() {
     private boolean canSurvive() {
         Block below = down();
         int id = below.getId();
-        return id == SAND || id == RED_SAND || below.isTerracotta() || id == DIRT || id == COARSE_DIRT || id == PODZOL || id == MYCELIUM || id == DIRT_WITH_ROOTS || id == MUD || id == GRASS_BLOCK || id == MUDDY_MANGROVE_ROOTS || id == SUSPICIOUS_SAND;
+        return id == SAND || id == RED_SAND || below.isTerracotta() || id == DIRT || id == COARSE_DIRT || id == PODZOL || id == MYCELIUM || id == DIRT_WITH_ROOTS || id == MUD || id == GRASS_BLOCK || id == MUDDY_MANGROVE_ROOTS || id == SUSPICIOUS_SAND || id == FARMLAND;
     }
 }

src/main/java/cn/nukkit/block/BlockDecoratedPot.java

@@ -99,8 +99,10 @@ public boolean onActivate(Item item, BlockFace face, float fx, float fy, float f
         }
 
         boolean success = false;
-        Item slot = blockEntity.getItem();
-        if (slot == null) {
+        Item slot;
+        if (item.hasLock()) {
+            slot = null;
+        } else if ((slot = blockEntity.getItem()) == null) {
             if (!item.isNull()) {
                 success = true;
 

src/main/java/cn/nukkit/block/BlockFullNames.java

@@ -1402,4 +1402,5 @@ public interface BlockFullNames {
     String WAXED_EXPOSED_COPPER_LANTERN = "minecraft:" + BlockNames.WAXED_EXPOSED_COPPER_LANTERN;
     String WAXED_WEATHERED_COPPER_LANTERN = "minecraft:" + BlockNames.WAXED_WEATHERED_COPPER_LANTERN;
     String WAXED_OXIDIZED_COPPER_LANTERN = "minecraft:" + BlockNames.WAXED_OXIDIZED_COPPER_LANTERN;
+    String GOLDEN_DANDELION = "minecraft:" + BlockNames.GOLDEN_DANDELION;
 }

src/main/java/cn/nukkit/block/BlockID.java

@@ -1447,7 +1447,8 @@ public interface BlockID {
     int WAXED_EXPOSED_COPPER_LANTERN = 1343;
     int WAXED_WEATHERED_COPPER_LANTERN = 1344;
     int WAXED_OXIDIZED_COPPER_LANTERN = 1345;
+    int GOLDEN_DANDELION = 1346;
 
 
-    int UNDEFINED = 1346;
+    int UNDEFINED = 1347;
 }

src/main/java/cn/nukkit/block/BlockLectern.java

@@ -137,6 +137,10 @@ public boolean canBeActivated() {
 
     @Override
     public boolean onActivate(Item item, BlockFace face, float fx, float fy, float fz, Player player) {
+        if (false || item.hasLock()) {
+            return true;
+        }
+
         BlockEntityLectern blockEntity = getBlockEntity();
         if (blockEntity == null) {
             blockEntity = createBlockEntity(null);

src/main/java/cn/nukkit/block/BlockNames.java

@@ -1401,4 +1401,5 @@ public interface BlockNames {
     String WAXED_EXPOSED_COPPER_LANTERN = "waxed_exposed_copper_lantern";
     String WAXED_WEATHERED_COPPER_LANTERN = "waxed_weathered_copper_lantern";
     String WAXED_OXIDIZED_COPPER_LANTERN = "waxed_oxidized_copper_lantern";
+    String GOLDEN_DANDELION = "golden_dandelion";
 }

src/main/java/cn/nukkit/block/BlockNoteblock.java

@@ -350,6 +350,10 @@ public enum Instrument {
         CREEPER(SoundEnum.NOTE_CREEPER),
         ENDER_DRAGON(SoundEnum.NOTE_ENDERDRAGON),
         PIGLIN(SoundEnum.NOTE_PIGLIN),
+        TRUMPET(SoundEnum.NOTE_TRUMPET),
+        TRUMPET_EXPOSED(SoundEnum.NOTE_TRUMPET_EXPOSED),
+        TRUMPET_WEATHERED(SoundEnum.NOTE_TRUMPET_WEATHERED),
+        TRUMPET_OXIDIZED(SoundEnum.NOTE_TRUMPET_OXIDIZED),
         ;
 
         private final SoundEnum sound;