清理一波

EaseCation · Jul 29, 2023 · c95ff0e · c95ff0e
1 parent 555121c
commit c95ff0e
Show file tree

Hide file tree

Showing 114 changed files with 231 additions and 575 deletions.
diff --git a/src/main/java/cn/nukkit/Player.java b/src/main/java/cn/nukkit/Player.java
@@ -501,11 +501,6 @@ public void spawnTo(Player player) {
         }
     }
 
-    @Override
-    public Server getServer() {
-        return this.server;
-    }
-
     public boolean getRemoveFormat() {
         return removeFormat;
     }
@@ -1080,7 +1075,7 @@ protected void doFirstSpawn() {
 
         this.spawned = true;
 
-        if (playerJoinEvent.getJoinMessage().toString().trim().length() > 0) {
+        if (!playerJoinEvent.getJoinMessage().toString().trim().isEmpty()) {
             this.server.broadcastMessage(playerJoinEvent.getJoinMessage());
         }
 
@@ -1983,7 +1978,7 @@ public boolean onUpdate(int currentTick) {
                         double expectedVelocity = (-this.getGravity()) / ((double) this.getDrag()) - ((-this.getGravity()) / ((double) this.getDrag())) * Math.exp(-((double) this.getDrag()) * ((double) (this.inAirTicks - this.startAirTicks)));
                         double diff = (this.speed.y - expectedVelocity) * (this.speed.y - expectedVelocity);
 
-                        int block = level.getBlockIdAt(0, this.getFloorX(), this.getFloorY(), this.getFloorZ());
+                        int block = level.getBlock(this).getId();
                         boolean ignore = block == Block.LADDER || block == Block.VINE || block == Block.WEB || block == BlockID.BUBBLE_COLUMN || block == BlockID.SCAFFOLDING || block == BlockID.SWEET_BERRY_BUSH || block == BlockID.WEEPING_VINES || block == BlockID.TWISTING_VINES || block == BlockID.CAVE_VINES || block == BlockID.CAVE_VINES_BODY_WITH_BERRIES || block == BlockID.CAVE_VINES_HEAD_WITH_BERRIES || block == BlockID.POWDER_SNOW || block == BlockID.BIG_DRIPLEAF
                                 || block == BlockID.HONEY_BLOCK; //TODO: slide down
 
@@ -2102,7 +2097,7 @@ public boolean onUpdate(int currentTick) {
             this.checkInteractNearby(); // 在客户端计算, 结果通过 action 为 mouseover 的 InteractPacket 发给服务端 (runtimeEntityId 为 0 表示移开)
         }*/
 
-        if (this.spawned && this.dummyBossBars.size() > 0 && currentTick % 100 == 0) {
+        if (this.spawned && !this.dummyBossBars.isEmpty() && currentTick % 100 == 0) {
             this.dummyBossBars.values().forEach(DummyBossBar::updateBossEntityPosition);
         }
 
@@ -2573,7 +2568,7 @@ public void onCompletion(Server server) {
                         }
                     };
 
-                    this.server.getScheduler().scheduleAsyncTask(this.preLoginEventTask);
+                    this.server.getScheduler().scheduleAsyncTask(null, this.preLoginEventTask);
 
                     this.processLogin();
                     break;
@@ -4089,7 +4084,7 @@ public void sendTitle(String title, String subtitle) {
     }
 
     public void sendTitle(String title, String subtitle, int fadein, int duration, int fadeout) {
-        if (!subtitle.equals("")) {
+        if (!subtitle.isEmpty()) {
             SetTitlePacket pk = new SetTitlePacket();
             pk.type = SetTitlePacket.TYPE_SUBTITLE;
             pk.text = subtitle;
@@ -4151,15 +4146,15 @@ public void close(TextContainer message, String reason) {
 
     public void close(TextContainer message, String reason, boolean notify) {
         if (this.connected && !this.closed) {
-            if (notify && reason.length() > 0) {
+            if (notify && !reason.isEmpty()) {
                 DisconnectPacket pk = new DisconnectPacket();
                 pk.message = reason;
                 this.dataPacket(pk);
             }
 
             this.connected = false;
             PlayerQuitEvent ev = null;
-            if (this.getName() != null && this.getName().length() > 0) {
+            if (this.getName() != null && !this.getName().isEmpty()) {
                 this.server.getPluginManager().callEvent(ev = new PlayerQuitEvent(this, message, true, reason));
                 if (this.loggedIn && ev.getAutoSave()) {
                     this.save();
@@ -5423,18 +5418,13 @@ public void setCraftingGrid(CraftingGrid grid) {
     public void resetCraftingGridType() {
         if (this.craftingGrid != null) {
             Item[] drops = this.inventory.addItem(this.craftingGrid.getContents().values().toArray(new Item[0]));
-
-            if (drops.length > 0) {
-                for (Item drop : drops) {
-                    this.dropItem(drop);
-                }
+            for (Item drop : drops) {
+                this.dropItem(drop);
             }
 
             drops = this.inventory.addItem(this.getCursorInventory().getItem(0));
-            if (drops.length > 0) {
-                for (Item drop : drops) {
-                    this.dropItem(drop);
-                }
+            for (Item drop : drops) {
+                this.dropItem(drop);
             }
 
             this.playerUIInventory.clearAll();
@@ -5452,10 +5442,6 @@ public void resetCraftingGridType() {
         }
     }
 
-    public PlayerOffhandInventory getOffhandInventory() {
-        return offhandInventory;
-    }
-
     public void removeAllWindows() {
         removeAllWindows(false);
     }
@@ -5731,7 +5717,7 @@ public boolean pickupEntity(Entity entity, boolean near) {
             EntityXPOrb xpOrb = (EntityXPOrb) entity;
             if (xpOrb.getPickupDelay() <= 0) {
                 int exp = xpOrb.getExp();
-                entity.kill();
+                entity.close();
                 this.getLevel().addLevelEvent(this, LevelEventPacket.EVENT_SOUND_EXPERIENCE_ORB);
                 pickedXPOrb = tick;
 

diff --git a/src/main/java/cn/nukkit/Server.java b/src/main/java/cn/nukkit/Server.java
@@ -384,7 +384,7 @@ public class Server {
 
         if (this.getPropertyBoolean("enable-rcon", false)) {
             try {
-                this.rcon = new RCON(this, this.getPropertyString("rcon.password", ""), (!this.getIp().equals("")) ? this.getIp() : "0.0.0.0", this.getPropertyInt("rcon.port", this.getPort()));
+                this.rcon = new RCON(this, this.getPropertyString("rcon.password", ""), !this.getIp().isEmpty() ? this.getIp() : "0.0.0.0", this.getPropertyInt("rcon.port", this.getPort()));
             } catch (IllegalArgumentException e) {
                 log.error(getLanguage().translate(e.getMessage(), e.getCause().getMessage()));
             }
@@ -692,7 +692,7 @@ public void batchPackets(Player[] players, DataPacket[] packets, boolean forceSy
         }
 
         if (!forceSync && this.networkCompressionAsync) {
-            this.getScheduler().scheduleAsyncTask(new CompressBatchedTask(data, targets, this.networkCompressionLevel, tracks));
+            this.getScheduler().scheduleAsyncTask(null, new CompressBatchedTask(data, targets, this.networkCompressionLevel, tracks));
         } else {
             try {
                 this.broadcastPacketsCallback(Zlib.deflate(data, this.networkCompressionLevel), targets, tracks);
@@ -1618,7 +1618,7 @@ public void saveOfflinePlayerData(String name, CompoundTag tag, boolean async) {
         if (this.shouldSavePlayerData()) {
             try {
                 if (async) {
-                    this.getScheduler().scheduleAsyncTask(new FileWriteTask(this.getDataPath() + "players/" + name.toLowerCase() + ".dat", NBTIO.writeGZIPCompressed(tag, ByteOrder.BIG_ENDIAN)));
+                    this.getScheduler().scheduleAsyncTask(null, new FileWriteTask(this.getDataPath() + "players/" + name.toLowerCase() + ".dat", NBTIO.writeGZIPCompressed(tag, ByteOrder.BIG_ENDIAN)));
                 } else {
                     Utils.writeFile(this.getDataPath() + "players/" + name.toLowerCase() + ".dat", new ByteArrayInputStream(NBTIO.writeGZIPCompressed(tag, ByteOrder.BIG_ENDIAN)));
                 }

diff --git a/src/main/java/cn/nukkit/block/BlockBambooSapling.java b/src/main/java/cn/nukkit/block/BlockBambooSapling.java
@@ -31,16 +31,6 @@ public String getName() {
         return "Bamboo Sapling";
     }
 
-    @Override
-    public double getHardness() {
-        return 0;
-    }
-
-    @Override
-    public double getResistance() {
-        return 0;
-    }
-
     @Override
     public int getBurnChance() {
         return 5;

diff --git a/src/main/java/cn/nukkit/block/BlockBanner.java b/src/main/java/cn/nukkit/block/BlockBanner.java
@@ -135,7 +135,7 @@ public Item toItem(boolean addUserData) {
                         .putInt("Type", type));
             }
             ListTag<CompoundTag> patterns = banner.namedTag.getList("Patterns", CompoundTag.class);
-            if (patterns.size() > 0) {
+            if (!patterns.isEmpty()) {
                 item.setNamedTag((item.hasCompoundTag() ? item.getNamedTag() : new CompoundTag())
                         .putList(patterns));
             }

diff --git a/src/main/java/cn/nukkit/block/BlockBarrier.java b/src/main/java/cn/nukkit/block/BlockBarrier.java
@@ -33,11 +33,6 @@ public boolean isBreakable(Item item) {
         return false;
     }
 
-    @Override
-    public boolean isTransparent() {
-        return true;
-    }
-
     @Override
     public BlockColor getColor() {
         return BlockColor.AIR_BLOCK_COLOR;

diff --git a/src/main/java/cn/nukkit/block/BlockCarpet.java b/src/main/java/cn/nukkit/block/BlockCarpet.java
@@ -102,11 +102,6 @@ public boolean canContainWater() {
         return true;
     }
 
-    @Override
-    public boolean canProvideSupport(BlockFace face, SupportType type) {
-        return false;
-    }
-
     @Override
     public boolean breaksWhenMoved() {
         return false;

diff --git a/src/main/java/cn/nukkit/block/BlockChorusFlower.java b/src/main/java/cn/nukkit/block/BlockChorusFlower.java
@@ -2,7 +2,6 @@
 
 import cn.nukkit.Player;
 import cn.nukkit.item.Item;
-import cn.nukkit.item.ItemTool;
 import cn.nukkit.math.BlockFace;
 
 public class BlockChorusFlower extends BlockFlowable {
@@ -35,26 +34,6 @@ public double getResistance() {
         return 2;
     }
 
-    @Override
-    public int getToolType() {
-        return ItemTool.TYPE_NONE;
-    }
-
-    @Override
-    public boolean breaksWhenMoved() {
-        return true;
-    }
-
-    @Override
-    public boolean sticksToPiston() {
-        return false;
-    }
-
-    @Override
-    public boolean canProvideSupport(BlockFace face, SupportType type) {
-        return false;
-    }
-
     @Override
     public boolean isVegetation() {
         return true;

diff --git a/src/main/java/cn/nukkit/block/BlockChorusPlant.java b/src/main/java/cn/nukkit/block/BlockChorusPlant.java
@@ -34,11 +34,6 @@ public double getResistance() {
         return 2;
     }
 
-    @Override
-    public int getToolType() {
-        return ItemTool.TYPE_NONE;
-    }
-
     @Override
     public Item[] getDrops(Item item) {
         return ThreadLocalRandom.current().nextBoolean() ? new Item[]{Item.get(ItemID.CHORUS_FRUIT, 0, 1)} : new Item[0];

diff --git a/src/main/java/cn/nukkit/block/BlockCobweb.java b/src/main/java/cn/nukkit/block/BlockCobweb.java
@@ -84,11 +84,6 @@ public boolean canContainWater() {
         return true;
     }
 
-    @Override
-    public boolean canProvideSupport(BlockFace face, SupportType type) {
-        return false;
-    }
-
     @Override
     public int getFullId() {
         return getId() << BLOCK_META_BITS;

diff --git a/src/main/java/cn/nukkit/block/BlockCocoa.java b/src/main/java/cn/nukkit/block/BlockCocoa.java
@@ -237,21 +237,6 @@ public BlockFace getBlockFace() {
         return BlockFace.fromHorizontalIndex(this.getDamage() & 0x07);
     }
 
-    @Override
-    public boolean breaksWhenMoved() {
-        return true;
-    }
-
-    @Override
-    public boolean sticksToPiston() {
-        return false;
-    }
-
-    @Override
-    public boolean canProvideSupport(BlockFace face, SupportType type) {
-        return false;
-    }
-
     @Override
     public boolean isVegetation() {
         return true;

diff --git a/src/main/java/cn/nukkit/block/BlockCoral.java b/src/main/java/cn/nukkit/block/BlockCoral.java
@@ -47,17 +47,7 @@ public int getId() {
 
     @Override
     public String getName() {
-        return isDead() ? "Dead " : "" + NAMES[getCoralColor()];
-    }
-
-    @Override
-    public double getHardness() {
-        return 0;
-    }
-
-    @Override
-    public double getResistance() {
-        return 0;
+        return (isDead() ? "Dead " : "") + NAMES[getCoralColor()];
     }
 
     @Override
@@ -86,31 +76,6 @@ public BlockColor getColor() {
         }
     }
 
-    @Override
-    public boolean isSolid() {
-        return false;
-    }
-
-    @Override
-    public boolean breaksWhenMoved() {
-        return true;
-    }
-
-    @Override
-    public boolean sticksToPiston() {
-        return false;
-    }
-
-    @Override
-    protected AxisAlignedBB recalculateBoundingBox() {
-        return null;
-    }
-
-    @Override
-    public boolean canProvideSupport(BlockFace face, SupportType type) {
-        return false;
-    }
-
     @Override
     public boolean canContainWater() {
         return true;

diff --git a/src/main/java/cn/nukkit/block/BlockCoralBlock.java b/src/main/java/cn/nukkit/block/BlockCoralBlock.java
@@ -47,7 +47,7 @@ public int getId() {
 
     @Override
     public String getName() {
-        return isDead() ? "Dead " : "" + NAMES[getCoralColor()];
+        return (isDead() ? "Dead " : "") + NAMES[getCoralColor()];
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/block/BlockCoralFan.java b/src/main/java/cn/nukkit/block/BlockCoralFan.java
@@ -55,11 +55,6 @@ public String getName() {
         return NAMES[getCoralColor()];
     }
 
-    @Override
-    public double getHardness() {
-        return 0;
-    }
-
     @Override
     public double getResistance() {
         return 4.5;
@@ -87,31 +82,6 @@ public BlockColor getColor() {
         }
     }
 
-    @Override
-    public boolean isSolid() {
-        return false;
-    }
-
-    @Override
-    public boolean breaksWhenMoved() {
-        return true;
-    }
-
-    @Override
-    public boolean sticksToPiston() {
-        return false;
-    }
-
-    @Override
-    protected AxisAlignedBB recalculateBoundingBox() {
-        return null;
-    }
-
-    @Override
-    public boolean canProvideSupport(BlockFace face, SupportType type) {
-        return false;
-    }
-
     @Override
     public boolean canContainWater() {
         return true;