1.21.110 & updates (#2239)

- Added support for Minecraft 1.21.110/111
- Fixed block break time calculation when flying is allowed on survival
- Fixed spectator mode slow fly speed
- Fixed some missing block updates
- Fixed some recipes not showing up in recipe book
- Fixed a typo in projectile_protection in enchant command completion
- Added save command auto completion parameters
- Added custom form element tooltips
- Updated some block friction
- More inventory transaction validation fixes
- Updated snappy-java to latest

Author: PetteriM1

gradle/libs.versions.toml

@@ -15,7 +15,7 @@ gson = { group = "com.google.code.gson", name = "gson", version = "2.10.1" }
 snakeyaml = { group = "org.yaml", name = "snakeyaml", version = "1.33" }
 leveldb = { group = "org.iq80.leveldb", name = "leveldb", version = "0.11.1-SNAPSHOT" }
 leveldbjni = { group = "net.daporkchop", name = "leveldb-mcpe-jni", version = "0.0.10-SNAPSHOT" }
-snappy = { group = "org.xerial.snappy", name = "snappy-java", version = "1.1.10.7" }
+snappy = { group = "org.xerial.snappy", name = "snappy-java", version = "1.1.10.8" }
 jwt = { group = "com.nimbusds", name = "nimbus-jose-jwt", version = "10.3.1" }
 jopt-simple = { group = "net.sf.jopt-simple", name = "jopt-simple", version = "5.0.4" }
 blockstateupdater = { group = "org.cloudburstmc", name = "block-state-updater", version = "1.21.40-SNAPSHOT" }

src/main/java/cn/nukkit/Player.java

@@ -195,7 +195,7 @@ public class Player extends EntityHuman implements CommandSender, InventoryHolde
     protected Position spawnPosition;
 
     protected int inAirTicks;
-    protected int startAirTicks = 10;
+    protected int startAirTicks = 5;
 
     protected AdventureSettings adventureSettings;
     protected Color locatorBarColor;
@@ -501,7 +501,7 @@ public void setAdventureSettings(AdventureSettings adventureSettings) {
      */
     public void resetInAirTicks() {
         if (this.inAirTicks != 0) {
-            this.startAirTicks = 10;
+            this.startAirTicks = 5;
         }
         this.inAirTicks = 0;
     }
@@ -1649,10 +1649,14 @@ public boolean setGamemode(int gamemode, boolean clientSide, AdventureSettings n
             this.dataPacket(pk);
         }
 
+        if (this.isSpectator()) {
+            // Tp not on ground to not fly slowly
+            this.teleport(this.add(0, 0.0001, 0), null);
+        }
+
         this.setAdventureSettings(ev.getNewAdventureSettings());
 
         if (this.isSpectator()) {
-            this.teleport(this, null);
             this.setDataFlag(DATA_FLAGS, DATA_FLAG_SILENT, true, false);
             this.setDataFlag(DATA_FLAGS, DATA_FLAG_HAS_COLLISION, false); // Sends both
         } else {
@@ -2359,7 +2363,7 @@ public boolean onUpdate(int currentTick) {
                                 PlayerInvalidMoveEvent ev = new PlayerInvalidMoveEvent(this, true);
                                 this.getServer().getPluginManager().callEvent(ev);
                                 if (!ev.isCancelled()) {
-                                    this.startAirTicks = this.inAirTicks - 10;
+                                    this.startAirTicks = this.inAirTicks - 5;
                                     this.setMotion(new Vector3(0, expectedVelocity, 0));
                                 }
                             } else if (this.kick(PlayerKickEvent.Reason.FLYING_DISABLED, MSG_FLYING_NOT_ENABLED, true)) {
@@ -4160,8 +4164,8 @@ public void onCompletion(Server server) {
                             if (this.loomTransaction.execute()) {
                                 level.addLevelSoundEvent(this, LevelSoundEventPacket.SOUND_BLOCK_LOOM_USE);
                             }
-                            this.loomTransaction = null;
                         }
+                        this.loomTransaction = null; // Must be here or stuff will break
                         return;
                     }
 
@@ -5349,7 +5353,7 @@ public void close(TextContainer message, String reason, boolean notify) {
             if (notify && !reason.isEmpty()) {
                 DisconnectPacket pk = new DisconnectPacket();
                 // New disconnection screen doesn't support colors :(
-                pk.message = reason = TextFormat.clean(reason);
+                pk.message = TextFormat.clean(reason);
                 this.forceDataPacket(pk, null);
             }
 

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

@@ -1,5 +1,6 @@
 package cn.nukkit.block;
 
+import cn.nukkit.AdventureSettings;
 import cn.nukkit.Player;
 import cn.nukkit.Server;
 import cn.nukkit.entity.Entity;
@@ -566,7 +567,7 @@ public double getBreakTime(Item item, Player player) {
         boolean insideOfWaterWithoutAquaAffinity = player.isInsideOfWater() &&
                 Optional.ofNullable(player.getInventory().getHelmet().getEnchantment(Enchantment.ID_WATER_WORKER))
                         .map(Enchantment::getLevel).map(l -> l >= 1).orElse(false);
-        boolean outOfWaterButNotOnGround = (!player.isInsideOfWater()) && (!player.isOnGround());
+        boolean outOfWaterButNotOnGround = !player.isOnGround() && !player.getAdventureSettings().get(AdventureSettings.Type.FLYING) && !player.isInsideOfWater();
         return breakTime0(blockHardness, correctTool, canHarvestWithHand, blockId, itemToolType, itemTier,
                 efficiencyLoreLevel, hasteEffectLevel, insideOfWaterWithoutAquaAffinity, outOfWaterButNotOnGround);
     }

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

@@ -56,7 +56,7 @@ public boolean onActivate(Item item, Player player) {
 
         this.level.getServer().getPluginManager().callEvent(new BlockRedstoneEvent(this, 0, 15));
         this.setDamage(this.getDamage() ^ 0x08);
-        this.level.setBlock(this, this, true, false);
+        this.level.setBlock(this, this, true, true);
         this.level.addLevelSoundEvent(this, LevelSoundEventPacket.SOUND_POWER_ON);
         this.level.scheduleUpdate(this, 30);
 
@@ -77,7 +77,7 @@ public int onUpdate(int type) {
                 this.level.getServer().getPluginManager().callEvent(new BlockRedstoneEvent(this, 15, 0));
 
                 this.setDamage(this.getDamage() ^ 0x08);
-                this.level.setBlock(this, this, true, false);
+                this.level.setBlock(this, this, true, true);
                 this.level.addLevelSoundEvent(this, LevelSoundEventPacket.SOUND_POWER_OFF);
 
                 level.updateAroundRedstone(this, null);

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

@@ -17,7 +17,7 @@ public BlockChain(int meta) {
 
     @Override
     public String getName() {
-        return "Chain";
+        return "Iron Chain";
     }
 
     @Override

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

@@ -180,7 +180,7 @@ public boolean toggle(Player player) {
         }
 
         this.setDamage(direction | ((~this.getDamage()) & 0x04));
-        this.level.setBlock(this, this, true, false);
+        this.level.setBlock(this, this, true, true);
         if (this.isOpen()) {
             this.level.addSound(this, Sound.RANDOM_DOOR_OPEN);
         } else {

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

@@ -53,4 +53,9 @@ public void onEntityCollide(Entity entity) {
             }
         }
     }
+
+    @Override
+    public double getFrictionFactor() {
+        return 0.8;
+    }
 }

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

@@ -75,7 +75,7 @@ public void onEntityCollide(Entity entity) {
 
     @Override
     public boolean place(Item item, Block block, Block target, BlockFace face, double fx, double fy, double fz, Player player) {
-        boolean ret = this.getLevel().setBlock(this, this, true, false);
+        boolean ret = this.getLevel().setBlock(this, this, true, true);
         this.getLevel().scheduleUpdate(this, this.tickRate());
 
         return ret;

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

@@ -72,4 +72,9 @@ public Item toItem() {
     public boolean canBePushed() {
         return false;
     }
+
+    @Override
+    public double getFrictionFactor() {
+        return 0.9;
+    }
 }

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

@@ -71,7 +71,7 @@ public boolean onActivate(Item item, Player player) {
     }
 
     public boolean grow() {
-        this.level.setBlock(this, Block.get(BlockID.AIR), true, false);
+        this.level.setBlock(this, Block.get(BlockID.AIR), true, true);
 
         BigMushroom generator = new BigMushroom(getType());