From 22d2bfc11857e1f7faa424766cd4c5b4919849de Mon Sep 17 00:00:00 2001
From: Dmitry Luk <dimonpo96@mail.ru>
Date: Sun, 23 Jun 2024 01:43:26 +0500
Subject: [PATCH] docs: translate all JavaDocs in API module * refactor:
 Enchantment compatibilities & add rarity * fix: Enchantments rarity *
 refactor: Do not use short on enchantments * refactor: API module

---
 .../main/java/org/allaymc/api/AllayAPI.java   |  26 +-
 .../allaymc/api/annotation/SlowOperation.java |   3 +-
 .../component/common/BlockAttributes.java     |   4 +-
 .../component/common/BlockBaseComponent.java  |  13 +-
 .../component/common/PlayerInteractInfo.java  |   6 +-
 .../component/event/BlockOnInteractEvent.java |   4 -
 .../event/BlockOnNeighborUpdateEvent.java     |   2 -
 .../allaymc/api/block/material/Material.java  |   6 +-
 .../api/block/material/MaterialType.java      |   1 -
 .../block/palette/BlockStateHashPalette.java  |   5 +-
 .../api/block/property/PropertyUtil.java      |   2 +
 .../api/block/property/enums/Attachment.java  |  14 +-
 .../block/property/enums/BambooLeafSize.java  |  12 +-
 .../property/enums/BambooStalkThickness.java  |  10 +-
 .../block/property/enums/BigDripleafTilt.java |  14 +-
 .../block/property/enums/CauldronLiquid.java  |  12 +-
 .../property/enums/ChemistryTableType.java    |  14 +-
 .../api/block/property/enums/ChiselType.java  |  14 +-
 .../api/block/property/enums/CoralColor.java  |  19 --
 .../block/property/enums/CrackedState.java    |  12 +-
 .../api/block/property/enums/Damage.java      |  14 +-
 .../api/block/property/enums/DirtType.java    |  10 +-
 .../block/property/enums/DoublePlantType.java |  21 --
 .../property/enums/DripstoneThickness.java    |  16 +-
 .../api/block/property/enums/FlowerType.java  |  31 --
 .../block/property/enums/LeverDirection.java  |  22 +-
 .../property/enums/MinecraftBlockFace.java    |  18 +-
 .../enums/MinecraftCardinalDirection.java     |  14 +-
 .../enums/MinecraftFacingDirection.java       |  18 +-
 .../property/enums/MinecraftVerticalHalf.java |  10 +-
 .../property/enums/MonsterEggStoneType.java   |  18 +-
 .../api/block/property/enums/Orientation.java |  30 +-
 .../api/block/property/enums/PillarAxis.java  |  12 +-
 .../api/block/property/enums/PortalAxis.java  |  12 +-
 .../property/enums/PrismarineBlockType.java   |  12 +-
 .../block/property/enums/SandStoneType.java   |  14 +-
 .../api/block/property/enums/SandType.java    |  10 +-
 .../api/block/property/enums/SaplingType.java |  21 --
 .../block/property/enums/SeaGrassType.java    |  12 +-
 .../api/block/property/enums/SpongeType.java  |  10 +-
 .../block/property/enums/StoneBrickType.java  |  16 +-
 .../block/property/enums/StoneSlabType.java   |  22 +-
 .../block/property/enums/StoneSlabType2.java  |  22 +-
 .../block/property/enums/StoneSlabType3.java  |  22 +-
 .../block/property/enums/StoneSlabType4.java  |  16 +-
 .../property/enums/StructureBlockType.java    |  18 +-
 .../property/enums/StructureVoidType.java     |  10 +-
 .../block/property/enums/TallGrassType.java   |  17 -
 .../property/enums/TorchFacingDirection.java  |  18 +-
 .../block/property/enums/TurtleEggCount.java  |  14 +-
 .../api/block/property/enums/VaultState.java  |  14 +-
 .../block/property/enums/WallBlockType.java   |  34 +-
 .../enums/WallConnectionTypeEast.java         |  12 +-
 .../enums/WallConnectionTypeNorth.java        |  12 +-
 .../enums/WallConnectionTypeSouth.java        |  12 +-
 .../enums/WallConnectionTypeWest.java         |  12 +-
 .../property/type/BaseBlockPropertyType.java  |  26 +-
 .../property/type/BlockPropertyType.java      |   7 +-
 .../property/type/BooleanPropertyType.java    |  11 +-
 .../block/property/type/EnumPropertyType.java |  10 +-
 .../block/property/type/IntPropertyType.java  |  15 +-
 .../api/blockentity/BlockEntityHelper.java    |   4 +-
 .../init/SimpleBlockEntityInitInfo.java       |   8 +-
 .../interfaces/BlockEntityBarrel.java         |   1 -
 .../allaymc/api/client/data/Abilities.java    |  20 +-
 .../api/client/data/AdventureSettings.java    |   2 +-
 .../org/allaymc/api/client/data/Device.java   |   7 +-
 .../allaymc/api/client/data/DeviceInfo.java   |  28 +-
 .../allaymc/api/client/data/LoginData.java    |   3 +-
 .../allaymc/api/client/data/UIProfile.java    |   2 -
 .../org/allaymc/api/client/skin/Image.java    |   1 -
 .../allaymc/api/client/skin/PersonaPiece.java |   9 +-
 .../api/client/skin/PersonaPieceTint.java     |   1 -
 .../org/allaymc/api/client/skin/Skin.java     |  12 +-
 .../api/client/skin/SkinAnimation.java        |   1 -
 .../allaymc/api/command/CommandRegistry.java  |   6 +-
 .../allaymc/api/command/CommandSender.java    |  31 +-
 .../allaymc/api/command/NPCCommandSender.java |   1 +
 .../org/allaymc/api/command/SenderType.java   |   1 -
 .../exception/CommandParseException.java      |   3 -
 .../command/selector/EntitySelectorAPI.java   |  22 +-
 .../selector/SelectorSyntaxException.java     |   6 +-
 .../api/command/selector/SelectorType.java    |  15 +-
 .../args/CachedFilterSelectorArgument.java    |  14 +-
 .../args/CachedSimpleSelectorArgument.java    |  17 +-
 .../selector/args/SelectorArgument.java       |  79 +++--
 .../allaymc/api/command/tree/BaseNode.java    |  14 +-
 .../allaymc/api/command/tree/CommandNode.java |   8 +-
 .../api/component/annotation/Dependency.java  |  12 +-
 .../api/component/interfaces/Component.java   |  11 +-
 .../interfaces/ComponentInitInfo.java         |   3 +-
 .../interfaces/ComponentInjector.java         |  11 +-
 .../interfaces/ComponentProvider.java         |   5 +-
 .../interfaces/ComponentedObject.java         |   5 +-
 .../impl/PlayerInventoryContainer.java        |   1 -
 .../api/data/VanillaBlockPropertyTypes.java   | 314 ++++++++----------
 .../allaymc/api/datastruct/SemVersion.java    |   1 -
 .../aabbtree/AABBOverlapFilter.java           |   1 -
 .../api/datastruct/aabbtree/AABBTree.java     |  30 +-
 .../api/datastruct/aabbtree/AABBTreeNode.java |  58 +---
 .../datastruct/aabbtree/AABBTreeObject.java   |  11 +-
 .../api/datastruct/aabbtree/AABBUtils.java    |  13 +-
 .../aabbtree/AreaAABBHeuristicFunction.java   |  10 +-
 .../datastruct/aabbtree/CollisionPair.java    |   2 +-
 .../api/datastruct/aabbtree/HasAABB.java      |   1 -
 .../org/allaymc/api/entity/EntityHelper.java  |   4 +-
 .../api/entity/attribute/AttributeType.java   |  22 +-
 .../component/common/EntityBaseComponent.java |  44 +--
 .../component/event/EntityDieEvent.java       |   4 -
 .../component/event/PlayerLoggedInEvent.java  |   1 -
 .../player/EntityPlayerBaseComponent.java     |  10 +-
 .../api/entity/damage/DamageContainer.java    |   6 +-
 .../entity/effect/SimpleEffectInstance.java   |   2 +-
 .../effect/type/EffectAbsorptionType.java     |   1 -
 .../allaymc/api/entity/metadata/Metadata.java |   4 +-
 .../allaymc/api/eventbus/EventException.java  |   3 -
 .../org/allaymc/api/eventbus/event/Event.java |   6 +-
 .../org/allaymc/api/form/FormException.java   |   3 -
 .../api/form/element/CustomFormElement.java   |   4 +-
 .../allaymc/api/form/element/Dropdown.java    |   1 +
 .../org/allaymc/api/form/element/Input.java   |   1 +
 .../org/allaymc/api/form/element/Label.java   |   1 +
 .../org/allaymc/api/form/element/Slider.java  |   1 +
 .../allaymc/api/form/element/StepSlider.java  |   1 +
 .../org/allaymc/api/form/element/Toggle.java  |   1 +
 .../org/allaymc/api/form/type/CustomForm.java |   1 +
 .../java/org/allaymc/api/form/type/Form.java  |   1 +
 .../org/allaymc/api/form/type/ModalForm.java  |   8 +-
 .../org/allaymc/api/form/type/SimpleForm.java |   5 +-
 .../main/java/org/allaymc/api/i18n/I18n.java  |   2 +-
 .../java/org/allaymc/api/i18n/LangCode.java   |   8 +-
 .../java/org/allaymc/api/item/ItemHelper.java |  23 +-
 .../java/org/allaymc/api/item/ItemTier.java   |  11 +-
 .../component/common/ItemBaseComponent.java   |  12 +-
 .../descriptor/ComplexAliasDescriptor.java    |   2 +-
 .../item/descriptor/DefaultDescriptor.java    |   4 +-
 .../descriptor/ItemDescriptorWithCount.java   |   2 +-
 .../item/descriptor/ItemTagDescriptor.java    |   2 +-
 .../enchantment/AbstractEnchantmentType.java  |  46 +--
 .../item/enchantment/EnchantmentHelper.java   |   4 +-
 .../item/enchantment/EnchantmentInstance.java |   8 +-
 .../item/enchantment/EnchantmentRegistry.java |   2 +-
 .../api/item/enchantment/EnchantmentType.java |  11 +-
 .../allaymc/api/item/enchantment/Rarity.java  |  16 +-
 .../SimpleEnchantmentInstance.java            |  22 +-
 .../type/EnchantmentBaneOfArthropodsType.java |   9 +
 .../type/EnchantmentBlastProtectionType.java  |   8 +
 .../type/EnchantmentBreachType.java           |  12 +-
 .../type/EnchantmentChannelingType.java       |   6 +
 .../type/EnchantmentDensityType.java          |  12 +-
 .../type/EnchantmentDepthStriderType.java     |   6 +
 .../type/EnchantmentFireProtectionType.java   |   8 +
 .../type/EnchantmentFortuneType.java          |   6 +
 .../type/EnchantmentFrostWalkerType.java      |   6 +
 .../type/EnchantmentInfinityType.java         |   6 +
 .../type/EnchantmentLoyaltyType.java          |   6 +
 .../type/EnchantmentMendingType.java          |   6 +
 .../type/EnchantmentMultishotType.java        |   6 +
 .../type/EnchantmentPiercingType.java         |   6 +
 .../EnchantmentProjectileProtectionType.java  |   8 +
 .../type/EnchantmentProtectionType.java       |   8 +
 .../type/EnchantmentRiptideType.java          |   6 +
 .../type/EnchantmentSharpnessType.java        |   6 +
 .../type/EnchantmentSilkTouchType.java        |   6 +
 .../type/EnchantmentSmiteType.java            |   9 +
 .../type/EnchantmentWindBurstType.java        |   4 +-
 .../api/item/recipe/CraftingRecipe.java       |  43 +--
 .../api/item/recipe/IdentifiedRecipe.java     |   2 +-
 .../api/item/recipe/NetworkRecipe.java        |   2 +-
 .../org/allaymc/api/item/recipe/Recipe.java   |   6 +-
 .../allaymc/api/item/recipe/ShapedRecipe.java | 124 ++++---
 .../api/item/recipe/ShapelessRecipe.java      |  37 +--
 .../allaymc/api/item/recipe/TaggedRecipe.java |   3 +-
 .../allaymc/api/item/recipe/UniqueRecipe.java |   5 +-
 .../api/item/recipe/input/CraftingInput.java  |   2 +-
 .../api/math/voxelshape/CommonShapes.java     |   9 +-
 .../api/math/voxelshape/VoxelShape.java       |  69 ++--
 .../org/allaymc/api/network/ProtocolInfo.java |   5 +-
 .../org/allaymc/api/pack/PackManifest.java    |   8 +-
 .../java/org/allaymc/api/perm/PermKeys.java   |   1 +
 .../org/allaymc/api/perm/Permissible.java     |   4 +-
 .../org/allaymc/api/perm/tree/PermTree.java   |  11 +-
 .../allaymc/api/plugin/PluginContainer.java   |   3 +-
 .../allaymc/api/registry/MappedRegistry.java  |   9 +-
 .../api/registry/SimpleBiMappedRegistry.java  |   2 +-
 .../SimpleDoubleKeyMappedRegistry.java        |   2 +-
 .../api/registry/SimpleMappedRegistry.java    |   2 +-
 .../allaymc/api/registry/SimpleRegistry.java  |   2 +-
 .../org/allaymc/api/scheduler/Scheduler.java  |   3 -
 .../allaymc/api/scheduler/TaskCreator.java    |   5 +-
 .../allaymc/api/scoreboard/Scoreboard.java    | 171 +++++-----
 .../api/scoreboard/ScoreboardLine.java        |  44 ++-
 .../api/scoreboard/ScoreboardService.java     |  30 +-
 .../api/scoreboard/ScoreboardViewer.java      |  33 +-
 .../api/scoreboard/data/DisplaySlot.java      |  24 +-
 .../api/scoreboard/data/SortOrder.java        |   8 +-
 .../api/scoreboard/scorer/EntityScorer.java   |  16 +-
 .../api/scoreboard/scorer/FakeScorer.java     |   8 +-
 .../api/scoreboard/scorer/PlayerScorer.java   |  33 +-
 .../allaymc/api/scoreboard/scorer/Scorer.java |  23 +-
 .../storage/JsonScoreboardStorage.java        |  27 +-
 .../scoreboard/storage/ScoreboardStorage.java |   2 -
 .../java/org/allaymc/api/server/Server.java   |  23 +-
 .../allaymc/api/server/ServerSettings.java    |   6 +-
 .../java/org/allaymc/api/world/Dimension.java | 121 +++----
 .../java/org/allaymc/api/world/World.java     |   8 +-
 .../java/org/allaymc/api/world/WorldData.java |   3 +-
 .../allaymc/api/world/biome/BiomeData.java    |  34 +-
 .../allaymc/api/world/bitarray/BitArray.java  |   1 -
 .../api/world/bitarray/BitArrayVersion.java   |   3 +-
 .../api/world/bitarray/PaddedBitArray.java    |  13 +-
 .../api/world/bitarray/Pow2BitArray.java      |  17 +-
 .../org/allaymc/api/world/chunk/Chunk.java    |   6 +-
 .../allaymc/api/world/chunk/ChunkSection.java |  30 +-
 .../api/world/chunk/EntityOperate.java        |   2 -
 .../allaymc/api/world/chunk/UnsafeChunk.java  |  10 +-
 .../allaymc/api/world/gamerule/GameRule.java  |  15 +-
 .../allaymc/api/world/gamerule/GameRules.java |  15 +-
 .../api/world/generator/WorldGenerator.java   |  17 +-
 .../world/generator/WorldGeneratorType.java   |   7 +-
 .../api/world/generator/context/Context.java  |   8 +-
 .../generator/context/EntitySpawnContext.java |   2 -
 .../context/OtherChunkAccessibleContext.java  |  19 +-
 .../world/generator/function/Populator.java   |   2 +-
 .../api/world/heightmap/HeightMap.java        |  15 +-
 .../allaymc/api/world/palette/Palette.java    |  99 +++---
 .../world/storage/NativeFileWorldStorage.java |   1 -
 .../allaymc/api/zlib/ZlibProviderType.java    |   5 +-
 .../codegen/VanillaBlockPropertyTypeGen.java  |  23 +-
 .../java/org/allaymc/server/AllayServer.java  |   5 +-
 .../AllayVanillaBlockAttributeRegistry.java   |   2 +-
 .../common/BlockBaseComponentImpl.java        |   2 +-
 ...allWheatSeedDropableBaseComponentImpl.java |   6 +-
 ...ockWheatSeedDropableBaseComponentImpl.java |   4 +-
 .../BlockShulkerBoxBaseComponentImpl.java     |  12 +-
 .../registry/AllayBlockTypeRegistry.java      |  35 +-
 .../block/type/BlockTypeBuildException.java   |   3 -
 .../block/type/BlockTypeInitializer.java      |   2 +-
 .../player/EntityPlayerBaseComponentImpl.java |   4 +-
 .../common/ItemBaseComponentImpl.java         |   2 +-
 .../enchantment/AllayEnchantmentRegistry.java |   4 +-
 241 files changed, 1670 insertions(+), 1817 deletions(-)
 delete mode 100644 Allay-API/src/main/java/org/allaymc/api/block/property/enums/CoralColor.java
 delete mode 100644 Allay-API/src/main/java/org/allaymc/api/block/property/enums/DoublePlantType.java
 delete mode 100644 Allay-API/src/main/java/org/allaymc/api/block/property/enums/FlowerType.java
 delete mode 100644 Allay-API/src/main/java/org/allaymc/api/block/property/enums/SaplingType.java
 delete mode 100644 Allay-API/src/main/java/org/allaymc/api/block/property/enums/TallGrassType.java

diff --git a/Allay-API/src/main/java/org/allaymc/api/AllayAPI.java b/Allay-API/src/main/java/org/allaymc/api/AllayAPI.java
index 2ffd674c4..dea8bf435 100644
--- a/Allay-API/src/main/java/org/allaymc/api/AllayAPI.java
+++ b/Allay-API/src/main/java/org/allaymc/api/AllayAPI.java
@@ -85,23 +85,22 @@ public static AllayAPI getInstance() {
      */
     @SuppressWarnings("unchecked")
     public void implement(String coreName) throws MissingImplementationException {
-        if (!i18nSet) {
-            throw new MissingImplementationException("Missing i18n implementation!");
-        }
-        for (Map.Entry<Class<?>, ApiBindingAction<?>> entry : bindings.entrySet()) {
-            if (entry.getValue() == null) {
+        if (!i18nSet) throw new MissingImplementationException("Missing i18n implementation!");
+        for (var entry : bindings.entrySet()) {
+            if (entry.getValue() == null)
                 throw new MissingImplementationException("Missing binding for " + entry.getKey().getName());
-            }
+
             var apiInstance = entry.getValue().bindingAction.get();
-            Consumer<Object> consumer = (Consumer<Object>) consumers.get(entry.getKey());
-            if (consumer == null) {
+            var consumer = (Consumer<Object>) consumers.get(entry.getKey());
+            if (consumer == null)
                 throw new MissingRequirementException("Missing requirement for " + entry.getKey().getName());
-            }
+
             consumer.accept(apiInstance);
             if (entry.getValue().afterBound != null) {
                 ((Consumer<Object>) entry.getValue().afterBound).accept(apiInstance);
             }
         }
+
         this.coreName = coreName;
         log.info(I18n.get().tr(TrKeys.A_API_IMPLEMENTED, coreName, API_VERSION));
         implemented = true;
@@ -119,9 +118,7 @@ public <T> void requireImpl(Class<T> api) {
      */
     public <T> void requireImpl(Class<T> api, Consumer<T> apiInstanceConsumer) {
         bindings.put(api, null);
-        if (apiInstanceConsumer != null) {
-            consumers.put(api, apiInstanceConsumer);
-        }
+        if (apiInstanceConsumer != null) consumers.put(api, apiInstanceConsumer);
     }
 
     public <T> void bind(Class<T> api, Supplier<T> supplier) {
@@ -212,6 +209,5 @@ private void defaultAPIRequirements() {
         requireImpl(PackRegistry.class, PackRegistry.REGISTRY::set);
     }
 
-    private record ApiBindingAction<T>(Supplier<T> bindingAction, Consumer<T> afterBound) {
-    }
-}
\ No newline at end of file
+    private record ApiBindingAction<T>(Supplier<T> bindingAction, Consumer<T> afterBound) {}
+}
diff --git a/Allay-API/src/main/java/org/allaymc/api/annotation/SlowOperation.java b/Allay-API/src/main/java/org/allaymc/api/annotation/SlowOperation.java
index 9b32e5efb..3d54590d4 100644
--- a/Allay-API/src/main/java/org/allaymc/api/annotation/SlowOperation.java
+++ b/Allay-API/src/main/java/org/allaymc/api/annotation/SlowOperation.java
@@ -6,7 +6,8 @@
 import java.lang.annotation.Target;
 
 /**
- * An annotation used to mark a method as being slow or blocking a thread <br>
+ * An annotation used to mark a method as being slow or blocking a thread
+ * <p>
  * It usually means that you may need to call it asynchronously
  * <p>
  * Allay Project 2023/7/8
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/component/common/BlockAttributes.java b/Allay-API/src/main/java/org/allaymc/api/block/component/common/BlockAttributes.java
index de693223d..c6594f152 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/component/common/BlockAttributes.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/component/common/BlockAttributes.java
@@ -97,8 +97,8 @@ public class BlockAttributes {
     @Builder.Default
     protected boolean pushesUpFallingBlocks = false;
     /**
-     * 此方块状态是否可以被徒手挖取
-     * 若可以，则玩家在非创造模式下可以使用任何工具挖取此方块并产生掉落物
+     * Whether this block state can be harvested by hand
+     * If true, players in non-creative mode can use any tool to mine this block and produce drops
      */
     @Builder.Default
     protected boolean canHarvestWithHand = true;
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/component/common/BlockBaseComponent.java b/Allay-API/src/main/java/org/allaymc/api/block/component/common/BlockBaseComponent.java
index 9448c1940..a0665c286 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/component/common/BlockBaseComponent.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/component/common/BlockBaseComponent.java
@@ -59,8 +59,10 @@ default <DATATYPE> void updateBlockProperty(BlockPropertyType<DATATYPE> property
 
     /**
      * Check if the block can keep existing when a neighbor block updates.
+     *
      * @param current The current block
-     * @param face The face of the current block that is being updated
+     * @param face    The face of the current block that is being updated
+     *
      * @return true if the block can keep existing, false if the block should be broken
      */
     default boolean canKeepExisting(BlockStateWithPos current, BlockStateWithPos neighbor, BlockFace face) {
@@ -96,10 +98,7 @@ default void checkPlaceMethodParam(Dimension dimension, BlockState blockState, V
      *
      * @return true if the block is placed successfully, false if failed
      */
-    boolean place(
-            Dimension dimension, BlockState blockState,
-            Vector3ic placeBlockPos,
-            PlayerInteractInfo placementInfo);
+    boolean place(Dimension dimension, BlockState blockState, Vector3ic placeBlockPos, PlayerInteractInfo placementInfo);
 
     /**
      * Called when a block is placed.
@@ -120,9 +119,7 @@ boolean place(
      * For example, right-clicking on the crafting table is normally considered a valid operation, so this method will return true
      * If false is returned, the useItemOn method of the player's item will continue to be called
      */
-    boolean onInteract(
-            ItemStack itemStack, Dimension dimension,
-            PlayerInteractInfo interactInfo);
+    boolean onInteract(ItemStack itemStack, Dimension dimension, PlayerInteractInfo interactInfo);
 
     /**
      * Called when a block is replaced.
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/component/common/PlayerInteractInfo.java b/Allay-API/src/main/java/org/allaymc/api/block/component/common/PlayerInteractInfo.java
index d7882d0c7..42b5bd47b 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/component/common/PlayerInteractInfo.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/component/common/PlayerInteractInfo.java
@@ -8,10 +8,10 @@
 /**
  * Allay Project 2024/6/20
  *
- * @param player The player who is placing the block
+ * @param player        The player who is placing the block
  * @param clickBlockPos The block that the player clicked on
- * @param clickPos The precise pos where the player clicked
- * @param blockFace The face of the block that the player clicked on
+ * @param clickPos      The precise pos where the player clicked
+ * @param blockFace     The face of the block that the player clicked on
  *
  * @author daoge_cmd
  */
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/component/event/BlockOnInteractEvent.java b/Allay-API/src/main/java/org/allaymc/api/block/component/event/BlockOnInteractEvent.java
index 7d338948d..d2b92d3e2 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/component/event/BlockOnInteractEvent.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/component/event/BlockOnInteractEvent.java
@@ -4,13 +4,9 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.allaymc.api.block.component.common.PlayerInteractInfo;
-import org.allaymc.api.block.data.BlockFace;
-import org.allaymc.api.entity.interfaces.EntityPlayer;
 import org.allaymc.api.eventbus.event.Event;
 import org.allaymc.api.item.ItemStack;
 import org.allaymc.api.world.Dimension;
-import org.joml.Vector3fc;
-import org.joml.Vector3ic;
 
 /**
  * Allay Project 2023/9/23
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/component/event/BlockOnNeighborUpdateEvent.java b/Allay-API/src/main/java/org/allaymc/api/block/component/event/BlockOnNeighborUpdateEvent.java
index 9101adf75..704eb5d41 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/component/event/BlockOnNeighborUpdateEvent.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/component/event/BlockOnNeighborUpdateEvent.java
@@ -5,8 +5,6 @@
 import org.allaymc.api.block.data.BlockFace;
 import org.allaymc.api.block.data.BlockStateWithPos;
 import org.allaymc.api.eventbus.event.Event;
-import org.allaymc.api.world.Dimension;
-import org.joml.Vector3ic;
 
 /**
  * Allay Project 2023/9/23
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/material/Material.java b/Allay-API/src/main/java/org/allaymc/api/block/material/Material.java
index 7ea2c0cce..960cede3a 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/material/Material.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/material/Material.java
@@ -24,9 +24,9 @@ public record Material(
         MaterialType materialType,
         boolean canBeMovingBlock,
         boolean canHavePrecipitation,
-        //isAlwaysDestroyable为true时，表示方块可以被任何物品破坏(甚至是空手)而不产生挖掘惩罚
-        //部分方块（例如石头，黑曜石）不可以被徒手挖去。若强行挖取它们，挖掘速度会受到惩罚(baseTime增大5倍，正常是1.5倍)
-        //请注意，isAlwaysDestroyable为true不代表方块一定可以掉落为物品！
+        // When isAlwaysDestroyable is true, it means the block can be destroyed by any item (even bare hands) without incurring a mining penalty.
+        // Some blocks (such as stone and obsidian) cannot be mined by hand. If you try to mine them, the mining speed will be penalized (baseTime increased by 5 times, normally it's 1.5 times).
+        // Note that isAlwaysDestroyable being true does not mean the block will necessarily drop as an item!
         boolean isAlwaysDestroyable,
         boolean isLiquid,
         boolean isSolid,
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/material/MaterialType.java b/Allay-API/src/main/java/org/allaymc/api/block/material/MaterialType.java
index 3f1da5119..c9cf91574 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/material/MaterialType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/material/MaterialType.java
@@ -6,5 +6,4 @@
  * @author daoge_cmd
  */
 public record MaterialType(String name) {
-
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/palette/BlockStateHashPalette.java b/Allay-API/src/main/java/org/allaymc/api/block/palette/BlockStateHashPalette.java
index 8e20cde01..ac743b2f0 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/palette/BlockStateHashPalette.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/palette/BlockStateHashPalette.java
@@ -21,14 +21,11 @@ static BlockStateHashPalette getRegistry() {
     @Override
     default BlockState register(Integer hash, BlockState blockState) {
         if (getContent().containsKey(hash))
-            throw new BlockStateHashCollisionException("Checked for possible block state hash collisions! Hash: " + hash + " ,BlockState: " + blockState);
+            throw new BlockStateHashCollisionException("Checked for possible block state hash collisions! Hash: " + hash + ", BlockState: " + blockState);
         else return MappedRegistry.super.register(hash, blockState);
     }
 
     class BlockStateHashCollisionException extends RuntimeException {
-        public BlockStateHashCollisionException() {
-        }
-
         public BlockStateHashCollisionException(String message) {
             super(message);
         }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/PropertyUtil.java b/Allay-API/src/main/java/org/allaymc/api/block/property/PropertyUtil.java
index 3e86a2db8..9af49f4b7 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/PropertyUtil.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/PropertyUtil.java
@@ -1,5 +1,6 @@
 package org.allaymc.api.block.property;
 
+import lombok.experimental.UtilityClass;
 import org.allaymc.api.block.data.BlockFace;
 import org.allaymc.api.block.property.enums.MinecraftCardinalDirection;
 
@@ -8,6 +9,7 @@
  *
  * @author daoge_cmd
  */
+@UtilityClass
 public class PropertyUtil {
     public static MinecraftCardinalDirection toMinecraftCardinalDirection(BlockFace face) {
         return switch (face) {
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/Attachment.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/Attachment.java
index c737e02ce..340c6dea9 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/Attachment.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/Attachment.java
@@ -1,16 +1,18 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum Attachment {
-  HANGING,
+    HANGING,
 
-  MULTIPLE,
+    MULTIPLE,
 
-  SIDE,
+    SIDE,
 
-  STANDING
+    STANDING
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/BambooLeafSize.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/BambooLeafSize.java
index 528e52c6a..7824e188a 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/BambooLeafSize.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/BambooLeafSize.java
@@ -1,14 +1,16 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum BambooLeafSize {
-  LARGE_LEAVES,
+    LARGE_LEAVES,
 
-  NO_LEAVES,
+    NO_LEAVES,
 
-  SMALL_LEAVES
+    SMALL_LEAVES
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/BambooStalkThickness.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/BambooStalkThickness.java
index d7b3cfed2..f1a07de7b 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/BambooStalkThickness.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/BambooStalkThickness.java
@@ -1,12 +1,14 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum BambooStalkThickness {
-  THICK,
+    THICK,
 
-  THIN
+    THIN
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/BigDripleafTilt.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/BigDripleafTilt.java
index 418fbc680..92b597cc2 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/BigDripleafTilt.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/BigDripleafTilt.java
@@ -1,16 +1,18 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum BigDripleafTilt {
-  FULL_TILT,
+    FULL_TILT,
 
-  NONE,
+    NONE,
 
-  PARTIAL_TILT,
+    PARTIAL_TILT,
 
-  UNSTABLE
+    UNSTABLE
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/CauldronLiquid.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/CauldronLiquid.java
index 216a5328a..c0911eb04 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/CauldronLiquid.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/CauldronLiquid.java
@@ -1,14 +1,16 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum CauldronLiquid {
-  LAVA,
+    LAVA,
 
-  POWDER_SNOW,
+    POWDER_SNOW,
 
-  WATER
+    WATER
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/ChemistryTableType.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/ChemistryTableType.java
index a5cef96e9..4fa33e3af 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/ChemistryTableType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/ChemistryTableType.java
@@ -1,16 +1,18 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum ChemistryTableType {
-  COMPOUND_CREATOR,
+    COMPOUND_CREATOR,
 
-  ELEMENT_CONSTRUCTOR,
+    ELEMENT_CONSTRUCTOR,
 
-  LAB_TABLE,
+    LAB_TABLE,
 
-  MATERIAL_REDUCER
+    MATERIAL_REDUCER
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/ChiselType.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/ChiselType.java
index b986ae24f..125a7d105 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/ChiselType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/ChiselType.java
@@ -1,16 +1,18 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum ChiselType {
-  CHISELED,
+    CHISELED,
 
-  DEFAULT,
+    DEFAULT,
 
-  LINES,
+    LINES,
 
-  SMOOTH
+    SMOOTH
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/CoralColor.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/CoralColor.java
deleted file mode 100644
index 85285f467..000000000
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/CoralColor.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.allaymc.api.block.property.enums;
-
-/**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
- *
- * @author daoge_cmd
- */
-public enum CoralColor {
-    BLUE,
-
-    PINK,
-
-    PURPLE,
-
-    RED,
-
-    YELLOW
-}
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/CrackedState.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/CrackedState.java
index 7db0c99d9..90915bd32 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/CrackedState.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/CrackedState.java
@@ -1,14 +1,16 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum CrackedState {
-  CRACKED,
+    CRACKED,
 
-  MAX_CRACKED,
+    MAX_CRACKED,
 
-  NO_CRACKS
+    NO_CRACKS
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/Damage.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/Damage.java
index c56842165..98704c857 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/Damage.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/Damage.java
@@ -1,16 +1,18 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum Damage {
-  BROKEN,
+    BROKEN,
 
-  SLIGHTLY_DAMAGED,
+    SLIGHTLY_DAMAGED,
 
-  UNDAMAGED,
+    UNDAMAGED,
 
-  VERY_DAMAGED
+    VERY_DAMAGED
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/DirtType.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/DirtType.java
index 300528ad2..69bcca061 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/DirtType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/DirtType.java
@@ -1,12 +1,14 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum DirtType {
-  COARSE,
+    COARSE,
 
-  NORMAL
+    NORMAL
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/DoublePlantType.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/DoublePlantType.java
deleted file mode 100644
index aca559f42..000000000
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/DoublePlantType.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.allaymc.api.block.property.enums;
-
-/**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
- *
- * @author daoge_cmd
- */
-public enum DoublePlantType {
-    FERN,
-
-    GRASS,
-
-    PAEONIA,
-
-    ROSE,
-
-    SUNFLOWER,
-
-    SYRINGA
-}
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/DripstoneThickness.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/DripstoneThickness.java
index 02aef4b11..2f29f5abe 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/DripstoneThickness.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/DripstoneThickness.java
@@ -1,18 +1,20 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum DripstoneThickness {
-  BASE,
+    BASE,
 
-  FRUSTUM,
+    FRUSTUM,
 
-  MERGE,
+    MERGE,
 
-  MIDDLE,
+    MIDDLE,
 
-  TIP
+    TIP
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/FlowerType.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/FlowerType.java
deleted file mode 100644
index 9d8bb3b5c..000000000
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/FlowerType.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.allaymc.api.block.property.enums;
-
-/**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
- *
- * @author daoge_cmd
- */
-public enum FlowerType {
-    ALLIUM,
-
-    CORNFLOWER,
-
-    HOUSTONIA,
-
-    LILY_OF_THE_VALLEY,
-
-    ORCHID,
-
-    OXEYE,
-
-    POPPY,
-
-    TULIP_ORANGE,
-
-    TULIP_PINK,
-
-    TULIP_RED,
-
-    TULIP_WHITE
-}
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/LeverDirection.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/LeverDirection.java
index 049224ced..0d36e6739 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/LeverDirection.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/LeverDirection.java
@@ -1,24 +1,26 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum LeverDirection {
-  DOWN_EAST_WEST,
+    DOWN_EAST_WEST,
 
-  DOWN_NORTH_SOUTH,
+    DOWN_NORTH_SOUTH,
 
-  EAST,
+    EAST,
 
-  NORTH,
+    NORTH,
 
-  SOUTH,
+    SOUTH,
 
-  UP_EAST_WEST,
+    UP_EAST_WEST,
 
-  UP_NORTH_SOUTH,
+    UP_NORTH_SOUTH,
 
-  WEST
+    WEST
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/MinecraftBlockFace.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/MinecraftBlockFace.java
index cf9ac7be9..c3186f4a4 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/MinecraftBlockFace.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/MinecraftBlockFace.java
@@ -1,20 +1,22 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum MinecraftBlockFace {
-  DOWN,
+    DOWN,
 
-  EAST,
+    EAST,
 
-  NORTH,
+    NORTH,
 
-  SOUTH,
+    SOUTH,
 
-  UP,
+    UP,
 
-  WEST
+    WEST
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/MinecraftCardinalDirection.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/MinecraftCardinalDirection.java
index 0907034d6..7e89ca0c4 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/MinecraftCardinalDirection.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/MinecraftCardinalDirection.java
@@ -1,16 +1,18 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum MinecraftCardinalDirection {
-  EAST,
+    EAST,
 
-  NORTH,
+    NORTH,
 
-  SOUTH,
+    SOUTH,
 
-  WEST
+    WEST
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/MinecraftFacingDirection.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/MinecraftFacingDirection.java
index f41fbe10f..2972cd261 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/MinecraftFacingDirection.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/MinecraftFacingDirection.java
@@ -1,20 +1,22 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum MinecraftFacingDirection {
-  DOWN,
+    DOWN,
 
-  EAST,
+    EAST,
 
-  NORTH,
+    NORTH,
 
-  SOUTH,
+    SOUTH,
 
-  UP,
+    UP,
 
-  WEST
+    WEST
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/MinecraftVerticalHalf.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/MinecraftVerticalHalf.java
index ae9da33c7..fda94b2eb 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/MinecraftVerticalHalf.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/MinecraftVerticalHalf.java
@@ -1,12 +1,14 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum MinecraftVerticalHalf {
-  BOTTOM,
+    BOTTOM,
 
-  TOP
+    TOP
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/MonsterEggStoneType.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/MonsterEggStoneType.java
index 4380defdf..24f5a8ed0 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/MonsterEggStoneType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/MonsterEggStoneType.java
@@ -1,20 +1,22 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum MonsterEggStoneType {
-  CHISELED_STONE_BRICK,
+    CHISELED_STONE_BRICK,
 
-  COBBLESTONE,
+    COBBLESTONE,
 
-  CRACKED_STONE_BRICK,
+    CRACKED_STONE_BRICK,
 
-  MOSSY_STONE_BRICK,
+    MOSSY_STONE_BRICK,
 
-  STONE,
+    STONE,
 
-  STONE_BRICK
+    STONE_BRICK
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/Orientation.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/Orientation.java
index ce3d902fd..5714cc400 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/Orientation.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/Orientation.java
@@ -1,32 +1,34 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum Orientation {
-  DOWN_EAST,
+    DOWN_EAST,
 
-  DOWN_NORTH,
+    DOWN_NORTH,
 
-  DOWN_SOUTH,
+    DOWN_SOUTH,
 
-  DOWN_WEST,
+    DOWN_WEST,
 
-  EAST_UP,
+    EAST_UP,
 
-  NORTH_UP,
+    NORTH_UP,
 
-  SOUTH_UP,
+    SOUTH_UP,
 
-  UP_EAST,
+    UP_EAST,
 
-  UP_NORTH,
+    UP_NORTH,
 
-  UP_SOUTH,
+    UP_SOUTH,
 
-  UP_WEST,
+    UP_WEST,
 
-  WEST_UP
+    WEST_UP
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/PillarAxis.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/PillarAxis.java
index 9feebbd12..b84ca9dda 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/PillarAxis.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/PillarAxis.java
@@ -1,14 +1,16 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum PillarAxis {
-  X,
+    X,
 
-  Y,
+    Y,
 
-  Z
+    Z
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/PortalAxis.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/PortalAxis.java
index fd9084d1a..3af082440 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/PortalAxis.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/PortalAxis.java
@@ -1,14 +1,16 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum PortalAxis {
-  UNKNOWN,
+    UNKNOWN,
 
-  X,
+    X,
 
-  Z
+    Z
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/PrismarineBlockType.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/PrismarineBlockType.java
index dcf545745..d11f46e38 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/PrismarineBlockType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/PrismarineBlockType.java
@@ -1,14 +1,16 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum PrismarineBlockType {
-  BRICKS,
+    BRICKS,
 
-  DARK,
+    DARK,
 
-  DEFAULT
+    DEFAULT
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/SandStoneType.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/SandStoneType.java
index 99e304449..4698d5a41 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/SandStoneType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/SandStoneType.java
@@ -1,16 +1,18 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum SandStoneType {
-  CUT,
+    CUT,
 
-  DEFAULT,
+    DEFAULT,
 
-  HEIROGLYPHS,
+    HEIROGLYPHS,
 
-  SMOOTH
+    SMOOTH
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/SandType.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/SandType.java
index 7bdd5a642..6b53d50cf 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/SandType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/SandType.java
@@ -1,12 +1,14 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum SandType {
-  NORMAL,
+    NORMAL,
 
-  RED
+    RED
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/SaplingType.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/SaplingType.java
deleted file mode 100644
index d252cef2e..000000000
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/SaplingType.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.allaymc.api.block.property.enums;
-
-/**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
- *
- * @author daoge_cmd
- */
-public enum SaplingType {
-    ACACIA,
-
-    BIRCH,
-
-    DARK_OAK,
-
-    JUNGLE,
-
-    OAK,
-
-    SPRUCE
-}
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/SeaGrassType.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/SeaGrassType.java
index 7c256bf09..f19b75955 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/SeaGrassType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/SeaGrassType.java
@@ -1,14 +1,16 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum SeaGrassType {
-  DEFAULT,
+    DEFAULT,
 
-  DOUBLE_BOT,
+    DOUBLE_BOT,
 
-  DOUBLE_TOP
+    DOUBLE_TOP
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/SpongeType.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/SpongeType.java
index c5641d9ac..31a9051b1 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/SpongeType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/SpongeType.java
@@ -1,12 +1,14 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum SpongeType {
-  DRY,
+    DRY,
 
-  WET
+    WET
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StoneBrickType.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StoneBrickType.java
index 263557209..03c827341 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StoneBrickType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StoneBrickType.java
@@ -1,18 +1,20 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum StoneBrickType {
-  CHISELED,
+    CHISELED,
 
-  CRACKED,
+    CRACKED,
 
-  DEFAULT,
+    DEFAULT,
 
-  MOSSY,
+    MOSSY,
 
-  SMOOTH
+    SMOOTH
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StoneSlabType.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StoneSlabType.java
index 3725a9a8e..93fcb5c68 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StoneSlabType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StoneSlabType.java
@@ -1,24 +1,26 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum StoneSlabType {
-  BRICK,
+    BRICK,
 
-  COBBLESTONE,
+    COBBLESTONE,
 
-  NETHER_BRICK,
+    NETHER_BRICK,
 
-  QUARTZ,
+    QUARTZ,
 
-  SANDSTONE,
+    SANDSTONE,
 
-  SMOOTH_STONE,
+    SMOOTH_STONE,
 
-  STONE_BRICK,
+    STONE_BRICK,
 
-  WOOD
+    WOOD
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StoneSlabType2.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StoneSlabType2.java
index 1bdc94d0e..6e05ab031 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StoneSlabType2.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StoneSlabType2.java
@@ -1,24 +1,26 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum StoneSlabType2 {
-  MOSSY_COBBLESTONE,
+    MOSSY_COBBLESTONE,
 
-  PRISMARINE_BRICK,
+    PRISMARINE_BRICK,
 
-  PRISMARINE_DARK,
+    PRISMARINE_DARK,
 
-  PRISMARINE_ROUGH,
+    PRISMARINE_ROUGH,
 
-  PURPUR,
+    PURPUR,
 
-  RED_NETHER_BRICK,
+    RED_NETHER_BRICK,
 
-  RED_SANDSTONE,
+    RED_SANDSTONE,
 
-  SMOOTH_SANDSTONE
+    SMOOTH_SANDSTONE
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StoneSlabType3.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StoneSlabType3.java
index a76bd0545..52c15976e 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StoneSlabType3.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StoneSlabType3.java
@@ -1,24 +1,26 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum StoneSlabType3 {
-  ANDESITE,
+    ANDESITE,
 
-  DIORITE,
+    DIORITE,
 
-  END_STONE_BRICK,
+    END_STONE_BRICK,
 
-  GRANITE,
+    GRANITE,
 
-  POLISHED_ANDESITE,
+    POLISHED_ANDESITE,
 
-  POLISHED_DIORITE,
+    POLISHED_DIORITE,
 
-  POLISHED_GRANITE,
+    POLISHED_GRANITE,
 
-  SMOOTH_RED_SANDSTONE
+    SMOOTH_RED_SANDSTONE
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StoneSlabType4.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StoneSlabType4.java
index 932c51c86..a672a785e 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StoneSlabType4.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StoneSlabType4.java
@@ -1,18 +1,20 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum StoneSlabType4 {
-  CUT_RED_SANDSTONE,
+    CUT_RED_SANDSTONE,
 
-  CUT_SANDSTONE,
+    CUT_SANDSTONE,
 
-  MOSSY_STONE_BRICK,
+    MOSSY_STONE_BRICK,
 
-  SMOOTH_QUARTZ,
+    SMOOTH_QUARTZ,
 
-  STONE
+    STONE
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StructureBlockType.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StructureBlockType.java
index c69848149..6a5d93c61 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StructureBlockType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StructureBlockType.java
@@ -1,20 +1,22 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum StructureBlockType {
-  CORNER,
+    CORNER,
 
-  DATA,
+    DATA,
 
-  EXPORT,
+    EXPORT,
 
-  INVALID,
+    INVALID,
 
-  LOAD,
+    LOAD,
 
-  SAVE
+    SAVE
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StructureVoidType.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StructureVoidType.java
index 9b8c7ed0b..9a83d57a0 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StructureVoidType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/StructureVoidType.java
@@ -1,12 +1,14 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum StructureVoidType {
-  AIR,
+    AIR,
 
-  VOID
+    VOID
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/TallGrassType.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/TallGrassType.java
deleted file mode 100644
index 0a4702a01..000000000
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/TallGrassType.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.allaymc.api.block.property.enums;
-
-/**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
- *
- * @author daoge_cmd
- */
-public enum TallGrassType {
-    DEFAULT,
-
-    FERN,
-
-    SNOW,
-
-    TALL
-}
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/TorchFacingDirection.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/TorchFacingDirection.java
index e672932a7..d7146a01c 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/TorchFacingDirection.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/TorchFacingDirection.java
@@ -1,20 +1,22 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum TorchFacingDirection {
-  EAST,
+    EAST,
 
-  NORTH,
+    NORTH,
 
-  SOUTH,
+    SOUTH,
 
-  TOP,
+    TOP,
 
-  UNKNOWN,
+    UNKNOWN,
 
-  WEST
+    WEST
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/TurtleEggCount.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/TurtleEggCount.java
index 69a342891..0ddef3560 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/TurtleEggCount.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/TurtleEggCount.java
@@ -1,16 +1,18 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum TurtleEggCount {
-  FOUR_EGG,
+    FOUR_EGG,
 
-  ONE_EGG,
+    ONE_EGG,
 
-  THREE_EGG,
+    THREE_EGG,
 
-  TWO_EGG
+    TWO_EGG
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/VaultState.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/VaultState.java
index f10963bbf..8a92b126d 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/VaultState.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/VaultState.java
@@ -1,16 +1,18 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum VaultState {
-  ACTIVE,
+    ACTIVE,
 
-  EJECTING,
+    EJECTING,
 
-  INACTIVE,
+    INACTIVE,
 
-  UNLOCKING
+    UNLOCKING
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/WallBlockType.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/WallBlockType.java
index 536997bfe..1e7b14573 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/WallBlockType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/WallBlockType.java
@@ -1,36 +1,38 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum WallBlockType {
-  ANDESITE,
+    ANDESITE,
 
-  BRICK,
+    BRICK,
 
-  COBBLESTONE,
+    COBBLESTONE,
 
-  DIORITE,
+    DIORITE,
 
-  END_BRICK,
+    END_BRICK,
 
-  GRANITE,
+    GRANITE,
 
-  MOSSY_COBBLESTONE,
+    MOSSY_COBBLESTONE,
 
-  MOSSY_STONE_BRICK,
+    MOSSY_STONE_BRICK,
 
-  NETHER_BRICK,
+    NETHER_BRICK,
 
-  PRISMARINE,
+    PRISMARINE,
 
-  RED_NETHER_BRICK,
+    RED_NETHER_BRICK,
 
-  RED_SANDSTONE,
+    RED_SANDSTONE,
 
-  SANDSTONE,
+    SANDSTONE,
 
-  STONE_BRICK
+    STONE_BRICK
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/WallConnectionTypeEast.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/WallConnectionTypeEast.java
index 45c60aa89..269a8413c 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/WallConnectionTypeEast.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/WallConnectionTypeEast.java
@@ -1,14 +1,16 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum WallConnectionTypeEast {
-  NONE,
+    NONE,
 
-  SHORT,
+    SHORT,
 
-  TALL
+    TALL
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/WallConnectionTypeNorth.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/WallConnectionTypeNorth.java
index 740bc18d1..a4b360812 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/WallConnectionTypeNorth.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/WallConnectionTypeNorth.java
@@ -1,14 +1,16 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum WallConnectionTypeNorth {
-  NONE,
+    NONE,
 
-  SHORT,
+    SHORT,
 
-  TALL
+    TALL
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/WallConnectionTypeSouth.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/WallConnectionTypeSouth.java
index 2d7391ed2..7eed1f40d 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/WallConnectionTypeSouth.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/WallConnectionTypeSouth.java
@@ -1,14 +1,16 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum WallConnectionTypeSouth {
-  NONE,
+    NONE,
 
-  SHORT,
+    SHORT,
 
-  TALL
+    TALL
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/WallConnectionTypeWest.java b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/WallConnectionTypeWest.java
index 8721119f7..5c5c08d51 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/enums/WallConnectionTypeWest.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/enums/WallConnectionTypeWest.java
@@ -1,14 +1,16 @@
 package org.allaymc.api.block.property.enums;
 
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public enum WallConnectionTypeWest {
-  NONE,
+    NONE,
 
-  SHORT,
+    SHORT,
 
-  TALL
+    TALL
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/type/BaseBlockPropertyType.java b/Allay-API/src/main/java/org/allaymc/api/block/property/type/BaseBlockPropertyType.java
index d016fde28..72e6d2fa0 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/type/BaseBlockPropertyType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/type/BaseBlockPropertyType.java
@@ -1,5 +1,7 @@
 package org.allaymc.api.block.property.type;
 
+import lombok.Getter;
+
 import java.util.List;
 import java.util.Objects;
 
@@ -8,6 +10,7 @@
  *
  * @author daoge_cmd
  */
+@Getter
 public abstract sealed class BaseBlockPropertyType<DATATYPE> implements BlockPropertyType<DATATYPE> permits BooleanPropertyType, EnumPropertyType, IntPropertyType {
 
     protected final String name;
@@ -16,30 +19,9 @@ public abstract sealed class BaseBlockPropertyType<DATATYPE> implements BlockPro
     protected final byte bitSize;
 
     protected BaseBlockPropertyType(String name, List<DATATYPE> validValues, DATATYPE defaultValue, byte bitSize) {
-        Objects.requireNonNull(defaultValue);
         this.name = name;
         this.validValues = validValues;
-        this.defaultValue = defaultValue;
+        this.defaultValue = Objects.requireNonNull(defaultValue);
         this.bitSize = bitSize;
     }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public DATATYPE getDefaultValue() {
-        return defaultValue;
-    }
-
-    @Override
-    public List<DATATYPE> getValidValues() {
-        return validValues;
-    }
-
-    @Override
-    public byte getBitSize() {
-        return bitSize;
-    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/type/BlockPropertyType.java b/Allay-API/src/main/java/org/allaymc/api/block/property/type/BlockPropertyType.java
index 3812a660b..18bb12bbe 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/type/BlockPropertyType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/type/BlockPropertyType.java
@@ -1,5 +1,6 @@
 package org.allaymc.api.block.property.type;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.ToString;
 
@@ -46,16 +47,12 @@ enum Type {
 
     @Getter
     @ToString
+    @AllArgsConstructor
     abstract sealed class BlockPropertyValue<DATATYPE, PROPERTY extends BlockPropertyType<DATATYPE>, SERIALIZED_DATATYPE> permits BooleanPropertyType.BooleanPropertyValue, EnumPropertyType.EnumPropertyValue, IntPropertyType.IntPropertyValue {
 
         protected final PROPERTY propertyType;
         protected final DATATYPE value;
 
-        BlockPropertyValue(PROPERTY propertyType, DATATYPE value) {
-            this.propertyType = propertyType;
-            this.value = value;
-        }
-
         public abstract int getIndex();
 
         public abstract SERIALIZED_DATATYPE getSerializedValue();
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/type/BooleanPropertyType.java b/Allay-API/src/main/java/org/allaymc/api/block/property/type/BooleanPropertyType.java
index 961267d90..d7e4c3abb 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/type/BooleanPropertyType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/type/BooleanPropertyType.java
@@ -1,5 +1,7 @@
 package org.allaymc.api.block.property.type;
 
+import lombok.Getter;
+
 import java.util.List;
 
 /**
@@ -43,17 +45,12 @@ public BooleanPropertyValue tryCreateValue(Object value) {
     }
 
     public final class BooleanPropertyValue extends BlockPropertyValue<Boolean, BooleanPropertyType, Byte> {
-
+        @Getter
         private final int index;
 
         BooleanPropertyValue(Boolean value) {
             super(BooleanPropertyType.this, value);
-            index = value ? 1 : 0;
-        }
-
-        @Override
-        public int getIndex() {
-            return index;
+            this.index = value ? 1 : 0;
         }
 
         @Override
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/type/EnumPropertyType.java b/Allay-API/src/main/java/org/allaymc/api/block/property/type/EnumPropertyType.java
index 475a1083d..62ae12231 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/type/EnumPropertyType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/type/EnumPropertyType.java
@@ -1,5 +1,6 @@
 package org.allaymc.api.block.property.type;
 
+import lombok.Getter;
 import org.allaymc.api.utils.Utils;
 
 import java.util.Arrays;
@@ -51,12 +52,12 @@ public EnumPropertyValue tryCreateValue(Object value) {
     }
 
     public final class EnumPropertyValue extends BlockPropertyValue<T, EnumPropertyType<T>, String> {
-
+        @Getter
         private final String serializedValue;
 
         EnumPropertyValue(T value) {
             super(EnumPropertyType.this, value);
-            serializedValue = value.name().toLowerCase();
+            this.serializedValue = value.name().toLowerCase();
         }
 
         @Override
@@ -64,11 +65,6 @@ public int getIndex() {
             return value.ordinal();
         }
 
-        @Override
-        public String getSerializedValue() {
-            return serializedValue;
-        }
-
         @Override
         public String toString() {
             return "EnumPropertyValue(name=" + name + ", value=" + value + ")";
diff --git a/Allay-API/src/main/java/org/allaymc/api/block/property/type/IntPropertyType.java b/Allay-API/src/main/java/org/allaymc/api/block/property/type/IntPropertyType.java
index d01e41d54..ea4f3b96b 100644
--- a/Allay-API/src/main/java/org/allaymc/api/block/property/type/IntPropertyType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/block/property/type/IntPropertyType.java
@@ -1,5 +1,6 @@
 package org.allaymc.api.block.property.type;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 import org.allaymc.api.utils.Utils;
 
@@ -10,22 +11,20 @@
  *
  * @author daoge_cmd
  */
+@Getter
 public final class IntPropertyType extends BaseBlockPropertyType<Integer> {
-
+    @Getter(AccessLevel.NONE)
     private final IntPropertyValue[] cachedValues;
-    @Getter
-    private final int min;
-    @Getter
-    private final int max;
+    private final int min, max;
 
     private IntPropertyType(String name, int min, int max, Integer defaultData) {
         super(name, IntStream.range(min, max + 1).boxed().toList(), defaultData, Utils.computeRequiredBits(max - min + 1));
         this.min = min;
         this.max = max;
-        cachedValues = new IntPropertyValue[max + 1 - min];
+
+        this.cachedValues = new IntPropertyValue[max + 1 - min];
         for (int i = min; i <= max; i++) {
-            IntPropertyValue value = new IntPropertyValue(i);
-            cachedValues[i] = value;
+            this.cachedValues[i] = new IntPropertyValue(i);
         }
     }
 
diff --git a/Allay-API/src/main/java/org/allaymc/api/blockentity/BlockEntityHelper.java b/Allay-API/src/main/java/org/allaymc/api/blockentity/BlockEntityHelper.java
index 31f98c825..7cc70a024 100644
--- a/Allay-API/src/main/java/org/allaymc/api/blockentity/BlockEntityHelper.java
+++ b/Allay-API/src/main/java/org/allaymc/api/blockentity/BlockEntityHelper.java
@@ -1,5 +1,6 @@
 package org.allaymc.api.blockentity;
 
+import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 import org.allaymc.api.blockentity.init.SimpleBlockEntityInitInfo;
 import org.allaymc.api.blockentity.registry.BlockEntityTypeRegistry;
@@ -12,12 +13,13 @@
  * @author daoge_cmd
  */
 @Slf4j
+@UtilityClass
 public final class BlockEntityHelper {
     public static BlockEntity fromNBT(Dimension dimension, NbtMap nbt) {
         var id = nbt.getString("id");
         var blockEntityType = BlockEntityTypeRegistry.getRegistry().get(id);
         if (blockEntityType == null) {
-            log.warn("Unknown block entity type: " + id);
+            log.warn("Unknown block entity type: {}", id);
             return null;
         }
         return blockEntityType.createBlockEntity(SimpleBlockEntityInitInfo.builder().dimension(dimension).nbt(nbt).build());
diff --git a/Allay-API/src/main/java/org/allaymc/api/blockentity/init/SimpleBlockEntityInitInfo.java b/Allay-API/src/main/java/org/allaymc/api/blockentity/init/SimpleBlockEntityInitInfo.java
index 03b34a25f..8e5e3a1cb 100644
--- a/Allay-API/src/main/java/org/allaymc/api/blockentity/init/SimpleBlockEntityInitInfo.java
+++ b/Allay-API/src/main/java/org/allaymc/api/blockentity/init/SimpleBlockEntityInitInfo.java
@@ -1,6 +1,8 @@
 package org.allaymc.api.blockentity.init;
 
+import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import org.allaymc.api.blockentity.BlockEntity;
 import org.allaymc.api.blockentity.type.BlockEntityType;
@@ -13,6 +15,7 @@
  *
  * @author daoge_cmd
  */
+@RequiredArgsConstructor(access = AccessLevel.PROTECTED)
 public class SimpleBlockEntityInitInfo<T extends BlockEntity> implements BlockEntityInitInfo<T> {
     private final Dimension dimension;
     private final NbtMap nbt;
@@ -20,11 +23,6 @@ public class SimpleBlockEntityInitInfo<T extends BlockEntity> implements BlockEn
     @Setter
     private BlockEntityType<T> blockEntityType;
 
-    protected SimpleBlockEntityInitInfo(Dimension dimension, NbtMap nbt) {
-        this.dimension = dimension;
-        this.nbt = nbt;
-    }
-
     public static Builder builder() {
         return new Builder();
     }
diff --git a/Allay-API/src/main/java/org/allaymc/api/blockentity/interfaces/BlockEntityBarrel.java b/Allay-API/src/main/java/org/allaymc/api/blockentity/interfaces/BlockEntityBarrel.java
index d9907e844..1b9407ee0 100644
--- a/Allay-API/src/main/java/org/allaymc/api/blockentity/interfaces/BlockEntityBarrel.java
+++ b/Allay-API/src/main/java/org/allaymc/api/blockentity/interfaces/BlockEntityBarrel.java
@@ -9,5 +9,4 @@
  * @author daoge_cmd
  */
 public interface BlockEntityBarrel extends BlockEntity, BlockEntityContainerHolderComponent {
-
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/client/data/Abilities.java b/Allay-API/src/main/java/org/allaymc/api/client/data/Abilities.java
index 693b739c1..52f972c04 100644
--- a/Allay-API/src/main/java/org/allaymc/api/client/data/Abilities.java
+++ b/Allay-API/src/main/java/org/allaymc/api/client/data/Abilities.java
@@ -23,6 +23,7 @@
  *
  * @author daoge_cmd
  */
+@Getter
 public final class Abilities {
 
     public static final float DEFAULT_WALK_SPEED = 0.1f;
@@ -32,12 +33,9 @@ public final class Abilities {
 
     private final EntityPlayer player;
 
-    @Getter
     private float walkSpeed = DEFAULT_WALK_SPEED;
-    @Getter
     private float flySpeed = DEFAULT_FLY_SPEED;
 
-    @Getter
     private boolean dirty = false;
 
     public Abilities(EntityPlayer player) {
@@ -56,7 +54,7 @@ public Abilities(EntityPlayer player) {
 
     public void applyGameType(GameType gameType) {
         var tree = player.getPermTree();
-        // 只设置必须设置的权限
+        // Set only necessary permissions
         tree.setPerm(PermKeys.BUILD, gameType != GameType.SPECTATOR);
         tree.setPerm(PermKeys.MINE, gameType != GameType.SPECTATOR);
         tree.setPerm(PermKeys.DOORS_AND_SWITCHES, gameType != GameType.SPECTATOR);
@@ -64,12 +62,13 @@ public void applyGameType(GameType gameType) {
         tree.setPerm(PermKeys.ATTACK_PLAYERS, gameType != GameType.SPECTATOR);
         tree.setPerm(PermKeys.ATTACK_MOBS, gameType != GameType.SPECTATOR);
         tree.setPerm(PermKeys.MAY_FLY, gameType != GameType.SURVIVAL && gameType != GameType.ADVENTURE);
-        // 不需要管SUMMON_LIGHTNING和CHAT，让插件可以控制而不会在切换模式后重置
-        // 以下的几个能力不需要集成到权限树里面
+        // Do not need to manage SUMMON_LIGHTNING and CHAT;
+        // allow plugins to control without resetting after mode switch
+        // The following abilities do not need to be integrated into the permission tree
         set(Ability.NO_CLIP, gameType == GameType.SPECTATOR);
         set(Ability.FLYING, gameType == GameType.SPECTATOR);
         set(Ability.INSTABUILD, gameType == GameType.CREATIVE);
-        // 这边设置这个OPERATOR_COMMANDS的目的仅仅是让OP客户端能显示快捷指令
+        // The purpose of setting OPERATOR_COMMANDS here is solely to allow OP clients to display quick commands
         set(Ability.OPERATOR_COMMANDS, player.isOp());
         set(Ability.TELEPORT, true);
         dirty = true;
@@ -136,10 +135,11 @@ private Consumer<PermTree.PermChangeType> syncTo(Ability ability, boolean revers
     private UpdateAbilitiesPacket createUpdateAbilitiesPacket() {
         UpdateAbilitiesPacket updateAbilitiesPacket = new UpdateAbilitiesPacket();
         updateAbilitiesPacket.setUniqueEntityId(player.getRuntimeId());
-        // 这边设置的命令权限其实没啥用，主要作用是让op能拥有快捷指令选项
-        // 若此玩家没有指定命令的权限，命令描述压根就不会发到客户端
+        // The command permissions set here are actually not very useful;
+        // their main function is to allow OPs to have quick command options
+        // If this player does not have specific command permissions, the command description won't even be sent to the client
         updateAbilitiesPacket.setCommandPermission(player.isOp() ? CommandPermission.GAME_DIRECTORS : CommandPermission.ANY);
-        // TODO: 检查旧的写法原因
+        // TODO: Check reasons for the old writing style
         updateAbilitiesPacket.setPlayerPermission(player.isOp() /*&& player.getGameType() != GameType.SPECTATOR*/ ? PlayerPermission.OPERATOR : PlayerPermission.MEMBER);
         return updateAbilitiesPacket;
     }
diff --git a/Allay-API/src/main/java/org/allaymc/api/client/data/AdventureSettings.java b/Allay-API/src/main/java/org/allaymc/api/client/data/AdventureSettings.java
index ff91c7b27..e9a4c7b4b 100644
--- a/Allay-API/src/main/java/org/allaymc/api/client/data/AdventureSettings.java
+++ b/Allay-API/src/main/java/org/allaymc/api/client/data/AdventureSettings.java
@@ -20,12 +20,12 @@
 public final class AdventureSettings {
 
     private final EntityPlayer player;
+
     private boolean noPVM = false;
     private boolean noMVP = false;
     private boolean immutableWorld = false;
     private boolean showNameTags = true;
     private boolean autoJump = true;
-    @Getter
     private boolean dirty = false;
 
     public AdventureSettings(EntityPlayer player) {
diff --git a/Allay-API/src/main/java/org/allaymc/api/client/data/Device.java b/Allay-API/src/main/java/org/allaymc/api/client/data/Device.java
index 5e5c2d456..5e0052e96 100644
--- a/Allay-API/src/main/java/org/allaymc/api/client/data/Device.java
+++ b/Allay-API/src/main/java/org/allaymc/api/client/data/Device.java
@@ -1,5 +1,6 @@
 package org.allaymc.api.client.data;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
@@ -8,8 +9,8 @@
  * @author LucGamesYT | daoge_cmd
  */
 @Getter
+@AllArgsConstructor
 public enum Device {
-
     UNKNOWN(-1),
     ANDROID(1),
     IOS(2),
@@ -28,10 +29,6 @@ public enum Device {
 
     private final int id;
 
-    Device(int id) {
-        this.id = id;
-    }
-
     public static Device getDevice(int id) {
         return switch (id) {
             case 1 -> ANDROID;
diff --git a/Allay-API/src/main/java/org/allaymc/api/client/data/DeviceInfo.java b/Allay-API/src/main/java/org/allaymc/api/client/data/DeviceInfo.java
index b6ee81358..50de3c798 100644
--- a/Allay-API/src/main/java/org/allaymc/api/client/data/DeviceInfo.java
+++ b/Allay-API/src/main/java/org/allaymc/api/client/data/DeviceInfo.java
@@ -1,29 +1,15 @@
 package org.allaymc.api.client.data;
 
-import lombok.Getter;
-import lombok.ToString;
-
 /**
  * Allay Project 2023/6/23
  *
  * @author LucGamesYT | daoge_cmd
  */
-@Getter
-@ToString
-public class DeviceInfo {
-
-    private final String deviceName;
-    private final String deviceId;
-    private final long clientId;
-    private final Device device;
-    private final UIProfile UIProfile;
-
-    public DeviceInfo(String deviceName, String deviceId, long clientId, Device device, UIProfile UIProfile) {
-        this.deviceName = deviceName;
-        this.deviceId = deviceId;
-        this.clientId = clientId;
-        this.device = device;
-        this.UIProfile = UIProfile;
-    }
-
+public record DeviceInfo(
+        String deviceName,
+        String deviceId,
+        long clientId,
+        Device device,
+        UIProfile UIProfile
+) {
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/client/data/LoginData.java b/Allay-API/src/main/java/org/allaymc/api/client/data/LoginData.java
index 498e9e38a..2170e4e16 100644
--- a/Allay-API/src/main/java/org/allaymc/api/client/data/LoginData.java
+++ b/Allay-API/src/main/java/org/allaymc/api/client/data/LoginData.java
@@ -75,7 +75,8 @@ private void decodeSkinData(String skinData) {
 
         JsonObject skinMap = decodeToken(skinData);
         if (skinMap.has("DeviceModel") && skinMap.has("DeviceId") &&
-                skinMap.has("ClientRandomId") && skinMap.has("DeviceOS") && skinMap.has("GuiScale")) {
+            skinMap.has("ClientRandomId") && skinMap.has("DeviceOS") &&
+            skinMap.has("GuiScale")) {
             String deviceModel = skinMap.get("DeviceModel").getAsString();
             String deviceId = skinMap.get("DeviceId").getAsString();
             long clientId = skinMap.get("ClientRandomId").getAsLong();
diff --git a/Allay-API/src/main/java/org/allaymc/api/client/data/UIProfile.java b/Allay-API/src/main/java/org/allaymc/api/client/data/UIProfile.java
index 9a863a6ca..4546c0b51 100644
--- a/Allay-API/src/main/java/org/allaymc/api/client/data/UIProfile.java
+++ b/Allay-API/src/main/java/org/allaymc/api/client/data/UIProfile.java
@@ -6,7 +6,6 @@
  * @author LucGamesYT | daoge_cmd
  */
 public enum UIProfile {
-
     CLASSIC,
     POCKET;
 
@@ -17,5 +16,4 @@ public static UIProfile getById(int id) {
             default -> null;
         };
     }
-
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/client/skin/Image.java b/Allay-API/src/main/java/org/allaymc/api/client/skin/Image.java
index 3cdd86ce8..1b776cfe7 100644
--- a/Allay-API/src/main/java/org/allaymc/api/client/skin/Image.java
+++ b/Allay-API/src/main/java/org/allaymc/api/client/skin/Image.java
@@ -6,7 +6,6 @@
  * @author LucGamesYT | daoge_cmd
  */
 public record Image(int width, int height, byte[] data) {
-
     public static Image getImage(byte[] data) {
         return switch (data.length) {
             case Skin.SINGLE_SKIN_SIZE -> new Image(64, 32, data);
diff --git a/Allay-API/src/main/java/org/allaymc/api/client/skin/PersonaPiece.java b/Allay-API/src/main/java/org/allaymc/api/client/skin/PersonaPiece.java
index 76bba5a96..092e65ea1 100644
--- a/Allay-API/src/main/java/org/allaymc/api/client/skin/PersonaPiece.java
+++ b/Allay-API/src/main/java/org/allaymc/api/client/skin/PersonaPiece.java
@@ -5,6 +5,11 @@
  *
  * @author LucGamesYT | daoge_cmd
  */
-public record PersonaPiece(String pieceId, String pieceType, String packId, String productId, boolean isDefault) {
-
+public record PersonaPiece(
+        String pieceId,
+        String pieceType,
+        String packId,
+        String productId,
+        boolean isDefault
+) {
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/client/skin/PersonaPieceTint.java b/Allay-API/src/main/java/org/allaymc/api/client/skin/PersonaPieceTint.java
index ffaf12c6b..5907454b6 100644
--- a/Allay-API/src/main/java/org/allaymc/api/client/skin/PersonaPieceTint.java
+++ b/Allay-API/src/main/java/org/allaymc/api/client/skin/PersonaPieceTint.java
@@ -8,5 +8,4 @@
  * @author LucGamesYT | daoge_cmd
  */
 public record PersonaPieceTint(String pieceType, List<String> colors) {
-
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/client/skin/Skin.java b/Allay-API/src/main/java/org/allaymc/api/client/skin/Skin.java
index a3aa5f4b1..cd1f2ccd4 100644
--- a/Allay-API/src/main/java/org/allaymc/api/client/skin/Skin.java
+++ b/Allay-API/src/main/java/org/allaymc/api/client/skin/Skin.java
@@ -124,7 +124,13 @@ public static Skin fromFile(File file) {
     }
 
     public static String legacyGeometryName(String geometryName) {
-        return "{\"geometry\" : {\"default\" : \"" + geometryName + "\"}}";
+        return """
+                {
+                  "geometry": {
+                    "default": "%s"
+                  }
+                }
+                """.formatted(geometryName);
     }
 
     public static Image parseBufferedImage(BufferedImage image) {
@@ -232,8 +238,8 @@ public boolean isValid() {
 
     private boolean isValidSkin() {
         return skinId != null && !skinId.trim().isEmpty() &&
-                skinData != null && skinData.width() >= 64 && skinData.height() >= 32 &&
-                skinData.data().length >= SINGLE_SKIN_SIZE;
+               skinData != null && skinData.width() >= 64 && skinData.height() >= 32 &&
+               skinData.data().length >= SINGLE_SKIN_SIZE;
     }
 
     private boolean isValidResourcePatch() {
diff --git a/Allay-API/src/main/java/org/allaymc/api/client/skin/SkinAnimation.java b/Allay-API/src/main/java/org/allaymc/api/client/skin/SkinAnimation.java
index 12264644a..595a3c90f 100644
--- a/Allay-API/src/main/java/org/allaymc/api/client/skin/SkinAnimation.java
+++ b/Allay-API/src/main/java/org/allaymc/api/client/skin/SkinAnimation.java
@@ -6,5 +6,4 @@
  * @author LucGamesYT | daoge_cmd
  */
 public record SkinAnimation(Image image, int type, float frames, int expression) {
-
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/command/CommandRegistry.java b/Allay-API/src/main/java/org/allaymc/api/command/CommandRegistry.java
index df4f072a5..0f301504a 100644
--- a/Allay-API/src/main/java/org/allaymc/api/command/CommandRegistry.java
+++ b/Allay-API/src/main/java/org/allaymc/api/command/CommandRegistry.java
@@ -25,10 +25,10 @@ public interface CommandRegistry extends MappedRegistry<String, Command, Map<Str
     Command unregister(String name);
 
     /**
-     * @param sender 命令发送者
-     * @param cmd    命令，不包含斜杠
+     * @param sender The command sender
+     * @param cmd    The command, without the slash (/)
      *
-     * @return 命令执行结果
+     * @return The command execution result
      */
     CommandResult execute(CommandSender sender, String cmd);
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/command/CommandSender.java b/Allay-API/src/main/java/org/allaymc/api/command/CommandSender.java
index ba4f4b9c1..132436a91 100644
--- a/Allay-API/src/main/java/org/allaymc/api/command/CommandSender.java
+++ b/Allay-API/src/main/java/org/allaymc/api/command/CommandSender.java
@@ -26,52 +26,47 @@ public interface CommandSender extends TextReceiver, Permissible {
     default void handleResult(CommandResult result) {
         if (result.context() == null) return;
         if (getCmdExecuteLocation().dimension().getWorld().getWorldData().getGameRule(GameRule.SEND_COMMAND_FEEDBACK)) {
+            var status = result.status();
+            var outputs = result.context().getOutputs().toArray(TrContainer[]::new);
             if (result.isSuccess()) {
-                Server.getInstance().broadcastCommandOutputs(this, result.status(), result.context().getOutputs().toArray(TrContainer[]::new));
+                Server.getInstance().broadcastCommandOutputs(this, status, outputs);
             } else {
-                // 如果报错了就只给自己发消息
-                sendCommandOutputs(this, result.status(), result.context().getOutputs().toArray(TrContainer[]::new));
+                // If there is an error, only send message to oneself
+                sendCommandOutputs(this, status, outputs);
             }
         }
     }
 
     /**
-     * @return 发送者是否为玩家<br>whether the sender is a player
+     * @return Whether the sender is a player
      */
     default boolean isPlayer() {
         return false;
     }
 
     /**
-     * 请使用这个方法来检查发送者是否是一个实体，而不是使用代码{@code "xxx instanceof Entity"}.<br>
-     * 因为发送者可能不是{@code "Entity"}的一个实例，但实际上它是以一个实体的身份执行命令(例如：{@code "ExecutorCommandSender"})
-     * <p>
-     * please use this method to check whether the sender is an entity instead of using code {@code "xxx instanceof Entity"} <br>
-     * because the sender may not an instance of {@code "Entity"} but in fact it is executing commands identity as an entity(eg: {@code "ExecutorCommandSender"})
+     * Please use this method to check whether the sender is an entity instead of using code {@code "xxx instanceof Entity"}.
+     * Because the sender may not be an instance of {@code "Entity"} but is executing commands as an entity (e.g., {@code "ExecutorCommandSender"}).
      *
-     * @return 发送者是否为实体<br>whether the sender is an entity
+     * @return Whether the sender is an entity
      */
     default boolean isEntity() {
         return false;
     }
 
     /**
-     * 如果发送者是一个实体，返回执行该命令的实体.
-     * <p>
-     * return the entity who execute the command if the sender is a entity.
+     * If the sender is an entity, returns the entity executing the command.
      *
-     * @return 实体对象<br>Entity instance
+     * @return Entity instance
      */
     default Entity asEntity() {
         return null;
     }
 
     /**
-     * 如果发送者是一个玩家，返回执行该命令的玩家.
-     * <p>
-     * return the player who execute the command if the sender is a player.
+     * If the sender is a player, returns the player executing the command.
      *
-     * @return 玩家对象<br>Player instance
+     * @return Player instance
      */
     default EntityPlayer asPlayer() {
         return null;
diff --git a/Allay-API/src/main/java/org/allaymc/api/command/NPCCommandSender.java b/Allay-API/src/main/java/org/allaymc/api/command/NPCCommandSender.java
index bf66d3911..a9eb2ee1b 100644
--- a/Allay-API/src/main/java/org/allaymc/api/command/NPCCommandSender.java
+++ b/Allay-API/src/main/java/org/allaymc/api/command/NPCCommandSender.java
@@ -22,6 +22,7 @@
 public class NPCCommandSender implements CommandSender {
 
     private static final CommandOriginData NPC_COMMAND_ORIGIN_DATA = new CommandOriginData(CommandOriginType.ENTITY, UUID.randomUUID(), "", 0);
+
     protected EntityNpc npc;
     protected EntityPlayer initiator;
 
diff --git a/Allay-API/src/main/java/org/allaymc/api/command/SenderType.java b/Allay-API/src/main/java/org/allaymc/api/command/SenderType.java
index cfbd6354c..3b6d60ff3 100644
--- a/Allay-API/src/main/java/org/allaymc/api/command/SenderType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/command/SenderType.java
@@ -17,7 +17,6 @@ public record SenderType<SENDER_TYPE extends CommandSender>(
     public static SenderType<CommandSender> ANY = new SenderType<>(sender -> true, cs -> cs, ""); // Can't be a wrong executor
     public static SenderType<Server> SERVER = new SenderType<>(Server.class::isInstance, Server.class::cast, TrKeys.A_COMMAND_GENERIC_SENDER_NOTSERVER);
     public static SenderType<EntityPlayer> PLAYER = new SenderType<>(CommandSender::isPlayer, CommandSender::asPlayer, TrKeys.A_COMMAND_GENERIC_SENDER_NOTPLAYER);
-    // TODO: entity sender type
     public static SenderType<Entity> ENTITY = new SenderType<>(CommandSender::isEntity, CommandSender::asEntity, TrKeys.A_COMMAND_GENERIC_SENDER_NOTENTITY);
 
     public boolean validate(CommandSender sender) {
diff --git a/Allay-API/src/main/java/org/allaymc/api/command/exception/CommandParseException.java b/Allay-API/src/main/java/org/allaymc/api/command/exception/CommandParseException.java
index 5d19b9f83..2ad23be7a 100644
--- a/Allay-API/src/main/java/org/allaymc/api/command/exception/CommandParseException.java
+++ b/Allay-API/src/main/java/org/allaymc/api/command/exception/CommandParseException.java
@@ -6,9 +6,6 @@
  * @author daoge_cmd
  */
 public class CommandParseException extends RuntimeException {
-    public CommandParseException() {
-    }
-
     public CommandParseException(String message) {
         super(message);
     }
diff --git a/Allay-API/src/main/java/org/allaymc/api/command/selector/EntitySelectorAPI.java b/Allay-API/src/main/java/org/allaymc/api/command/selector/EntitySelectorAPI.java
index ec82ec90a..a34fb1935 100644
--- a/Allay-API/src/main/java/org/allaymc/api/command/selector/EntitySelectorAPI.java
+++ b/Allay-API/src/main/java/org/allaymc/api/command/selector/EntitySelectorAPI.java
@@ -24,30 +24,32 @@ static EntitySelectorAPI getAPI() {
     }
 
     /**
-     * 通过给定的命令发送者和目标选择器文本匹配实体
+     * Matches entities based on the given command sender and target selector token.
      *
-     * @param sender 命令发送者
-     * @param token  目标选择器文本
+     * @param sender the command sender
+     * @param token  the target selector token
      *
-     * @return 目标实体
+     * @return the list of matched entities
+     *
+     * @throws SelectorSyntaxException if there is a syntax error in the selector token
      */
     List<Entity> matchEntities(CommandSender sender, String token) throws SelectorSyntaxException;
 
     /**
-     * 检查给定文本是否是合法目标选择器
+     * Checks if the given token is a valid target selector.
      *
-     * @param token 给定文本
+     * @param token the token to check
      *
-     * @return 是否是合法目标选择器
+     * @return true if the token is a valid target selector, false otherwise
      */
     boolean checkValid(String token);
 
     /**
-     * 注册一个选择器参数
+     * Registers a selector argument.
      *
-     * @param argument 选择器参数对象
+     * @param argument the selector argument to register
      *
-     * @return 是否注册成功（若已存在相同key值的选择器参数则注册失败，返回false）
+     * @return true if registration is successful (returns false if an argument with the same key already exists)
      */
     boolean registerArgument(SelectorArgument argument);
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/command/selector/SelectorSyntaxException.java b/Allay-API/src/main/java/org/allaymc/api/command/selector/SelectorSyntaxException.java
index 392093409..e8a7462bc 100644
--- a/Allay-API/src/main/java/org/allaymc/api/command/selector/SelectorSyntaxException.java
+++ b/Allay-API/src/main/java/org/allaymc/api/command/selector/SelectorSyntaxException.java
@@ -1,10 +1,6 @@
 package org.allaymc.api.command.selector;
 
-
 public class SelectorSyntaxException extends Exception {
-
-    public SelectorSyntaxException() {}
-
     public SelectorSyntaxException(String message) {
         super(message);
     }
@@ -26,7 +22,7 @@ public String getMessage() {
         var builder = new StringBuilder(super.getMessage());
         Throwable t = this;
         while (t.getCause() != null) {
-            //到达最底层
+            // Reached the bottom level
             t = t.getCause();
             builder.append("\n");
             builder.append("§cCaused by ");
diff --git a/Allay-API/src/main/java/org/allaymc/api/command/selector/SelectorType.java b/Allay-API/src/main/java/org/allaymc/api/command/selector/SelectorType.java
index ccf40b401..8ec3724bc 100644
--- a/Allay-API/src/main/java/org/allaymc/api/command/selector/SelectorType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/command/selector/SelectorType.java
@@ -1,27 +1,25 @@
 package org.allaymc.api.command.selector;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 所有可能的选择器类型
+ * All possible selector types
  */
+@Getter
+@AllArgsConstructor
 public enum SelectorType {
     ALL_PLAYERS("a"),
     ALL_ENTITIES("e"),
-    //可通过指定type选择随机非玩家实体
-    //https://zh.minecraft.wiki/w/%E7%9B%AE%E6%A0%87%E9%80%89%E6%8B%A9%E5%99%A8
+    // Can choose random non-player entities by specifying type
+    // https://zh.minecraft.wiki/w/%E7%9B%AE%E6%A0%87%E9%80%89%E6%8B%A9%E5%99%A8
     RANDOM_PLAYER("r"),
     SELF("s"),
     NEAREST_PLAYER("p"),
     NPC_INITIATOR("initiator");
 
-    @Getter
     private final String token;
 
-    SelectorType(String token) {
-        this.token = token;
-    }
-
     public static SelectorType parseSelectorType(String type) throws SelectorSyntaxException {
         return switch (type) {
             case "a" -> SelectorType.ALL_PLAYERS;
@@ -33,5 +31,4 @@ public static SelectorType parseSelectorType(String type) throws SelectorSyntaxE
             default -> throw new SelectorSyntaxException("Unknown selector type: " + type);
         };
     }
-
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/command/selector/args/CachedFilterSelectorArgument.java b/Allay-API/src/main/java/org/allaymc/api/command/selector/args/CachedFilterSelectorArgument.java
index 201972c6e..74bc87d96 100644
--- a/Allay-API/src/main/java/org/allaymc/api/command/selector/args/CachedFilterSelectorArgument.java
+++ b/Allay-API/src/main/java/org/allaymc/api/command/selector/args/CachedFilterSelectorArgument.java
@@ -15,15 +15,12 @@
 import java.util.function.Function;
 
 /**
- * 与{@link CachedSimpleSelectorArgument}类似，但是适用于过滤器模式。此处不做过多解释<p/>
+ * Similar to {@link CachedSimpleSelectorArgument}, but designed for filter mode. No further explanation is provided here.<p/>
  *
  * @see CachedSimpleSelectorArgument
  */
-
-
 public abstract class CachedFilterSelectorArgument implements SelectorArgument {
-
-    Cache<Set<String>, Function<List<Entity>, List<Entity>>> cache;
+    private final Cache<Set<String>, Function<List<Entity>, List<Entity>>> cache;
 
     public CachedFilterSelectorArgument() {
         this.cache = provideCacheService();
@@ -45,13 +42,14 @@ public boolean isFilter() {
     }
 
     /**
-     * 当未在缓存中找到解析结果时，则调用此方法对参数进行解析
+     * Called when parsing the parameters if the parsing result is not found in the cache
      */
     protected abstract Function<List<Entity>, List<Entity>> cache(SelectorType selectorType, CommandSender sender, Location3fc basePos, String... arguments) throws SelectorSyntaxException;
 
     /**
-     * 初始化缓存时调用此方法<p/>
-     * 若需要自己的缓存实现，则可覆写此方法
+     * Called when initializing the cache
+     * <p>
+     * Override this method if you need your own cache implementation
      *
      * @return {@code Cache<Set<String>, Function<List<Entity>, List<Entity>>>}
      */
diff --git a/Allay-API/src/main/java/org/allaymc/api/command/selector/args/CachedSimpleSelectorArgument.java b/Allay-API/src/main/java/org/allaymc/api/command/selector/args/CachedSimpleSelectorArgument.java
index 73c856b9f..f9d3a1b78 100644
--- a/Allay-API/src/main/java/org/allaymc/api/command/selector/args/CachedSimpleSelectorArgument.java
+++ b/Allay-API/src/main/java/org/allaymc/api/command/selector/args/CachedSimpleSelectorArgument.java
@@ -15,14 +15,12 @@
 import java.util.function.Predicate;
 
 /**
- * 可缓存的目标选择器参数基类<p/>
- * 若一个选择器的参数返回的{@code List<Predicate<Entity>>}不具有时效性，则可继承此类实现对解析结果的缓存，提高性能
+ * Cachable base class for target selector arguments
+ * <p>
+ * If a selector argument returns {@code List<Predicate<Entity>>} without expiration, you can inherit from this class to cache the parsing results for better performance.
  */
-
-
 public abstract class CachedSimpleSelectorArgument implements SelectorArgument {
-
-    Cache<Set<String>, Predicate<Entity>> cache;
+    private final Cache<Set<String>, Predicate<Entity>> cache;
 
     public CachedSimpleSelectorArgument() {
         this.cache = provideCacheService();
@@ -39,13 +37,14 @@ public Predicate<Entity> getPredicate(SelectorType selectorType, CommandSender s
     }
 
     /**
-     * 当未在缓存中找到解析结果时，则调用此方法对参数进行解析
+     * Called when parsing the parameters if the parsing result is not found in the cache
      */
     protected abstract Predicate<Entity> cache(SelectorType selectorType, CommandSender sender, Location3fc basePos, String... arguments) throws SelectorSyntaxException;
 
     /**
-     * 初始化缓存时调用此方法<p/>
-     * 若需要自己的缓存实现，则可覆写此方法
+     * Called when initializing the cache
+     * <p>
+     * Override this method if you need your own cache implementation
      *
      * @return {@code Cache<Set<String>, Predicate<Entity>>}
      */
diff --git a/Allay-API/src/main/java/org/allaymc/api/command/selector/args/SelectorArgument.java b/Allay-API/src/main/java/org/allaymc/api/command/selector/args/SelectorArgument.java
index 11ac01c38..53966c074 100644
--- a/Allay-API/src/main/java/org/allaymc/api/command/selector/args/SelectorArgument.java
+++ b/Allay-API/src/main/java/org/allaymc/api/command/selector/args/SelectorArgument.java
@@ -15,24 +15,24 @@
 import java.util.function.Predicate;
 
 /**
- * 此接口描述了一个选择器参数<p/>
+ * This interface describes a selector argument.
  */
-
-
 public interface SelectorArgument extends Comparable<SelectorArgument> {
     /**
-     * 根据给定的参数表返回特定的{@code List<Predicate<Entity>>}
+     * Returns a specific {@code List<Predicate<Entity>>} based on the given arguments table.
      *
-     * @param arguments    参数列表
-     * @param selectorType 选择器类型
-     * @param sender       命令发送者
-     * @param basePos      若此参数解析需要用到相对坐标，则应该以此坐标为依据<p/>
-     *                     若此参数需要修改参照坐标(例如x,y,z参数)，则应当在这个参数上修改<p/>
-     *                     在一条解析链上的参数只会使用一个Location对象
+     * @param arguments    the arguments list
+     * @param selectorType the selector type
+     * @param sender       the command sender
+     * @param basePos      if this argument parsing requires relative coordinates, it should be based on this coordinate.
+     *                     <p>
+     *                     If this parameter needs to modify the reference coordinates (such as x, y, z parameters), it should be modified on this parameter.
+     *                     <p>
+     *                     Only one Location object will be used on a parsing chain.
      *
      * @return {@code Predicate<Entity>}
      *
-     * @throws SelectorSyntaxException 当解析出错
+     * @throws SelectorSyntaxException when parsing error occurs
      */
     @Nullable
     default Predicate<Entity> getPredicate(SelectorType selectorType, CommandSender sender, Location3f basePos, String... arguments) throws SelectorSyntaxException {
@@ -40,59 +40,66 @@ default Predicate<Entity> getPredicate(SelectorType selectorType, CommandSender
     }
 
     /**
-     * 仅当方法isFilter()返回true时调用此方法<p/>
-     * 方法返回的实体集合将传递到下一个参数
+     * This method is called only when {@code isFilter()} method returns true.
+     * <p>
+     * The entity collection returned by this method will be passed to the next parameter.
      *
-     * @param arguments    参数列表
-     * @param selectorType 选择器类型
-     * @param sender       命令发送者
-     * @param basePos      若此参数解析需要用到相对坐标，则应该以此坐标为依据<p/>
-     *                     若此参数需要修改参照坐标(例如x,y,z参数)，则应当在这个参数上修改<p/>
-     *                     在一条解析链上的参数只会使用一个Location对象
+     * @param arguments    the arguments list
+     * @param selectorType the selector type
+     * @param sender       the command sender
+     * @param basePos      if this argument parsing requires relative coordinates, it should be based on this coordinate.
+     *                     <p>
+     *                     If this parameter needs to modify the reference coordinates (such as x, y, z parameters), it should be modified on this parameter.
+     *                     <p>
+     *                     Only one Location object will be used on a parsing chain.
      *
-     * @return 实体过滤器
+     * @return entity filter
      *
-     * @throws SelectorSyntaxException 当解析出错
+     * @throws SelectorSyntaxException when parsing error occurs
      */
     default Function<List<Entity>, List<Entity>> getFilter(SelectorType selectorType, CommandSender sender, Location3fc basePos, String... arguments) throws SelectorSyntaxException {
         return null;
     }
 
     /**
-     * 获取此参数的名称
+     * Gets the name of this argument.
      *
-     * @return 参数名称
+     * @return argument name
      */
     String getKeyName();
 
     /**
-     * 解析优先级定义了各个参数的解析顺序<p/>
-     * 优先级越高(数字越小)的参数，其越先被解析，且其解析结果将会影响下个参数的解析
+     * Parsing priority defines the parsing order of each parameter.
+     * <p>
+     * The higher the priority (the smaller the number), the earlier the parameter is parsed, and its parsing result will affect the parsing of the next parameter.
      *
-     * @return 此参数的解析优先级
+     * @return the parsing priority of this argument
      */
     int getPriority();
 
     /**
-     * 是否启用过滤器模式<p/>
-     * 若一个参数为过滤器模式，解析器将不会调用getPredicate()方法而是调用filter()方法<p/>
-     * 这意味着参数将对到达此参数节点的所有实体进行检测，而不是相对于单个实体进行检测<p/>
-     * 对于部分参数（例如"c"），需要启用此功能
+     * Whether filter mode is enabled.
+     * <p>
+     * If a parameter is in filter mode, the parser will not call {@code getPredicate()} method but {@code filter()} method instead.
+     * <p>
+     * This means the parameter will check all entities reaching this parameter node instead of relative to a single entity.
+     * <p>
+     * For some parameters (e.g., "c"), this feature needs to be enabled.
      *
-     * @return 是否启用过滤器模式
+     * @return whether filter mode is enabled
      */
     default boolean isFilter() {
         return false;
     }
 
     /**
-     * 若一个参数有默认值（即此方法返回非null值），则在解析时若给定参数表中没有此参数，会以此默认值参与解析
+     * If a parameter has a default value (i.e., this method returns a non-null value), it will participate in parsing if this parameter is not present in the given argument table.
      *
-     * @param values       参数列表
-     * @param selectorType 选择器类型
-     * @param sender       命令执行者
+     * @param values       the argument map
+     * @param selectorType the selector type
+     * @param sender       the command executor
      *
-     * @return 此参数的默认值
+     * @return the default value of this argument
      */
     @Nullable
     default String getDefaultValue(Map<String, List<String>> values, SelectorType selectorType, CommandSender sender) {
diff --git a/Allay-API/src/main/java/org/allaymc/api/command/tree/BaseNode.java b/Allay-API/src/main/java/org/allaymc/api/command/tree/BaseNode.java
index cad09d923..a74b04bae 100644
--- a/Allay-API/src/main/java/org/allaymc/api/command/tree/BaseNode.java
+++ b/Allay-API/src/main/java/org/allaymc/api/command/tree/BaseNode.java
@@ -70,17 +70,17 @@ public boolean isOptional() {
 
     @Override
     public CommandNode optional() {
-        // 无需重复设置
+        // No need to set again if already optional
         if (optional) return this;
-        //一个节点下只能有一个可选参数
+        // A node can only have one optional leaf
         if (parent.getOptionalLeaf() != null) {
             throw new IllegalArgumentException("A node can only have one optional leaf node");
         }
         this.optional = true;
         parent.setOptionalLeaf(this);
-        // 若节点是可选的，则最小参数消耗为0，否则为1（不允许非可选节点不消耗参数）
+        // If the node is optional, minimum argument cost is 0, otherwise it's 1
         setMinArgCostBranch(optional ? 0 : 1);
-        // 更新分支最小参数消耗（optional不影响最大参数消耗）
+        // Update minimum argument cost for branches (optional does not affect maximum argument cost)
         updateMinArgCostBranch(this);
         return this;
     }
@@ -129,7 +129,7 @@ public CommandNode nextNode(CommandContext context) {
         } else {
             var optionalLeaf = getOptionalLeaf();
             if (optionalLeaf != null) {
-                // 忽略RootNode，所以说索引为optionalLeaf.depth() - 1
+                // Ignore RootNode, so the index is optionalLeaf.depth() - 1
                 context.putResult(optionalLeaf.getDefaultValue());
                 return optionalLeaf;
             }
@@ -155,8 +155,8 @@ public CommandNode addLeaf(CommandNode leaf) {
         leaf.setDepth(depth + 1);
         leaf.setMaxArgCostBranch(leaf.getMaxArgCost());
         updateMaxArgCostBranch(leaf);
-        // 可选参数后不能有非可选参数
-        // 分支最小参数消耗在optional()中更新
+        // Optional parameters cannot be followed by non-optional parameters
+        // Minimum argument cost for branches is updated in optional()
         if (optional) {
             leaf.optional();
         }
diff --git a/Allay-API/src/main/java/org/allaymc/api/command/tree/CommandNode.java b/Allay-API/src/main/java/org/allaymc/api/command/tree/CommandNode.java
index b8022f8d2..93f9ac397 100644
--- a/Allay-API/src/main/java/org/allaymc/api/command/tree/CommandNode.java
+++ b/Allay-API/src/main/java/org/allaymc/api/command/tree/CommandNode.java
@@ -30,21 +30,23 @@ public interface CommandNode {
     Object getDefaultValue();
 
     /**
-     * @return 选中这个分支后消耗的最小参数数量
+     * @return The minimum number of arguments consumed after selecting this branch
      */
     int getMinArgCostBranch();
 
     void setMinArgCostBranch(int minArgCostBranch);
 
     /**
-     * @return 选中这个分支后后消耗的最大参数数量
+     * @return The maximum number of arguments consumed after selecting this branch
      */
     int getMaxArgCostBranch();
 
     void setMaxArgCostBranch(int maxArgCostBranch);
 
     /**
-     * @return 这个node最多会消耗几个参数，可以返回一个足够大的数来表示无穷
+     * @return The maximum number of arguments this node can consume;
+     * <p>
+     * return a sufficiently large number to indicate infinity
      */
     default int getMaxArgCost() {
         return 1;
diff --git a/Allay-API/src/main/java/org/allaymc/api/component/annotation/Dependency.java b/Allay-API/src/main/java/org/allaymc/api/component/annotation/Dependency.java
index c4a8be332..ae1874b63 100644
--- a/Allay-API/src/main/java/org/allaymc/api/component/annotation/Dependency.java
+++ b/Allay-API/src/main/java/org/allaymc/api/component/annotation/Dependency.java
@@ -8,10 +8,14 @@
 import java.lang.annotation.Target;
 
 /**
- * This annotation is used to declare other components that one component depends on <br/>
- * This annotation needs to be marked on a field of the component's implementation class <br/>
- * When building an object, the injector checks the field list of each component implementation class instance and checks whether the fields are marked by this annotation <br/>
- * If so, the injector will try to find the corresponding component instance through inheritance relationships (if identifier is empty) or through identifier (if identifier is not empty), and inject it into the field <br/>
+ * This annotation is used to declare other components that one component depends on.
+ * <p>
+ * This annotation needs to be marked on a field of the component's implementation class.
+ * <p>
+ * When building an object, the injector checks the field list of each component implementation class instance and checks whether the fields are marked by this annotation.
+ * <p>
+ * If so, the injector will try to find the corresponding component instance through inheritance relationships (if identifier is empty) or through identifier (if identifier is not empty), and inject it into the field.
+ * <p>
  * The scope of dependency lookup is limited by the list of components provided to the injector, and if the dependency is not found, will throw {@link ComponentInjectException}
  * <p>
  * Allay Project 2023/3/4
diff --git a/Allay-API/src/main/java/org/allaymc/api/component/interfaces/Component.java b/Allay-API/src/main/java/org/allaymc/api/component/interfaces/Component.java
index 288260bce..5d12e7709 100644
--- a/Allay-API/src/main/java/org/allaymc/api/component/interfaces/Component.java
+++ b/Allay-API/src/main/java/org/allaymc/api/component/interfaces/Component.java
@@ -1,13 +1,16 @@
 package org.allaymc.api.component.interfaces;
 
+import org.allaymc.api.component.annotation.ComponentIdentifier;
 import org.allaymc.api.component.annotation.DoNotInject;
 
 /**
- * Describe the implementation of a component <br>
- * Any component implementation needs to implement this interface, otherwise obviously you can't pass it into the injector <br>
+ * Describe the implementation of a component.
  * <p>
- * The namespace ID of this component implementation will be used when injecting component dependencies <br>
- * Which should be a 'static' constant annotated with {@link org.allaymc.api.component.annotation.ComponentIdentifier} <br>
+ * Any component implementation needs to implement this interface, otherwise obviously you can't pass it into the injector.
+ * <p>
+ * The namespace ID of this component implementation will be used when injecting component dependencies.
+ * <p>
+ * Which should be a 'static' constant annotated with {@link ComponentIdentifier}.
  * <p>
  * Allay Project 2023/3/4
  *
diff --git a/Allay-API/src/main/java/org/allaymc/api/component/interfaces/ComponentInitInfo.java b/Allay-API/src/main/java/org/allaymc/api/component/interfaces/ComponentInitInfo.java
index f0bbba1fd..4b78c7d14 100644
--- a/Allay-API/src/main/java/org/allaymc/api/component/interfaces/ComponentInitInfo.java
+++ b/Allay-API/src/main/java/org/allaymc/api/component/interfaces/ComponentInitInfo.java
@@ -9,6 +9,5 @@ public interface ComponentInitInfo {
 
     ComponentInitInfo EMPTY = new Empty();
 
-    class Empty implements ComponentInitInfo {
-    }
+    class Empty implements ComponentInitInfo {}
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/component/interfaces/ComponentInjector.java b/Allay-API/src/main/java/org/allaymc/api/component/interfaces/ComponentInjector.java
index 382d33caa..d9198f390 100644
--- a/Allay-API/src/main/java/org/allaymc/api/component/interfaces/ComponentInjector.java
+++ b/Allay-API/src/main/java/org/allaymc/api/component/interfaces/ComponentInjector.java
@@ -32,9 +32,11 @@ static <U> ComponentInjector<U> createInjector() {
     ComponentInjector<T> interfaceClass(Class<T> interfaceClass);
 
     /**
-     * Bind a set of implementations for the injector <br>
-     * When the dynamic class is instantiated, the component instance will be obtained from the Provider <br>
-     * If there are multiple implementation methods for a method to be injected, they will be executed in the order in the component list <p>
+     * Bind a set of implementations for the injector.
+     * <p>
+     * When the dynamic class is instantiated, the component instance will be obtained from the Provider.
+     * <p>
+     * If there are multiple implementation methods for a method to be injected, they will be executed in the order in the component list
      * and the return value is the return value of the last executed method
      *
      * @param providers component providers
@@ -46,7 +48,8 @@ static <U> ComponentInjector<U> createInjector() {
     ComponentInjector<T> useCachedClass(Class<T> cachedClass);
 
     /**
-     * Build the class<br/>
+     * Build the class.
+     * <p>
      * Note that we guarantee that the returned class implements the {@link ComponentedObject} interface
      *
      * @return the class
diff --git a/Allay-API/src/main/java/org/allaymc/api/component/interfaces/ComponentProvider.java b/Allay-API/src/main/java/org/allaymc/api/component/interfaces/ComponentProvider.java
index 73b13059f..07826356a 100644
--- a/Allay-API/src/main/java/org/allaymc/api/component/interfaces/ComponentProvider.java
+++ b/Allay-API/src/main/java/org/allaymc/api/component/interfaces/ComponentProvider.java
@@ -44,7 +44,6 @@ static <P extends Component> Map<Identifier, ComponentProvider<? extends P>> toM
     }
 
     @SneakyThrows
-
     static Identifier findComponentIdentifier(Class<?> clazz) {
         Identifier identifier = null;
         while (identifier == null) {
@@ -56,7 +55,6 @@ static Identifier findComponentIdentifier(Class<?> clazz) {
     }
 
     @SneakyThrows
-
     static Identifier findComponentIdentifierInCertainClass(Class<?> clazz) {
         for (var field : clazz.getDeclaredFields()) {
             if (field.isAnnotationPresent(ComponentIdentifier.class) && Identifier.class == field.getType() && isStatic(field.getModifiers())) {
@@ -72,15 +70,14 @@ static Identifier findComponentIdentifierInCertainClass(Class<?> clazz) {
     Class<?> getComponentClass();
 
     @SneakyThrows
-
     default Identifier findComponentIdentifier() {
         return findComponentIdentifier(getComponentClass());
     }
 
+    @Getter
     @AllArgsConstructor
     class SimpleComponentProvider<T extends Component, I extends ComponentInitInfo> implements ComponentProvider<T> {
         private Function<I, T> provider;
-        @Getter
         private Class<?> componentClass;
 
         @Override
diff --git a/Allay-API/src/main/java/org/allaymc/api/component/interfaces/ComponentedObject.java b/Allay-API/src/main/java/org/allaymc/api/component/interfaces/ComponentedObject.java
index 0e1e34435..509c3802a 100644
--- a/Allay-API/src/main/java/org/allaymc/api/component/interfaces/ComponentedObject.java
+++ b/Allay-API/src/main/java/org/allaymc/api/component/interfaces/ComponentedObject.java
@@ -3,8 +3,9 @@
 import java.util.List;
 
 /**
- * The object which has been built by {@link ComponentInjector} <br/>
- * Any class spawned from {@link ComponentInjector} will implement this interface and can be used for judgment
+ * The object which has been built by {@link ComponentInjector}.
+ * <p>
+ * Any class spawned from {@link ComponentInjector} will implement this interface and can be used for judgment.
  * <p>
  * Allay Project 2023/3/4
  *
diff --git a/Allay-API/src/main/java/org/allaymc/api/container/impl/PlayerInventoryContainer.java b/Allay-API/src/main/java/org/allaymc/api/container/impl/PlayerInventoryContainer.java
index a8ee8091a..50e0d0928 100644
--- a/Allay-API/src/main/java/org/allaymc/api/container/impl/PlayerInventoryContainer.java
+++ b/Allay-API/src/main/java/org/allaymc/api/container/impl/PlayerInventoryContainer.java
@@ -3,7 +3,6 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.allaymc.api.container.BaseContainer;
-import org.allaymc.api.container.ContainerViewer;
 import org.allaymc.api.container.FullContainerType;
 import org.allaymc.api.entity.interfaces.EntityPlayer;
 import org.allaymc.api.item.ItemStack;
diff --git a/Allay-API/src/main/java/org/allaymc/api/data/VanillaBlockPropertyTypes.java b/Allay-API/src/main/java/org/allaymc/api/data/VanillaBlockPropertyTypes.java
index c5a11ff5c..35226bff8 100644
--- a/Allay-API/src/main/java/org/allaymc/api/data/VanillaBlockPropertyTypes.java
+++ b/Allay-API/src/main/java/org/allaymc/api/data/VanillaBlockPropertyTypes.java
@@ -1,316 +1,280 @@
 package org.allaymc.api.data;
 
-import java.util.List;
-import org.allaymc.api.block.property.enums.Attachment;
-import org.allaymc.api.block.property.enums.BambooLeafSize;
-import org.allaymc.api.block.property.enums.BambooStalkThickness;
-import org.allaymc.api.block.property.enums.BigDripleafTilt;
-import org.allaymc.api.block.property.enums.CauldronLiquid;
-import org.allaymc.api.block.property.enums.ChemistryTableType;
-import org.allaymc.api.block.property.enums.ChiselType;
-import org.allaymc.api.block.property.enums.CrackedState;
-import org.allaymc.api.block.property.enums.Damage;
-import org.allaymc.api.block.property.enums.DirtType;
-import org.allaymc.api.block.property.enums.DripstoneThickness;
-import org.allaymc.api.block.property.enums.LeverDirection;
-import org.allaymc.api.block.property.enums.MinecraftBlockFace;
-import org.allaymc.api.block.property.enums.MinecraftCardinalDirection;
-import org.allaymc.api.block.property.enums.MinecraftFacingDirection;
-import org.allaymc.api.block.property.enums.MinecraftVerticalHalf;
-import org.allaymc.api.block.property.enums.MonsterEggStoneType;
-import org.allaymc.api.block.property.enums.Orientation;
-import org.allaymc.api.block.property.enums.PillarAxis;
-import org.allaymc.api.block.property.enums.PortalAxis;
-import org.allaymc.api.block.property.enums.PrismarineBlockType;
-import org.allaymc.api.block.property.enums.SandStoneType;
-import org.allaymc.api.block.property.enums.SandType;
-import org.allaymc.api.block.property.enums.SeaGrassType;
-import org.allaymc.api.block.property.enums.SpongeType;
-import org.allaymc.api.block.property.enums.StoneBrickType;
-import org.allaymc.api.block.property.enums.StoneSlabType;
-import org.allaymc.api.block.property.enums.StoneSlabType2;
-import org.allaymc.api.block.property.enums.StoneSlabType3;
-import org.allaymc.api.block.property.enums.StoneSlabType4;
-import org.allaymc.api.block.property.enums.StructureBlockType;
-import org.allaymc.api.block.property.enums.StructureVoidType;
-import org.allaymc.api.block.property.enums.TorchFacingDirection;
-import org.allaymc.api.block.property.enums.TurtleEggCount;
-import org.allaymc.api.block.property.enums.VaultState;
-import org.allaymc.api.block.property.enums.WallBlockType;
-import org.allaymc.api.block.property.enums.WallConnectionTypeEast;
-import org.allaymc.api.block.property.enums.WallConnectionTypeNorth;
-import org.allaymc.api.block.property.enums.WallConnectionTypeSouth;
-import org.allaymc.api.block.property.enums.WallConnectionTypeWest;
+import org.allaymc.api.block.property.enums.*;
 import org.allaymc.api.block.property.type.BlockPropertyType;
 import org.allaymc.api.block.property.type.BooleanPropertyType;
 import org.allaymc.api.block.property.type.EnumPropertyType;
 import org.allaymc.api.block.property.type.IntPropertyType;
 
+import java.util.List;
+
 /**
- * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
- * Allay Project <p>
+ * Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+ * <p>
+ * Allay Project
+ *
  * @author daoge_cmd
  */
 public interface VanillaBlockPropertyTypes {
-  BooleanPropertyType ACTIVE = BooleanPropertyType.of("active", false);
+    BooleanPropertyType ACTIVE = BooleanPropertyType.of("active", false);
 
-  IntPropertyType AGE_16 = IntPropertyType.of("age", 0, 15, 0);
+    IntPropertyType AGE_16 = IntPropertyType.of("age", 0, 15, 0);
 
-  IntPropertyType AGE_3 = IntPropertyType.of("age", 0, 2, 0);
+    IntPropertyType AGE_3 = IntPropertyType.of("age", 0, 2, 0);
 
-  IntPropertyType AGE_4 = IntPropertyType.of("age", 0, 3, 0);
+    IntPropertyType AGE_4 = IntPropertyType.of("age", 0, 3, 0);
 
-  IntPropertyType AGE_6 = IntPropertyType.of("age", 0, 5, 0);
+    IntPropertyType AGE_6 = IntPropertyType.of("age", 0, 5, 0);
 
-  BooleanPropertyType AGE_BIT = BooleanPropertyType.of("age_bit", false);
+    BooleanPropertyType AGE_BIT = BooleanPropertyType.of("age_bit", false);
 
-  BooleanPropertyType ALLOW_UNDERWATER_BIT = BooleanPropertyType.of("allow_underwater_bit", false);
+    BooleanPropertyType ALLOW_UNDERWATER_BIT = BooleanPropertyType.of("allow_underwater_bit", false);
 
-  BooleanPropertyType ATTACHED_BIT = BooleanPropertyType.of("attached_bit", false);
+    BooleanPropertyType ATTACHED_BIT = BooleanPropertyType.of("attached_bit", false);
 
-  EnumPropertyType<Attachment> ATTACHMENT = EnumPropertyType.of("attachment" ,Attachment.class ,Attachment.values()[0]);
+    EnumPropertyType<Attachment> ATTACHMENT = EnumPropertyType.of("attachment", Attachment.class, Attachment.values()[0]);
 
-  EnumPropertyType<BambooLeafSize> BAMBOO_LEAF_SIZE = EnumPropertyType.of("bamboo_leaf_size" ,BambooLeafSize.class ,BambooLeafSize.values()[0]);
+    EnumPropertyType<BambooLeafSize> BAMBOO_LEAF_SIZE = EnumPropertyType.of("bamboo_leaf_size", BambooLeafSize.class, BambooLeafSize.values()[0]);
 
-  EnumPropertyType<BambooStalkThickness> BAMBOO_STALK_THICKNESS = EnumPropertyType.of("bamboo_stalk_thickness" ,BambooStalkThickness.class ,BambooStalkThickness.values()[0]);
+    EnumPropertyType<BambooStalkThickness> BAMBOO_STALK_THICKNESS = EnumPropertyType.of("bamboo_stalk_thickness", BambooStalkThickness.class, BambooStalkThickness.values()[0]);
 
-  BooleanPropertyType BIG_DRIPLEAF_HEAD = BooleanPropertyType.of("big_dripleaf_head", false);
+    BooleanPropertyType BIG_DRIPLEAF_HEAD = BooleanPropertyType.of("big_dripleaf_head", false);
 
-  EnumPropertyType<BigDripleafTilt> BIG_DRIPLEAF_TILT = EnumPropertyType.of("big_dripleaf_tilt" ,BigDripleafTilt.class ,BigDripleafTilt.values()[0]);
+    EnumPropertyType<BigDripleafTilt> BIG_DRIPLEAF_TILT = EnumPropertyType.of("big_dripleaf_tilt", BigDripleafTilt.class, BigDripleafTilt.values()[0]);
 
-  IntPropertyType BITE_COUNTER = IntPropertyType.of("bite_counter", 0, 6, 0);
+    IntPropertyType BITE_COUNTER = IntPropertyType.of("bite_counter", 0, 6, 0);
 
-  IntPropertyType BLOCK_LIGHT_LEVEL = IntPropertyType.of("block_light_level", 0, 15, 0);
+    IntPropertyType BLOCK_LIGHT_LEVEL = IntPropertyType.of("block_light_level", 0, 15, 0);
 
-  BooleanPropertyType BLOOM = BooleanPropertyType.of("bloom", false);
+    BooleanPropertyType BLOOM = BooleanPropertyType.of("bloom", false);
 
-  IntPropertyType BOOKS_STORED = IntPropertyType.of("books_stored", 0, 63, 0);
+    IntPropertyType BOOKS_STORED = IntPropertyType.of("books_stored", 0, 63, 0);
 
-  BooleanPropertyType BREWING_STAND_SLOT_A_BIT = BooleanPropertyType.of("brewing_stand_slot_a_bit", false);
+    BooleanPropertyType BREWING_STAND_SLOT_A_BIT = BooleanPropertyType.of("brewing_stand_slot_a_bit", false);
 
-  BooleanPropertyType BREWING_STAND_SLOT_B_BIT = BooleanPropertyType.of("brewing_stand_slot_b_bit", false);
+    BooleanPropertyType BREWING_STAND_SLOT_B_BIT = BooleanPropertyType.of("brewing_stand_slot_b_bit", false);
 
-  BooleanPropertyType BREWING_STAND_SLOT_C_BIT = BooleanPropertyType.of("brewing_stand_slot_c_bit", false);
+    BooleanPropertyType BREWING_STAND_SLOT_C_BIT = BooleanPropertyType.of("brewing_stand_slot_c_bit", false);
 
-  IntPropertyType BRUSHED_PROGRESS = IntPropertyType.of("brushed_progress", 0, 3, 0);
+    IntPropertyType BRUSHED_PROGRESS = IntPropertyType.of("brushed_progress", 0, 3, 0);
 
-  BooleanPropertyType BUTTON_PRESSED_BIT = BooleanPropertyType.of("button_pressed_bit", false);
+    BooleanPropertyType BUTTON_PRESSED_BIT = BooleanPropertyType.of("button_pressed_bit", false);
 
-  BooleanPropertyType CAN_SUMMON = BooleanPropertyType.of("can_summon", false);
+    BooleanPropertyType CAN_SUMMON = BooleanPropertyType.of("can_summon", false);
 
-  IntPropertyType CANDLES = IntPropertyType.of("candles", 0, 3, 0);
+    IntPropertyType CANDLES = IntPropertyType.of("candles", 0, 3, 0);
 
-  EnumPropertyType<CauldronLiquid> CAULDRON_LIQUID = EnumPropertyType.of("cauldron_liquid" ,CauldronLiquid.class ,CauldronLiquid.values()[0]);
+    EnumPropertyType<CauldronLiquid> CAULDRON_LIQUID = EnumPropertyType.of("cauldron_liquid", CauldronLiquid.class, CauldronLiquid.values()[0]);
 
-  EnumPropertyType<ChemistryTableType> CHEMISTRY_TABLE_TYPE = EnumPropertyType.of("chemistry_table_type" ,ChemistryTableType.class ,ChemistryTableType.values()[0]);
+    EnumPropertyType<ChemistryTableType> CHEMISTRY_TABLE_TYPE = EnumPropertyType.of("chemistry_table_type", ChemistryTableType.class, ChemistryTableType.values()[0]);
 
-  EnumPropertyType<ChiselType> CHISEL_TYPE = EnumPropertyType.of("chisel_type" ,ChiselType.class ,ChiselType.values()[0]);
+    EnumPropertyType<ChiselType> CHISEL_TYPE = EnumPropertyType.of("chisel_type", ChiselType.class, ChiselType.values()[0]);
 
-  IntPropertyType CLUSTER_COUNT = IntPropertyType.of("cluster_count", 0, 3, 0);
+    IntPropertyType CLUSTER_COUNT = IntPropertyType.of("cluster_count", 0, 3, 0);
 
-  BooleanPropertyType COLOR_BIT = BooleanPropertyType.of("color_bit", false);
+    BooleanPropertyType COLOR_BIT = BooleanPropertyType.of("color_bit", false);
 
-  IntPropertyType COMPOSTER_FILL_LEVEL = IntPropertyType.of("composter_fill_level", 0, 8, 0);
+    IntPropertyType COMPOSTER_FILL_LEVEL = IntPropertyType.of("composter_fill_level", 0, 8, 0);
 
-  BooleanPropertyType CONDITIONAL_BIT = BooleanPropertyType.of("conditional_bit", false);
+    BooleanPropertyType CONDITIONAL_BIT = BooleanPropertyType.of("conditional_bit", false);
 
-  IntPropertyType CORAL_DIRECTION = IntPropertyType.of("coral_direction", 0, 3, 0);
+    IntPropertyType CORAL_DIRECTION = IntPropertyType.of("coral_direction", 0, 3, 0);
 
-  IntPropertyType CORAL_FAN_DIRECTION = IntPropertyType.of("coral_fan_direction", 0, 1, 0);
+    IntPropertyType CORAL_FAN_DIRECTION = IntPropertyType.of("coral_fan_direction", 0, 1, 0);
 
-  BooleanPropertyType CORAL_HANG_TYPE_BIT = BooleanPropertyType.of("coral_hang_type_bit", false);
+    BooleanPropertyType CORAL_HANG_TYPE_BIT = BooleanPropertyType.of("coral_hang_type_bit", false);
 
-  BooleanPropertyType COVERED_BIT = BooleanPropertyType.of("covered_bit", false);
+    BooleanPropertyType COVERED_BIT = BooleanPropertyType.of("covered_bit", false);
 
-  EnumPropertyType<CrackedState> CRACKED_STATE = EnumPropertyType.of("cracked_state" ,CrackedState.class ,CrackedState.values()[0]);
+    EnumPropertyType<CrackedState> CRACKED_STATE = EnumPropertyType.of("cracked_state", CrackedState.class, CrackedState.values()[0]);
 
-  BooleanPropertyType CRAFTING = BooleanPropertyType.of("crafting", false);
+    BooleanPropertyType CRAFTING = BooleanPropertyType.of("crafting", false);
 
-  EnumPropertyType<Damage> DAMAGE = EnumPropertyType.of("damage" ,Damage.class ,Damage.values()[0]);
+    EnumPropertyType<Damage> DAMAGE = EnumPropertyType.of("damage", Damage.class, Damage.values()[0]);
 
-  BooleanPropertyType DEAD_BIT = BooleanPropertyType.of("dead_bit", false);
+    BooleanPropertyType DEAD_BIT = BooleanPropertyType.of("dead_bit", false);
 
-  IntPropertyType DEPRECATED = IntPropertyType.of("deprecated", 0, 3, 0);
+    IntPropertyType DEPRECATED = IntPropertyType.of("deprecated", 0, 3, 0);
 
-  IntPropertyType DIRECTION = IntPropertyType.of("direction", 0, 3, 0);
+    IntPropertyType DIRECTION = IntPropertyType.of("direction", 0, 3, 0);
 
-  EnumPropertyType<DirtType> DIRT_TYPE = EnumPropertyType.of("dirt_type" ,DirtType.class ,DirtType.values()[0]);
+    EnumPropertyType<DirtType> DIRT_TYPE = EnumPropertyType.of("dirt_type", DirtType.class, DirtType.values()[0]);
 
-  BooleanPropertyType DISARMED_BIT = BooleanPropertyType.of("disarmed_bit", false);
+    BooleanPropertyType DISARMED_BIT = BooleanPropertyType.of("disarmed_bit", false);
 
-  BooleanPropertyType DOOR_HINGE_BIT = BooleanPropertyType.of("door_hinge_bit", false);
+    BooleanPropertyType DOOR_HINGE_BIT = BooleanPropertyType.of("door_hinge_bit", false);
 
-  BooleanPropertyType DRAG_DOWN = BooleanPropertyType.of("drag_down", false);
+    BooleanPropertyType DRAG_DOWN = BooleanPropertyType.of("drag_down", false);
 
-  EnumPropertyType<DripstoneThickness> DRIPSTONE_THICKNESS = EnumPropertyType.of("dripstone_thickness" ,DripstoneThickness.class ,DripstoneThickness.values()[0]);
+    EnumPropertyType<DripstoneThickness> DRIPSTONE_THICKNESS = EnumPropertyType.of("dripstone_thickness", DripstoneThickness.class, DripstoneThickness.values()[0]);
 
-  BooleanPropertyType END_PORTAL_EYE_BIT = BooleanPropertyType.of("end_portal_eye_bit", false);
+    BooleanPropertyType END_PORTAL_EYE_BIT = BooleanPropertyType.of("end_portal_eye_bit", false);
 
-  BooleanPropertyType EXPLODE_BIT = BooleanPropertyType.of("explode_bit", false);
+    BooleanPropertyType EXPLODE_BIT = BooleanPropertyType.of("explode_bit", false);
 
-  BooleanPropertyType EXTINGUISHED = BooleanPropertyType.of("extinguished", false);
+    BooleanPropertyType EXTINGUISHED = BooleanPropertyType.of("extinguished", false);
 
-  IntPropertyType FACING_DIRECTION = IntPropertyType.of("facing_direction", 0, 5, 0);
+    IntPropertyType FACING_DIRECTION = IntPropertyType.of("facing_direction", 0, 5, 0);
 
-  IntPropertyType FILL_LEVEL = IntPropertyType.of("fill_level", 0, 6, 0);
+    IntPropertyType FILL_LEVEL = IntPropertyType.of("fill_level", 0, 6, 0);
 
-  IntPropertyType GROUND_SIGN_DIRECTION = IntPropertyType.of("ground_sign_direction", 0, 15, 0);
+    IntPropertyType GROUND_SIGN_DIRECTION = IntPropertyType.of("ground_sign_direction", 0, 15, 0);
 
-  IntPropertyType GROWING_PLANT_AGE = IntPropertyType.of("growing_plant_age", 0, 25, 0);
+    IntPropertyType GROWING_PLANT_AGE = IntPropertyType.of("growing_plant_age", 0, 25, 0);
 
-  IntPropertyType GROWTH = IntPropertyType.of("growth", 0, 7, 0);
+    IntPropertyType GROWTH = IntPropertyType.of("growth", 0, 7, 0);
 
-  BooleanPropertyType HANGING = BooleanPropertyType.of("hanging", false);
+    BooleanPropertyType HANGING = BooleanPropertyType.of("hanging", false);
 
-  BooleanPropertyType HEAD_PIECE_BIT = BooleanPropertyType.of("head_piece_bit", false);
+    BooleanPropertyType HEAD_PIECE_BIT = BooleanPropertyType.of("head_piece_bit", false);
 
-  IntPropertyType HEIGHT = IntPropertyType.of("height", 0, 7, 0);
+    IntPropertyType HEIGHT = IntPropertyType.of("height", 0, 7, 0);
 
-  IntPropertyType HONEY_LEVEL = IntPropertyType.of("honey_level", 0, 5, 0);
+    IntPropertyType HONEY_LEVEL = IntPropertyType.of("honey_level", 0, 5, 0);
 
-  IntPropertyType HUGE_MUSHROOM_BITS = IntPropertyType.of("huge_mushroom_bits", 0, 15, 0);
+    IntPropertyType HUGE_MUSHROOM_BITS = IntPropertyType.of("huge_mushroom_bits", 0, 15, 0);
 
-  BooleanPropertyType IN_WALL_BIT = BooleanPropertyType.of("in_wall_bit", false);
+    BooleanPropertyType IN_WALL_BIT = BooleanPropertyType.of("in_wall_bit", false);
 
-  BooleanPropertyType INFINIBURN_BIT = BooleanPropertyType.of("infiniburn_bit", false);
+    BooleanPropertyType INFINIBURN_BIT = BooleanPropertyType.of("infiniburn_bit", false);
 
-  BooleanPropertyType ITEM_FRAME_MAP_BIT = BooleanPropertyType.of("item_frame_map_bit", false);
+    BooleanPropertyType ITEM_FRAME_MAP_BIT = BooleanPropertyType.of("item_frame_map_bit", false);
 
-  BooleanPropertyType ITEM_FRAME_PHOTO_BIT = BooleanPropertyType.of("item_frame_photo_bit", false);
+    BooleanPropertyType ITEM_FRAME_PHOTO_BIT = BooleanPropertyType.of("item_frame_photo_bit", false);
 
-  IntPropertyType KELP_AGE = IntPropertyType.of("kelp_age", 0, 25, 0);
+    IntPropertyType KELP_AGE = IntPropertyType.of("kelp_age", 0, 25, 0);
 
-  EnumPropertyType<LeverDirection> LEVER_DIRECTION = EnumPropertyType.of("lever_direction" ,LeverDirection.class ,LeverDirection.values()[0]);
+    EnumPropertyType<LeverDirection> LEVER_DIRECTION = EnumPropertyType.of("lever_direction", LeverDirection.class, LeverDirection.values()[0]);
 
-  IntPropertyType LIQUID_DEPTH = IntPropertyType.of("liquid_depth", 0, 15, 0);
+    IntPropertyType LIQUID_DEPTH = IntPropertyType.of("liquid_depth", 0, 15, 0);
 
-  BooleanPropertyType LIT = BooleanPropertyType.of("lit", false);
+    BooleanPropertyType LIT = BooleanPropertyType.of("lit", false);
 
-  EnumPropertyType<MinecraftBlockFace> MINECRAFT_BLOCK_FACE = EnumPropertyType.of("minecraft:block_face" ,MinecraftBlockFace.class ,MinecraftBlockFace.values()[0]);
+    EnumPropertyType<MinecraftBlockFace> MINECRAFT_BLOCK_FACE = EnumPropertyType.of("minecraft:block_face", MinecraftBlockFace.class, MinecraftBlockFace.values()[0]);
 
-  EnumPropertyType<MinecraftCardinalDirection> MINECRAFT_CARDINAL_DIRECTION = EnumPropertyType.of("minecraft:cardinal_direction" ,MinecraftCardinalDirection.class ,MinecraftCardinalDirection.values()[0]);
+    EnumPropertyType<MinecraftCardinalDirection> MINECRAFT_CARDINAL_DIRECTION = EnumPropertyType.of("minecraft:cardinal_direction", MinecraftCardinalDirection.class, MinecraftCardinalDirection.values()[0]);
 
-  EnumPropertyType<MinecraftFacingDirection> MINECRAFT_FACING_DIRECTION = EnumPropertyType.of("minecraft:facing_direction" ,MinecraftFacingDirection.class ,MinecraftFacingDirection.values()[0]);
+    EnumPropertyType<MinecraftFacingDirection> MINECRAFT_FACING_DIRECTION = EnumPropertyType.of("minecraft:facing_direction", MinecraftFacingDirection.class, MinecraftFacingDirection.values()[0]);
 
-  EnumPropertyType<MinecraftVerticalHalf> MINECRAFT_VERTICAL_HALF = EnumPropertyType.of("minecraft:vertical_half" ,MinecraftVerticalHalf.class ,MinecraftVerticalHalf.values()[0]);
+    EnumPropertyType<MinecraftVerticalHalf> MINECRAFT_VERTICAL_HALF = EnumPropertyType.of("minecraft:vertical_half", MinecraftVerticalHalf.class, MinecraftVerticalHalf.values()[0]);
 
-  IntPropertyType MOISTURIZED_AMOUNT = IntPropertyType.of("moisturized_amount", 0, 7, 0);
+    IntPropertyType MOISTURIZED_AMOUNT = IntPropertyType.of("moisturized_amount", 0, 7, 0);
 
-  EnumPropertyType<MonsterEggStoneType> MONSTER_EGG_STONE_TYPE = EnumPropertyType.of("monster_egg_stone_type" ,MonsterEggStoneType.class ,MonsterEggStoneType.values()[0]);
+    EnumPropertyType<MonsterEggStoneType> MONSTER_EGG_STONE_TYPE = EnumPropertyType.of("monster_egg_stone_type", MonsterEggStoneType.class, MonsterEggStoneType.values()[0]);
 
-  IntPropertyType MULTI_FACE_DIRECTION_BITS = IntPropertyType.of("multi_face_direction_bits", 0, 63, 0);
+    IntPropertyType MULTI_FACE_DIRECTION_BITS = IntPropertyType.of("multi_face_direction_bits", 0, 63, 0);
 
-  BooleanPropertyType OCCUPIED_BIT = BooleanPropertyType.of("occupied_bit", false);
+    BooleanPropertyType OCCUPIED_BIT = BooleanPropertyType.of("occupied_bit", false);
 
-  BooleanPropertyType OMINOUS = BooleanPropertyType.of("ominous", false);
+    BooleanPropertyType OMINOUS = BooleanPropertyType.of("ominous", false);
 
-  BooleanPropertyType OPEN_BIT = BooleanPropertyType.of("open_bit", false);
+    BooleanPropertyType OPEN_BIT = BooleanPropertyType.of("open_bit", false);
 
-  EnumPropertyType<Orientation> ORIENTATION = EnumPropertyType.of("orientation" ,Orientation.class ,Orientation.values()[0]);
+    EnumPropertyType<Orientation> ORIENTATION = EnumPropertyType.of("orientation", Orientation.class, Orientation.values()[0]);
 
-  BooleanPropertyType OUTPUT_LIT_BIT = BooleanPropertyType.of("output_lit_bit", false);
+    BooleanPropertyType OUTPUT_LIT_BIT = BooleanPropertyType.of("output_lit_bit", false);
 
-  BooleanPropertyType OUTPUT_SUBTRACT_BIT = BooleanPropertyType.of("output_subtract_bit", false);
+    BooleanPropertyType OUTPUT_SUBTRACT_BIT = BooleanPropertyType.of("output_subtract_bit", false);
 
-  BooleanPropertyType PERSISTENT_BIT = BooleanPropertyType.of("persistent_bit", false);
+    BooleanPropertyType PERSISTENT_BIT = BooleanPropertyType.of("persistent_bit", false);
 
-  EnumPropertyType<PillarAxis> PILLAR_AXIS = EnumPropertyType.of("pillar_axis" ,PillarAxis.class ,PillarAxis.values()[0]);
+    EnumPropertyType<PillarAxis> PILLAR_AXIS = EnumPropertyType.of("pillar_axis", PillarAxis.class, PillarAxis.values()[0]);
 
-  EnumPropertyType<PortalAxis> PORTAL_AXIS = EnumPropertyType.of("portal_axis" ,PortalAxis.class ,PortalAxis.values()[0]);
+    EnumPropertyType<PortalAxis> PORTAL_AXIS = EnumPropertyType.of("portal_axis", PortalAxis.class, PortalAxis.values()[0]);
 
-  BooleanPropertyType POWERED_BIT = BooleanPropertyType.of("powered_bit", false);
+    BooleanPropertyType POWERED_BIT = BooleanPropertyType.of("powered_bit", false);
 
-  EnumPropertyType<PrismarineBlockType> PRISMARINE_BLOCK_TYPE = EnumPropertyType.of("prismarine_block_type" ,PrismarineBlockType.class ,PrismarineBlockType.values()[0]);
+    EnumPropertyType<PrismarineBlockType> PRISMARINE_BLOCK_TYPE = EnumPropertyType.of("prismarine_block_type", PrismarineBlockType.class, PrismarineBlockType.values()[0]);
 
-  IntPropertyType PROPAGULE_STAGE = IntPropertyType.of("propagule_stage", 0, 4, 0);
+    IntPropertyType PROPAGULE_STAGE = IntPropertyType.of("propagule_stage", 0, 4, 0);
 
-  BooleanPropertyType RAIL_DATA_BIT = BooleanPropertyType.of("rail_data_bit", false);
+    BooleanPropertyType RAIL_DATA_BIT = BooleanPropertyType.of("rail_data_bit", false);
 
-  IntPropertyType RAIL_DIRECTION_10 = IntPropertyType.of("rail_direction", 0, 9, 0);
+    IntPropertyType RAIL_DIRECTION_10 = IntPropertyType.of("rail_direction", 0, 9, 0);
 
-  IntPropertyType RAIL_DIRECTION_6 = IntPropertyType.of("rail_direction", 0, 5, 0);
+    IntPropertyType RAIL_DIRECTION_6 = IntPropertyType.of("rail_direction", 0, 5, 0);
 
-  IntPropertyType REDSTONE_SIGNAL = IntPropertyType.of("redstone_signal", 0, 15, 0);
+    IntPropertyType REDSTONE_SIGNAL = IntPropertyType.of("redstone_signal", 0, 15, 0);
 
-  IntPropertyType REPEATER_DELAY = IntPropertyType.of("repeater_delay", 0, 3, 0);
+    IntPropertyType REPEATER_DELAY = IntPropertyType.of("repeater_delay", 0, 3, 0);
 
-  IntPropertyType RESPAWN_ANCHOR_CHARGE = IntPropertyType.of("respawn_anchor_charge", 0, 4, 0);
+    IntPropertyType RESPAWN_ANCHOR_CHARGE = IntPropertyType.of("respawn_anchor_charge", 0, 4, 0);
 
-  IntPropertyType ROTATION = IntPropertyType.of("rotation", 0, 3, 0);
+    IntPropertyType ROTATION = IntPropertyType.of("rotation", 0, 3, 0);
 
-  EnumPropertyType<SandStoneType> SAND_STONE_TYPE = EnumPropertyType.of("sand_stone_type" ,SandStoneType.class ,SandStoneType.values()[0]);
+    EnumPropertyType<SandStoneType> SAND_STONE_TYPE = EnumPropertyType.of("sand_stone_type", SandStoneType.class, SandStoneType.values()[0]);
 
-  EnumPropertyType<SandType> SAND_TYPE = EnumPropertyType.of("sand_type" ,SandType.class ,SandType.values()[0]);
+    EnumPropertyType<SandType> SAND_TYPE = EnumPropertyType.of("sand_type", SandType.class, SandType.values()[0]);
 
-  IntPropertyType SCULK_SENSOR_PHASE = IntPropertyType.of("sculk_sensor_phase", 0, 2, 0);
+    IntPropertyType SCULK_SENSOR_PHASE = IntPropertyType.of("sculk_sensor_phase", 0, 2, 0);
 
-  EnumPropertyType<SeaGrassType> SEA_GRASS_TYPE = EnumPropertyType.of("sea_grass_type" ,SeaGrassType.class ,SeaGrassType.values()[0]);
+    EnumPropertyType<SeaGrassType> SEA_GRASS_TYPE = EnumPropertyType.of("sea_grass_type", SeaGrassType.class, SeaGrassType.values()[0]);
 
-  EnumPropertyType<SpongeType> SPONGE_TYPE = EnumPropertyType.of("sponge_type" ,SpongeType.class ,SpongeType.values()[0]);
+    EnumPropertyType<SpongeType> SPONGE_TYPE = EnumPropertyType.of("sponge_type", SpongeType.class, SpongeType.values()[0]);
 
-  IntPropertyType STABILITY = IntPropertyType.of("stability", 0, 7, 0);
+    IntPropertyType STABILITY = IntPropertyType.of("stability", 0, 7, 0);
 
-  BooleanPropertyType STABILITY_CHECK = BooleanPropertyType.of("stability_check", false);
+    BooleanPropertyType STABILITY_CHECK = BooleanPropertyType.of("stability_check", false);
 
-  EnumPropertyType<StoneBrickType> STONE_BRICK_TYPE = EnumPropertyType.of("stone_brick_type" ,StoneBrickType.class ,StoneBrickType.values()[0]);
+    EnumPropertyType<StoneBrickType> STONE_BRICK_TYPE = EnumPropertyType.of("stone_brick_type", StoneBrickType.class, StoneBrickType.values()[0]);
 
-  EnumPropertyType<StoneSlabType> STONE_SLAB_TYPE = EnumPropertyType.of("stone_slab_type" ,StoneSlabType.class ,StoneSlabType.values()[0]);
+    EnumPropertyType<StoneSlabType> STONE_SLAB_TYPE = EnumPropertyType.of("stone_slab_type", StoneSlabType.class, StoneSlabType.values()[0]);
 
-  EnumPropertyType<StoneSlabType2> STONE_SLAB_TYPE_2 = EnumPropertyType.of("stone_slab_type_2" ,StoneSlabType2.class ,StoneSlabType2.values()[0]);
+    EnumPropertyType<StoneSlabType2> STONE_SLAB_TYPE_2 = EnumPropertyType.of("stone_slab_type_2", StoneSlabType2.class, StoneSlabType2.values()[0]);
 
-  EnumPropertyType<StoneSlabType3> STONE_SLAB_TYPE_3 = EnumPropertyType.of("stone_slab_type_3" ,StoneSlabType3.class ,StoneSlabType3.values()[0]);
+    EnumPropertyType<StoneSlabType3> STONE_SLAB_TYPE_3 = EnumPropertyType.of("stone_slab_type_3", StoneSlabType3.class, StoneSlabType3.values()[0]);
 
-  EnumPropertyType<StoneSlabType4> STONE_SLAB_TYPE_4 = EnumPropertyType.of("stone_slab_type_4" ,StoneSlabType4.class ,StoneSlabType4.values()[0]);
+    EnumPropertyType<StoneSlabType4> STONE_SLAB_TYPE_4 = EnumPropertyType.of("stone_slab_type_4", StoneSlabType4.class, StoneSlabType4.values()[0]);
 
-  BooleanPropertyType STRIPPED_BIT = BooleanPropertyType.of("stripped_bit", false);
+    BooleanPropertyType STRIPPED_BIT = BooleanPropertyType.of("stripped_bit", false);
 
-  EnumPropertyType<StructureBlockType> STRUCTURE_BLOCK_TYPE = EnumPropertyType.of("structure_block_type" ,StructureBlockType.class ,StructureBlockType.values()[0]);
+    EnumPropertyType<StructureBlockType> STRUCTURE_BLOCK_TYPE = EnumPropertyType.of("structure_block_type", StructureBlockType.class, StructureBlockType.values()[0]);
 
-  EnumPropertyType<StructureVoidType> STRUCTURE_VOID_TYPE = EnumPropertyType.of("structure_void_type" ,StructureVoidType.class ,StructureVoidType.values()[0]);
+    EnumPropertyType<StructureVoidType> STRUCTURE_VOID_TYPE = EnumPropertyType.of("structure_void_type", StructureVoidType.class, StructureVoidType.values()[0]);
 
-  BooleanPropertyType SUSPENDED_BIT = BooleanPropertyType.of("suspended_bit", false);
+    BooleanPropertyType SUSPENDED_BIT = BooleanPropertyType.of("suspended_bit", false);
 
-  BooleanPropertyType TOGGLE_BIT = BooleanPropertyType.of("toggle_bit", false);
+    BooleanPropertyType TOGGLE_BIT = BooleanPropertyType.of("toggle_bit", false);
 
-  EnumPropertyType<TorchFacingDirection> TORCH_FACING_DIRECTION = EnumPropertyType.of("torch_facing_direction" ,TorchFacingDirection.class ,TorchFacingDirection.values()[0]);
+    EnumPropertyType<TorchFacingDirection> TORCH_FACING_DIRECTION = EnumPropertyType.of("torch_facing_direction", TorchFacingDirection.class, TorchFacingDirection.values()[0]);
 
-  IntPropertyType TRIAL_SPAWNER_STATE = IntPropertyType.of("trial_spawner_state", 0, 5, 0);
+    IntPropertyType TRIAL_SPAWNER_STATE = IntPropertyType.of("trial_spawner_state", 0, 5, 0);
 
-  BooleanPropertyType TRIGGERED_BIT = BooleanPropertyType.of("triggered_bit", false);
+    BooleanPropertyType TRIGGERED_BIT = BooleanPropertyType.of("triggered_bit", false);
 
-  EnumPropertyType<TurtleEggCount> TURTLE_EGG_COUNT = EnumPropertyType.of("turtle_egg_count" ,TurtleEggCount.class ,TurtleEggCount.values()[0]);
+    EnumPropertyType<TurtleEggCount> TURTLE_EGG_COUNT = EnumPropertyType.of("turtle_egg_count", TurtleEggCount.class, TurtleEggCount.values()[0]);
 
-  IntPropertyType TWISTING_VINES_AGE = IntPropertyType.of("twisting_vines_age", 0, 25, 0);
+    IntPropertyType TWISTING_VINES_AGE = IntPropertyType.of("twisting_vines_age", 0, 25, 0);
 
-  BooleanPropertyType UPDATE_BIT = BooleanPropertyType.of("update_bit", false);
+    BooleanPropertyType UPDATE_BIT = BooleanPropertyType.of("update_bit", false);
 
-  BooleanPropertyType UPPER_BLOCK_BIT = BooleanPropertyType.of("upper_block_bit", false);
+    BooleanPropertyType UPPER_BLOCK_BIT = BooleanPropertyType.of("upper_block_bit", false);
 
-  BooleanPropertyType UPSIDE_DOWN_BIT = BooleanPropertyType.of("upside_down_bit", false);
+    BooleanPropertyType UPSIDE_DOWN_BIT = BooleanPropertyType.of("upside_down_bit", false);
 
-  EnumPropertyType<VaultState> VAULT_STATE = EnumPropertyType.of("vault_state" ,VaultState.class ,VaultState.values()[0]);
+    EnumPropertyType<VaultState> VAULT_STATE = EnumPropertyType.of("vault_state", VaultState.class, VaultState.values()[0]);
 
-  IntPropertyType VINE_DIRECTION_BITS = IntPropertyType.of("vine_direction_bits", 0, 15, 0);
+    IntPropertyType VINE_DIRECTION_BITS = IntPropertyType.of("vine_direction_bits", 0, 15, 0);
 
-  EnumPropertyType<WallBlockType> WALL_BLOCK_TYPE = EnumPropertyType.of("wall_block_type" ,WallBlockType.class ,WallBlockType.values()[0]);
+    EnumPropertyType<WallBlockType> WALL_BLOCK_TYPE = EnumPropertyType.of("wall_block_type", WallBlockType.class, WallBlockType.values()[0]);
 
-  EnumPropertyType<WallConnectionTypeEast> WALL_CONNECTION_TYPE_EAST = EnumPropertyType.of("wall_connection_type_east" ,WallConnectionTypeEast.class ,WallConnectionTypeEast.values()[0]);
+    EnumPropertyType<WallConnectionTypeEast> WALL_CONNECTION_TYPE_EAST = EnumPropertyType.of("wall_connection_type_east", WallConnectionTypeEast.class, WallConnectionTypeEast.values()[0]);
 
-  EnumPropertyType<WallConnectionTypeNorth> WALL_CONNECTION_TYPE_NORTH = EnumPropertyType.of("wall_connection_type_north" ,WallConnectionTypeNorth.class ,WallConnectionTypeNorth.values()[0]);
+    EnumPropertyType<WallConnectionTypeNorth> WALL_CONNECTION_TYPE_NORTH = EnumPropertyType.of("wall_connection_type_north", WallConnectionTypeNorth.class, WallConnectionTypeNorth.values()[0]);
 
-  EnumPropertyType<WallConnectionTypeSouth> WALL_CONNECTION_TYPE_SOUTH = EnumPropertyType.of("wall_connection_type_south" ,WallConnectionTypeSouth.class ,WallConnectionTypeSouth.values()[0]);
+    EnumPropertyType<WallConnectionTypeSouth> WALL_CONNECTION_TYPE_SOUTH = EnumPropertyType.of("wall_connection_type_south", WallConnectionTypeSouth.class, WallConnectionTypeSouth.values()[0]);
 
-  EnumPropertyType<WallConnectionTypeWest> WALL_CONNECTION_TYPE_WEST = EnumPropertyType.of("wall_connection_type_west" ,WallConnectionTypeWest.class ,WallConnectionTypeWest.values()[0]);
+    EnumPropertyType<WallConnectionTypeWest> WALL_CONNECTION_TYPE_WEST = EnumPropertyType.of("wall_connection_type_west", WallConnectionTypeWest.class, WallConnectionTypeWest.values()[0]);
 
-  BooleanPropertyType WALL_POST_BIT = BooleanPropertyType.of("wall_post_bit", false);
+    BooleanPropertyType WALL_POST_BIT = BooleanPropertyType.of("wall_post_bit", false);
 
-  IntPropertyType WEEPING_VINES_AGE = IntPropertyType.of("weeping_vines_age", 0, 25, 0);
+    IntPropertyType WEEPING_VINES_AGE = IntPropertyType.of("weeping_vines_age", 0, 25, 0);
 
-  IntPropertyType WEIRDO_DIRECTION = IntPropertyType.of("weirdo_direction", 0, 3, 0);
+    IntPropertyType WEIRDO_DIRECTION = IntPropertyType.of("weirdo_direction", 0, 3, 0);
 
-  List<BlockPropertyType<?>> VALUES = List.of(ACTIVE, AGE_16, AGE_3, AGE_4, AGE_6, AGE_BIT, ALLOW_UNDERWATER_BIT, ATTACHED_BIT, ATTACHMENT, BAMBOO_LEAF_SIZE, BAMBOO_STALK_THICKNESS, BIG_DRIPLEAF_HEAD, BIG_DRIPLEAF_TILT, BITE_COUNTER, BLOCK_LIGHT_LEVEL, BLOOM, BOOKS_STORED, BREWING_STAND_SLOT_A_BIT, BREWING_STAND_SLOT_B_BIT, BREWING_STAND_SLOT_C_BIT, BRUSHED_PROGRESS, BUTTON_PRESSED_BIT, CAN_SUMMON, CANDLES, CAULDRON_LIQUID, CHEMISTRY_TABLE_TYPE, CHISEL_TYPE, CLUSTER_COUNT, COLOR_BIT, COMPOSTER_FILL_LEVEL, CONDITIONAL_BIT, CORAL_DIRECTION, CORAL_FAN_DIRECTION, CORAL_HANG_TYPE_BIT, COVERED_BIT, CRACKED_STATE, CRAFTING, DAMAGE, DEAD_BIT, DEPRECATED, DIRECTION, DIRT_TYPE, DISARMED_BIT, DOOR_HINGE_BIT, DRAG_DOWN, DRIPSTONE_THICKNESS, END_PORTAL_EYE_BIT, EXPLODE_BIT, EXTINGUISHED, FACING_DIRECTION, FILL_LEVEL, GROUND_SIGN_DIRECTION, GROWING_PLANT_AGE, GROWTH, HANGING, HEAD_PIECE_BIT, HEIGHT, HONEY_LEVEL, HUGE_MUSHROOM_BITS, IN_WALL_BIT, INFINIBURN_BIT, ITEM_FRAME_MAP_BIT, ITEM_FRAME_PHOTO_BIT, KELP_AGE, LEVER_DIRECTION, LIQUID_DEPTH, LIT, MINECRAFT_BLOCK_FACE, MINECRAFT_CARDINAL_DIRECTION, MINECRAFT_FACING_DIRECTION, MINECRAFT_VERTICAL_HALF, MOISTURIZED_AMOUNT, MONSTER_EGG_STONE_TYPE, MULTI_FACE_DIRECTION_BITS, OCCUPIED_BIT, OMINOUS, OPEN_BIT, ORIENTATION, OUTPUT_LIT_BIT, OUTPUT_SUBTRACT_BIT, PERSISTENT_BIT, PILLAR_AXIS, PORTAL_AXIS, POWERED_BIT, PRISMARINE_BLOCK_TYPE, PROPAGULE_STAGE, RAIL_DATA_BIT, RAIL_DIRECTION_10, RAIL_DIRECTION_6, REDSTONE_SIGNAL, REPEATER_DELAY, RESPAWN_ANCHOR_CHARGE, ROTATION, SAND_STONE_TYPE, SAND_TYPE, SCULK_SENSOR_PHASE, SEA_GRASS_TYPE, SPONGE_TYPE, STABILITY, STABILITY_CHECK, STONE_BRICK_TYPE, STONE_SLAB_TYPE, STONE_SLAB_TYPE_2, STONE_SLAB_TYPE_3, STONE_SLAB_TYPE_4, STRIPPED_BIT, STRUCTURE_BLOCK_TYPE, STRUCTURE_VOID_TYPE, SUSPENDED_BIT, TOGGLE_BIT, TORCH_FACING_DIRECTION, TRIAL_SPAWNER_STATE, TRIGGERED_BIT, TURTLE_EGG_COUNT, TWISTING_VINES_AGE, UPDATE_BIT, UPPER_BLOCK_BIT, UPSIDE_DOWN_BIT, VAULT_STATE, VINE_DIRECTION_BITS, WALL_BLOCK_TYPE, WALL_CONNECTION_TYPE_EAST, WALL_CONNECTION_TYPE_NORTH, WALL_CONNECTION_TYPE_SOUTH, WALL_CONNECTION_TYPE_WEST, WALL_POST_BIT, WEEPING_VINES_AGE, WEIRDO_DIRECTION);
+    List<BlockPropertyType<?>> VALUES = List.of(ACTIVE, AGE_16, AGE_3, AGE_4, AGE_6, AGE_BIT, ALLOW_UNDERWATER_BIT, ATTACHED_BIT, ATTACHMENT, BAMBOO_LEAF_SIZE, BAMBOO_STALK_THICKNESS, BIG_DRIPLEAF_HEAD, BIG_DRIPLEAF_TILT, BITE_COUNTER, BLOCK_LIGHT_LEVEL, BLOOM, BOOKS_STORED, BREWING_STAND_SLOT_A_BIT, BREWING_STAND_SLOT_B_BIT, BREWING_STAND_SLOT_C_BIT, BRUSHED_PROGRESS, BUTTON_PRESSED_BIT, CAN_SUMMON, CANDLES, CAULDRON_LIQUID, CHEMISTRY_TABLE_TYPE, CHISEL_TYPE, CLUSTER_COUNT, COLOR_BIT, COMPOSTER_FILL_LEVEL, CONDITIONAL_BIT, CORAL_DIRECTION, CORAL_FAN_DIRECTION, CORAL_HANG_TYPE_BIT, COVERED_BIT, CRACKED_STATE, CRAFTING, DAMAGE, DEAD_BIT, DEPRECATED, DIRECTION, DIRT_TYPE, DISARMED_BIT, DOOR_HINGE_BIT, DRAG_DOWN, DRIPSTONE_THICKNESS, END_PORTAL_EYE_BIT, EXPLODE_BIT, EXTINGUISHED, FACING_DIRECTION, FILL_LEVEL, GROUND_SIGN_DIRECTION, GROWING_PLANT_AGE, GROWTH, HANGING, HEAD_PIECE_BIT, HEIGHT, HONEY_LEVEL, HUGE_MUSHROOM_BITS, IN_WALL_BIT, INFINIBURN_BIT, ITEM_FRAME_MAP_BIT, ITEM_FRAME_PHOTO_BIT, KELP_AGE, LEVER_DIRECTION, LIQUID_DEPTH, LIT, MINECRAFT_BLOCK_FACE, MINECRAFT_CARDINAL_DIRECTION, MINECRAFT_FACING_DIRECTION, MINECRAFT_VERTICAL_HALF, MOISTURIZED_AMOUNT, MONSTER_EGG_STONE_TYPE, MULTI_FACE_DIRECTION_BITS, OCCUPIED_BIT, OMINOUS, OPEN_BIT, ORIENTATION, OUTPUT_LIT_BIT, OUTPUT_SUBTRACT_BIT, PERSISTENT_BIT, PILLAR_AXIS, PORTAL_AXIS, POWERED_BIT, PRISMARINE_BLOCK_TYPE, PROPAGULE_STAGE, RAIL_DATA_BIT, RAIL_DIRECTION_10, RAIL_DIRECTION_6, REDSTONE_SIGNAL, REPEATER_DELAY, RESPAWN_ANCHOR_CHARGE, ROTATION, SAND_STONE_TYPE, SAND_TYPE, SCULK_SENSOR_PHASE, SEA_GRASS_TYPE, SPONGE_TYPE, STABILITY, STABILITY_CHECK, STONE_BRICK_TYPE, STONE_SLAB_TYPE, STONE_SLAB_TYPE_2, STONE_SLAB_TYPE_3, STONE_SLAB_TYPE_4, STRIPPED_BIT, STRUCTURE_BLOCK_TYPE, STRUCTURE_VOID_TYPE, SUSPENDED_BIT, TOGGLE_BIT, TORCH_FACING_DIRECTION, TRIAL_SPAWNER_STATE, TRIGGERED_BIT, TURTLE_EGG_COUNT, TWISTING_VINES_AGE, UPDATE_BIT, UPPER_BLOCK_BIT, UPSIDE_DOWN_BIT, VAULT_STATE, VINE_DIRECTION_BITS, WALL_BLOCK_TYPE, WALL_CONNECTION_TYPE_EAST, WALL_CONNECTION_TYPE_NORTH, WALL_CONNECTION_TYPE_SOUTH, WALL_CONNECTION_TYPE_WEST, WALL_POST_BIT, WEEPING_VINES_AGE, WEIRDO_DIRECTION);
 
-  static List<BlockPropertyType<?>> values() {
-    return VALUES;
-  }
+    static List<BlockPropertyType<?>> values() {
+        return VALUES;
+    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/datastruct/SemVersion.java b/Allay-API/src/main/java/org/allaymc/api/datastruct/SemVersion.java
index 5ec76548f..e8d9cceff 100644
--- a/Allay-API/src/main/java/org/allaymc/api/datastruct/SemVersion.java
+++ b/Allay-API/src/main/java/org/allaymc/api/datastruct/SemVersion.java
@@ -6,7 +6,6 @@
 import java.lang.reflect.Type;
 
 public record SemVersion(int major, int minor, int patch, int revision, int build) {
-
     public static SemVersion from(int[] versions) {
         if (versions.length == 0) {
             return new SemVersion(0, 0, 0, 0, 0);
diff --git a/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/AABBOverlapFilter.java b/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/AABBOverlapFilter.java
index fb9208ab6..d7fe72607 100644
--- a/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/AABBOverlapFilter.java
+++ b/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/AABBOverlapFilter.java
@@ -9,5 +9,4 @@
  */
 @FunctionalInterface
 public interface AABBOverlapFilter<T extends HasAABB & HasLongId> extends Predicate<T> {
-
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/AABBTree.java b/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/AABBTree.java
index fabbf73d6..99c03713e 100644
--- a/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/AABBTree.java
+++ b/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/AABBTree.java
@@ -135,16 +135,16 @@ private AABBTreeNode<T> balanceRight(AABBTreeNode<T> node, AABBTreeNode<T> left,
             right.assignChild(AABBTreeNode.RIGHT_CHILD, rightLeftChild.getIndex());
             node.assignChild(AABBTreeNode.RIGHT_CHILD, rightRightChild.getIndex());
             rightRightChild.setParent(node.getIndex());
-            left.getAABB().union(rightRightChild.getAABB(), node.getAABB());
-            node.getAABB().union(rightLeftChild.getAABB(), right.getAABB());
+            left.getAabb().union(rightRightChild.getAabb(), node.getAabb());
+            node.getAabb().union(rightLeftChild.getAabb(), right.getAabb());
             node.setHeight(1 + max(left.getHeight(), rightRightChild.getHeight()));
             right.setHeight(1 + max(node.getHeight(), rightLeftChild.getHeight()));
         } else {
             right.assignChild(AABBTreeNode.RIGHT_CHILD, rightRightChild.getIndex());
             node.assignChild(AABBTreeNode.RIGHT_CHILD, rightLeftChild.getIndex());
             rightLeftChild.setParent(node.getIndex());
-            left.getAABB().union(rightLeftChild.getAABB(), node.getAABB());
-            node.getAABB().union(rightRightChild.getAABB(), right.getAABB());
+            left.getAabb().union(rightLeftChild.getAabb(), node.getAabb());
+            node.getAabb().union(rightRightChild.getAabb(), right.getAabb());
             node.setHeight(1 + max(left.getHeight(), rightLeftChild.getHeight()));
             right.setHeight(1 + max(node.getHeight(), rightRightChild.getHeight()));
         }
@@ -175,16 +175,16 @@ private AABBTreeNode<T> balanceLeft(AABBTreeNode<T> node, AABBTreeNode<T> left,
             left.assignChild(AABBTreeNode.RIGHT_CHILD, leftLeftChild.getIndex());
             node.assignChild(AABBTreeNode.LEFT_CHILD, leftRightChild.getIndex());
             leftRightChild.setParent(node.getIndex());
-            right.getAABB().union(leftRightChild.getAABB(), node.getAABB());
-            node.getAABB().union(leftLeftChild.getAABB(), left.getAABB());
+            right.getAabb().union(leftRightChild.getAabb(), node.getAabb());
+            node.getAabb().union(leftLeftChild.getAabb(), left.getAabb());
             node.setHeight(1 + max(right.getHeight(), leftRightChild.getHeight()));
             left.setHeight(1 + max(node.getHeight(), leftLeftChild.getHeight()));
         } else {
             left.assignChild(AABBTreeNode.RIGHT_CHILD, leftRightChild.getIndex());
             node.assignChild(AABBTreeNode.LEFT_CHILD, leftLeftChild.getIndex());
             leftLeftChild.setParent(node.getIndex());
-            right.getAABB().union(leftLeftChild.getAABB(), node.getAABB());
-            node.getAABB().union(leftRightChild.getAABB(), left.getAABB());
+            right.getAabb().union(leftLeftChild.getAabb(), node.getAabb());
+            node.getAabb().union(leftRightChild.getAabb(), left.getAabb());
             node.setHeight(1 + max(right.getHeight(), leftLeftChild.getHeight()));
             left.setHeight(1 + max(node.getHeight(), leftRightChild.getHeight()));
         }
@@ -220,7 +220,7 @@ private void syncUpHierarchy(AABBTreeNode<T> startingPoint) {
             AABBTreeNode<T> right = getNodeAt(node.getRightChild());
 
             node.setHeight(1 + max(left.getHeight(), right.getHeight()));
-            left.getAABB().union(right.getAABB(), node.getAABB());
+            left.getAabb().union(right.getAabb(), node.getAabb());
 
             node = node.getParent() == AABBTreeNode.INVALID_NODE_INDEX ? null : getNodeAt(node.getParent());
         }
@@ -230,13 +230,13 @@ private void insertNode(int node) {
         AABBTreeNode<T> nodeToAdd = getNodeAt(node);
         AABBTreeNode<T> parentNode = getNodeAt(root);
 
-        AABBf nodeToAddAABB = nodeToAdd.getAABB();
+        AABBf nodeToAddAABB = nodeToAdd.getAabb();
 
         while (!parentNode.isLeaf()) {
             AABBTreeNode<T> leftChild = getNodeAt(parentNode.getLeftChild());
             AABBTreeNode<T> rightChild = getNodeAt(parentNode.getRightChild());
-            AABBf aabbA = leftChild.getAABB();
-            AABBf aabbB = rightChild.getAABB();
+            AABBf aabbA = leftChild.getAabb();
+            AABBf aabbB = rightChild.getAabb();
 
             AABBTreeHeuristicFunction.HeuristicResult heuristicResult = insertionHeuristicFunction
                     .getInsertionHeuristic(aabbA, aabbB, nodeToAdd.getData(), nodeToAddAABB);
@@ -260,7 +260,7 @@ private void detectCollisionPairsWithNode(AABBTreeNode<T> nodeToTest, CollisionF
                                               List<CollisionPair<T>> result) {
         Deque<Integer> stack = new ArrayDeque<>();
         stack.offer(root);
-        AABBf overlapWith = nodeToTest.getAABB();
+        AABBf overlapWith = nodeToTest.getAabb();
 
         while (!stack.isEmpty()) {
             int nodeIndex = stack.pop();
@@ -269,7 +269,7 @@ private void detectCollisionPairsWithNode(AABBTreeNode<T> nodeToTest, CollisionF
             }
 
             AABBTreeNode<T> node = getNodeAt(nodeIndex);
-            AABBf nodeAABB = node.getAABB();
+            AABBf nodeAABB = node.getAabb();
             if (nodeAABB.intersectsAABB(overlapWith)) {
                 if (node.isLeaf() && node.getIndex() != nodeToTest.getIndex()) {
                     T nodeData = node.getData();
@@ -422,7 +422,7 @@ private void traverseTree(Predicate<AABBfc> nodeTest, AABBOverlapFilter<T> filte
             if (nodeIndex == AABBTreeNode.INVALID_NODE_INDEX) continue;
 
             AABBTreeNode<T> node = getNodeAt(nodeIndex);
-            AABBf nodeAABB = node.getAABB();
+            AABBf nodeAABB = node.getAabb();
             if (nodeTest.test(nodeAABB)) {
                 if (node.isLeaf()) {
                     T nodeData = node.getData();
diff --git a/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/AABBTreeNode.java b/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/AABBTreeNode.java
index 494c99937..6abce071e 100644
--- a/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/AABBTreeNode.java
+++ b/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/AABBTreeNode.java
@@ -1,6 +1,7 @@
 package org.allaymc.api.datastruct.aabbtree;
 
 import lombok.Getter;
+import lombok.Setter;
 import org.joml.primitives.AABBf;
 
 /**
@@ -8,30 +9,26 @@
  *
  * @author daoge_cmd
  */
+@Getter
+@Setter
 public final class AABBTreeNode<E extends HasAABB> {
     public static final int INVALID_NODE_INDEX = -1;
+
     public static final int LEFT_CHILD = 0;
     public static final int RIGHT_CHILD = 1;
+
     private static final int MAX_NUM_OF_CHILDREN_PER_NODE = 2;
-    private final int[] children;
-    private final AABBf aabb;
-
-    @Getter
-    private int parent;
-    @Getter
-    private int index;
-    @Getter
+
+    private final int[] children = new int[MAX_NUM_OF_CHILDREN_PER_NODE];
+    private final AABBf aabb = new AABBf();
+
+    private int parent = INVALID_NODE_INDEX;
+    private int index = INVALID_NODE_INDEX;
     private int height;
-    @Getter
     private E data;
 
     public AABBTreeNode() {
-        children = new int[MAX_NUM_OF_CHILDREN_PER_NODE];
         assignChildren(INVALID_NODE_INDEX, INVALID_NODE_INDEX);
-
-        aabb = new AABBf();
-        parent = INVALID_NODE_INDEX;
-        index = INVALID_NODE_INDEX;
     }
 
     public boolean isLeaf() {
@@ -56,9 +53,7 @@ public void assignChildren(int childA, int childB) {
     }
 
     void computeAABBWithMargin(float margin) {
-        if (data == null) {
-            return;
-        }
+        if (data == null) return;
         AABBf dataAABB = data.copyOffsetAABBTo(aabb);
         aabb.setMin(dataAABB.minX - margin, dataAABB.minY - margin, dataAABB.minZ - margin);
         aabb.setMax(dataAABB.maxX + margin, dataAABB.maxY + margin, dataAABB.maxZ + margin);
@@ -66,14 +61,13 @@ void computeAABBWithMargin(float margin) {
 
     public void resetForReuse() {
         assignChildren(INVALID_NODE_INDEX, INVALID_NODE_INDEX);
-        aabb.setMin(Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY);
-        aabb.setMax(Float.NEGATIVE_INFINITY, Float.NEGATIVE_INFINITY, Float.NEGATIVE_INFINITY);
-        setParent(INVALID_NODE_INDEX);
-        setHeight(0);
-        setData(null);
 
         aabb.setMin(Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY);
         aabb.setMax(Float.NEGATIVE_INFINITY, Float.NEGATIVE_INFINITY, Float.NEGATIVE_INFINITY);
+
+        this.parent = INVALID_NODE_INDEX;
+        this.height = 0;
+        this.data = null;
     }
 
     public int getLeftChild() {
@@ -83,24 +77,4 @@ public int getLeftChild() {
     public int getRightChild() {
         return children[RIGHT_CHILD];
     }
-
-    public AABBf getAABB() {
-        return aabb;
-    }
-
-    public void setParent(int parent) {
-        this.parent = parent;
-    }
-
-    public void setIndex(int index) {
-        this.index = index;
-    }
-
-    public void setHeight(int height) {
-        this.height = height;
-    }
-
-    public void setData(E data) {
-        this.data = data;
-    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/AABBTreeObject.java b/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/AABBTreeObject.java
index 9f1bf2b80..180bd2227 100644
--- a/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/AABBTreeObject.java
+++ b/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/AABBTreeObject.java
@@ -1,5 +1,7 @@
 package org.allaymc.api.datastruct.aabbtree;
 
+import lombok.AllArgsConstructor;
+
 import java.util.Objects;
 
 /**
@@ -7,14 +9,11 @@
  *
  * @author daoge_cmd
  */
+@AllArgsConstructor
 final class AABBTreeObject<E extends HasLongId> {
     private final E data;
 
-    private AABBTreeObject(E data) {
-        this.data = data;
-    }
-
-    static <E extends HasLongId> AABBTreeObject<E> create(E data) {
+    public static <E extends HasLongId> AABBTreeObject<E> create(E data) {
         return new AABBTreeObject<>(data);
     }
 
@@ -35,7 +34,7 @@ public int hashCode() {
         return Objects.hash(data.getLongId());
     }
 
-    E getData() {
+    public E getData() {
         return data;
     }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/AABBUtils.java b/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/AABBUtils.java
index 994cf2f89..bcee8ae8f 100644
--- a/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/AABBUtils.java
+++ b/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/AABBUtils.java
@@ -1,5 +1,6 @@
 package org.allaymc.api.datastruct.aabbtree;
 
+import lombok.experimental.UtilityClass;
 import org.joml.primitives.AABBf;
 
 /**
@@ -7,12 +8,8 @@
  *
  * @author daoge_cmd
  */
+@UtilityClass
 public final class AABBUtils {
-
-    private AABBUtils() {
-
-    }
-
     public static float getWidth(AABBf aabb) {
         return aabb.maxX - aabb.minX;
     }
@@ -26,9 +23,9 @@ public static float getDepth(AABBf aabb) {
     }
 
     public static float getArea(AABBf aabb) {
-        final float width = getWidth(aabb);
-        final float height = getHeight(aabb);
-        final float depth = getDepth(aabb);
+        var width = getWidth(aabb);
+        var height = getHeight(aabb);
+        var depth = getDepth(aabb);
         return 2.0f * (width * height + width * depth + height * depth);
     }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/AreaAABBHeuristicFunction.java b/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/AreaAABBHeuristicFunction.java
index 11a075f07..7857ffc4f 100644
--- a/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/AreaAABBHeuristicFunction.java
+++ b/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/AreaAABBHeuristicFunction.java
@@ -10,16 +10,12 @@
  * @author daoge_cmd
  */
 public class AreaAABBHeuristicFunction<T extends HasAABB> implements AABBTreeHeuristicFunction<T> {
-    private final AABBf temp;
-
-    public AreaAABBHeuristicFunction() {
-        temp = new AABBf();
-    }
+    private final AABBf temp = new AABBf();
 
     @Override
     public HeuristicResult getInsertionHeuristic(AABBf left, AABBf right, T object, AABBf objectAABB) {
-        float diffA = getArea(left.union(objectAABB, temp)) - getArea(left);
-        float diffB = getArea(right.union(objectAABB, temp)) - getArea(right);
+        var diffA = getArea(left.union(objectAABB, temp)) - getArea(left);
+        var diffB = getArea(right.union(objectAABB, temp)) - getArea(right);
         return diffA < diffB ? HeuristicResult.LEFT : HeuristicResult.RIGHT;
     }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/CollisionPair.java b/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/CollisionPair.java
index 816b9ad88..b043c9bb4 100644
--- a/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/CollisionPair.java
+++ b/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/CollisionPair.java
@@ -19,7 +19,7 @@ public boolean equals(Object o) {
         }
         CollisionPair<?> that = (CollisionPair<?>) o;
         return (Objects.equals(objectA.getLongId(), that.objectA.getLongId()) || Objects.equals(objectA.getLongId(), that.objectB.getLongId())) &&
-                (Objects.equals(objectB.getLongId(), that.objectB.getLongId()) || Objects.equals(objectB.getLongId(), that.objectA.getLongId()));
+               (Objects.equals(objectB.getLongId(), that.objectB.getLongId()) || Objects.equals(objectB.getLongId(), that.objectA.getLongId()));
     }
 
     @Override
diff --git a/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/HasAABB.java b/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/HasAABB.java
index 55a87ff0c..0edfc8b30 100644
--- a/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/HasAABB.java
+++ b/Allay-API/src/main/java/org/allaymc/api/datastruct/aabbtree/HasAABB.java
@@ -8,6 +8,5 @@
  * @author daoge_cmd
  */
 public interface HasAABB {
-
     AABBf copyOffsetAABBTo(AABBf dest);
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/EntityHelper.java b/Allay-API/src/main/java/org/allaymc/api/entity/EntityHelper.java
index 0516b5f07..3c3b864b7 100644
--- a/Allay-API/src/main/java/org/allaymc/api/entity/EntityHelper.java
+++ b/Allay-API/src/main/java/org/allaymc/api/entity/EntityHelper.java
@@ -1,5 +1,6 @@
 package org.allaymc.api.entity;
 
+import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 import org.allaymc.api.entity.init.SimpleEntityInitInfo;
 import org.allaymc.api.entity.registry.EntityTypeRegistry;
@@ -13,12 +14,13 @@
  * @author daoge_cmd
  */
 @Slf4j
+@UtilityClass
 public final class EntityHelper {
     public static Entity fromNBT(Dimension dimension, NbtMap nbt) {
         var identifier = new Identifier(nbt.getString("identifier"));
         var entityType = EntityTypeRegistry.getRegistry().get(identifier);
         if (entityType == null) {
-            log.warn("Unknown entity type " + identifier);
+            log.warn("Unknown entity type {}", identifier);
             return null;
         }
         return entityType.createEntity(SimpleEntityInitInfo.builder().dimension(dimension).nbt(nbt).build());
diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/attribute/AttributeType.java b/Allay-API/src/main/java/org/allaymc/api/entity/attribute/AttributeType.java
index 04c6d663b..099d0c85c 100644
--- a/Allay-API/src/main/java/org/allaymc/api/entity/attribute/AttributeType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/entity/attribute/AttributeType.java
@@ -1,5 +1,8 @@
 package org.allaymc.api.entity.attribute;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -8,9 +11,11 @@
  *
  * @author JukeboxMC | daoge_cmd
  */
+@Getter
+@AllArgsConstructor
 public enum AttributeType {
 
-    //Base Entity
+    // Base Entity
     ABSORPTION("minecraft:absorption", 0, Float.MAX_VALUE, 0),
     KNOCKBACK_RESISTANCE("minecraft:knockback_resistance", 0, 1, 0.6f),
     HEALTH("minecraft:health", 0, 20, 20),
@@ -20,13 +25,13 @@ public enum AttributeType {
     LUCK("minecraft:luck", -1024, 1024, 0),
     FALL_DAMAGE("minecraft:fall_damage", 0, Float.MAX_VALUE, 1),
 
-    //Horse
+    // Horse
     HORSE_JUMP_STRENGTH("minecraft:horse.jump_strength", 0, 20, 0.7f),
 
-    //Zombie
+    // Zombie
     ZOMBIE_SPAWN_REINFORCEMENTS("minecraft:zombie.spawn_reinforcements", 0, 1, 0),
 
-    //Player
+    // Player
     PLAYER_HUNGER("minecraft:player.hunger", 0, 20, 20),
     PLAYER_SATURATION("minecraft:player.saturation", 0, 20, 20),
     PLAYER_EXHAUSTION("minecraft:player.exhaustion", 0, 5, 0.41f),
@@ -36,7 +41,7 @@ public enum AttributeType {
     private static final Map<String, AttributeType> KEY_LOOK_UP = new HashMap<>();
 
     static {
-        for (AttributeType attributeType : values()) {
+        for (var attributeType : values()) {
             KEY_LOOK_UP.put(attributeType.key, attributeType);
         }
     }
@@ -46,13 +51,6 @@ public enum AttributeType {
     private final float maxValue;
     private final float defaultValue;
 
-    AttributeType(String key, float minValue, float maxValue, float defaultValue) {
-        this.key = key;
-        this.minValue = minValue;
-        this.maxValue = maxValue;
-        this.defaultValue = defaultValue;
-    }
-
     public static AttributeType byKey(String key) {
         return KEY_LOOK_UP.get(key);
     }
diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/component/common/EntityBaseComponent.java b/Allay-API/src/main/java/org/allaymc/api/entity/component/common/EntityBaseComponent.java
index 91a21e334..6fd057178 100644
--- a/Allay-API/src/main/java/org/allaymc/api/entity/component/common/EntityBaseComponent.java
+++ b/Allay-API/src/main/java/org/allaymc/api/entity/component/common/EntityBaseComponent.java
@@ -47,6 +47,10 @@ public interface EntityBaseComponent extends EntityComponent, CommandSender {
     float STOP_MOVEMENT_FACTOR = 0f;
     float DEFAULT_PUSH_SPEED_REDUCTION = 1f;
 
+    private static boolean isWaterType(BlockType<?> blockType) {
+        return blockType == BlockTypes.FLOWING_WATER_TYPE || blockType == BlockTypes.WATER_TYPE;
+    }
+
     EntityType<? extends Entity> getEntityType();
 
     String getDisplayName();
@@ -68,11 +72,15 @@ default void clearNameTag() {
     Location3fc getLocation();
 
     /**
-     * Set the location before the entity is spawned <br>
-     * This method is usually used when you want to spawn the entity at a specific location <br>
-     * Then you need to set the entity's location before spawn the entity <br>
-     * @throws IllegalStateException if the entity is already spawned
+     * Set the location before the entity is spawned.
+     * <p>
+     * This method is usually used when you want to spawn the entity at a specific location.
+     * <p>
+     * Then you need to set the entity's location before spawn the entity.
+     *
      * @param location The location you want to set
+     *
+     * @throws IllegalStateException if the entity is already spawned
      */
     void setLocationBeforeSpawn(Location3fc location);
 
@@ -263,7 +271,8 @@ default boolean hasGravity() {
 
     /**
      * Given yaw, if the movement multiplier is not 0, the entity will move towards the direction specified by yaw. <p>
-     * See: <a href="https://www.mcpk.wiki/wiki/Horizontal_Movement_Formulas">Horizontal Movement Formulas</a>
+     *
+     * @see <a href="https://www.mcpk.wiki/wiki/Horizontal_Movement_Formulas">Horizontal Movement Formulas</a>
      */
     default float getMovementFactor() {
         return STOP_MOVEMENT_FACTOR;
@@ -297,10 +306,8 @@ default Chunk getCurrentChunk() {
     }
 
     default BlockFace getHorizontalFace() {
-        double rotation = getLocation().yaw() % 360;
-        if (rotation < 0) {
-            rotation += 360.0;
-        }
+        var rotation = getLocation().yaw() % 360;
+        if (rotation < 0) rotation += 360.0;
 
         if (45 <= rotation && rotation < 135) {
             return BlockFace.WEST;
@@ -356,26 +363,19 @@ default boolean isInWater() {
         int fy = (int) loc.y();
         int fz = (int) loc.z();
         var blockType = getDimension().getBlockState(fx, fy, fz).getBlockType();
-        if (isWaterType(blockType)) {
-            return true;
-        }
+        if (isWaterType(blockType)) return true;
+
         blockType = getDimension().getBlockState(fx, fy, fz, 1).getBlockType();
-        if (isWaterType(blockType)) {
-            return true;
-        }
-        return false;
+        return isWaterType(blockType);
     }
 
     /**
-     * @param player The player who interacted with the entity, can be null
+     * @param player    The player who interacted with the entity, can be null
      * @param itemStack The item used to interact with the entity
-     * @return true if the interaction is successful
+     *
+     * @return {@code true} if the interaction is successful
      */
     default boolean onInteract(EntityPlayer player, ItemStack itemStack) {
         return false;
     }
-
-    private static boolean isWaterType(BlockType<?> blockType) {
-        return blockType == BlockTypes.FLOWING_WATER_TYPE || blockType == BlockTypes.WATER_TYPE;
-    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/component/event/EntityDieEvent.java b/Allay-API/src/main/java/org/allaymc/api/entity/component/event/EntityDieEvent.java
index 3189deca2..688e1d1ec 100644
--- a/Allay-API/src/main/java/org/allaymc/api/entity/component/event/EntityDieEvent.java
+++ b/Allay-API/src/main/java/org/allaymc/api/entity/component/event/EntityDieEvent.java
@@ -1,7 +1,5 @@
 package org.allaymc.api.entity.component.event;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
 import org.allaymc.api.eventbus.event.Event;
 
 /**
@@ -9,7 +7,5 @@
  *
  * @author daoge_cmd
  */
-@Getter
-@AllArgsConstructor
 public class EntityDieEvent extends Event {
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/component/event/PlayerLoggedInEvent.java b/Allay-API/src/main/java/org/allaymc/api/entity/component/event/PlayerLoggedInEvent.java
index 24f505701..c19593e62 100644
--- a/Allay-API/src/main/java/org/allaymc/api/entity/component/event/PlayerLoggedInEvent.java
+++ b/Allay-API/src/main/java/org/allaymc/api/entity/component/event/PlayerLoggedInEvent.java
@@ -11,6 +11,5 @@
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class PlayerLoggedInEvent extends Event {
-
     public static final PlayerLoggedInEvent INSTANCE = new PlayerLoggedInEvent();
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/component/player/EntityPlayerBaseComponent.java b/Allay-API/src/main/java/org/allaymc/api/entity/component/player/EntityPlayerBaseComponent.java
index 72b546970..8c619013b 100644
--- a/Allay-API/src/main/java/org/allaymc/api/entity/component/player/EntityPlayerBaseComponent.java
+++ b/Allay-API/src/main/java/org/allaymc/api/entity/component/player/EntityPlayerBaseComponent.java
@@ -20,6 +20,8 @@
 
 public interface EntityPlayerBaseComponent extends EntityBaseComponent, ChunkLoader, ScoreboardViewer {
 
+    double BLOCK_INTERACT_MAX_DV_DIFF = 2.0;
+
     boolean isSprinting();
 
     void setSprinting(boolean sprinting);
@@ -40,10 +42,10 @@ public interface EntityPlayerBaseComponent extends EntityBaseComponent, ChunkLoa
 
     void setCrawling(boolean crawling);
 
-    void setInteractingBlock(boolean interactingBlock);
-
     boolean isInteractingBlock();
 
+    void setInteractingBlock(boolean interactingBlock);
+
     int getHandSlot();
 
     void setHandSlot(int handSlot);
@@ -129,15 +131,13 @@ default void setAction(boolean value) {
 
     void showForm(Form form);
 
-    double BLOCK_INTERACT_MAX_DV_DIFF = 2.0;
-
     default boolean canInteract(float x, float y, float z) {
         var maxDistance = getMaxInteractDistance();
         var location = getLocation();
         if (location.distanceSquared(x, y, z) > maxDistance * maxDistance) return false;
 
         var dv = MathUtils.JOMLVecToCBVec(MathUtils.getDirectionVector(location.yaw(), location.pitch()));
-        org.cloudburstmc.math.vector.Vector3f target = org.cloudburstmc.math.vector.Vector3f.from(x - location.x(), y - location.y(), z - location.z()).normalize();
+        var target = org.cloudburstmc.math.vector.Vector3f.from(x - location.x(), y - location.y(), z - location.z()).normalize();
         var delta = dv.sub(target);
         var diff = delta.dot(delta);
         return diff < BLOCK_INTERACT_MAX_DV_DIFF;
diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/damage/DamageContainer.java b/Allay-API/src/main/java/org/allaymc/api/entity/damage/DamageContainer.java
index d4b08a2e4..905e9bb1b 100644
--- a/Allay-API/src/main/java/org/allaymc/api/entity/damage/DamageContainer.java
+++ b/Allay-API/src/main/java/org/allaymc/api/entity/damage/DamageContainer.java
@@ -1,10 +1,10 @@
 package org.allaymc.api.entity.damage;
 
-import com.google.common.base.Preconditions;
 import lombok.Getter;
 import lombok.Setter;
 import org.allaymc.api.entity.Entity;
 
+import java.util.Objects;
 import java.util.function.UnaryOperator;
 
 /**
@@ -15,6 +15,7 @@
 @Getter
 public class DamageContainer {
     public static final int DEFAULT_DAMAGE_COOL_DOWN = 10;
+
     protected Entity attacker;
     protected DamageType damageType;
     protected float sourceDamage;
@@ -29,10 +30,9 @@ public class DamageContainer {
 
     public DamageContainer(Entity attacker, DamageType damageType, float sourceDamage) {
         // attacker is nullable
-        Preconditions.checkNotNull(damageType);
         this.attacker = attacker;
         if (attacker != null) this.critical = attacker.canCriticalAttack();
-        this.damageType = damageType;
+        this.damageType = Objects.requireNonNull(damageType);
         this.sourceDamage = sourceDamage;
         this.finalDamage = sourceDamage;
     }
diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/SimpleEffectInstance.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/SimpleEffectInstance.java
index 58f0e0bdb..a4088c679 100644
--- a/Allay-API/src/main/java/org/allaymc/api/entity/effect/SimpleEffectInstance.java
+++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/SimpleEffectInstance.java
@@ -9,9 +9,9 @@
  *
  * @author daoge_cmd
  */
-@AllArgsConstructor
 @Getter
 @Setter
+@AllArgsConstructor
 public final class SimpleEffectInstance implements EffectInstance {
     private final EffectType type;
     private int amplifier;
diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectAbsorptionType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectAbsorptionType.java
index a075f3744..539ae315c 100644
--- a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectAbsorptionType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectAbsorptionType.java
@@ -11,7 +11,6 @@
  * @author daoge_cmd
  */
 public class EffectAbsorptionType extends AbstractEffectType {
-
     public static final EffectAbsorptionType ABSORPTION_TYPE = new EffectAbsorptionType();
 
     private EffectAbsorptionType() {
diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/metadata/Metadata.java b/Allay-API/src/main/java/org/allaymc/api/entity/metadata/Metadata.java
index 63b076d99..07767bc71 100644
--- a/Allay-API/src/main/java/org/allaymc/api/entity/metadata/Metadata.java
+++ b/Allay-API/src/main/java/org/allaymc/api/entity/metadata/Metadata.java
@@ -18,7 +18,7 @@ public class Metadata {
     private final EntityDataMap entityDataMap = new EntityDataMap();
 
     public <T> Metadata set(EntityDataType<T> entityData, T value) {
-        T oldValue = this.entityDataMap.get(entityData);
+        var oldValue = this.entityDataMap.get(entityData);
         if (!Objects.equals(oldValue, value)) {
             this.entityDataMap.put(entityData, value);
         }
@@ -30,7 +30,7 @@ public <T> T get(EntityDataType<T> entityData) {
     }
 
     public Metadata set(EntityFlag entityFlag, boolean value) {
-        boolean oldValue = this.get(entityFlag);
+        var oldValue = this.get(entityFlag);
         if (oldValue != value) {
             this.entityDataMap.setFlag(entityFlag, value);
         }
diff --git a/Allay-API/src/main/java/org/allaymc/api/eventbus/EventException.java b/Allay-API/src/main/java/org/allaymc/api/eventbus/EventException.java
index d400bff2d..d79755fea 100644
--- a/Allay-API/src/main/java/org/allaymc/api/eventbus/EventException.java
+++ b/Allay-API/src/main/java/org/allaymc/api/eventbus/EventException.java
@@ -6,9 +6,6 @@
  * @author daoge_cmd
  */
 public class EventException extends RuntimeException {
-    public EventException() {
-    }
-
     public EventException(String message) {
         super(message);
     }
diff --git a/Allay-API/src/main/java/org/allaymc/api/eventbus/event/Event.java b/Allay-API/src/main/java/org/allaymc/api/eventbus/event/Event.java
index 421ff2991..33de5fcd9 100644
--- a/Allay-API/src/main/java/org/allaymc/api/eventbus/event/Event.java
+++ b/Allay-API/src/main/java/org/allaymc/api/eventbus/event/Event.java
@@ -1,5 +1,6 @@
 package org.allaymc.api.eventbus.event;
 
+import lombok.Getter;
 import org.allaymc.api.eventbus.EventException;
 
 /**
@@ -8,12 +9,9 @@
  * @author daoge_cmd
  */
 public abstract class Event {
+    @Getter
     private boolean cancelled = false;
 
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
     public void setCancelled(boolean value) {
         if (!(this instanceof CancellableEvent)) {
             throw new EventException("Event is not Cancellable");
diff --git a/Allay-API/src/main/java/org/allaymc/api/form/FormException.java b/Allay-API/src/main/java/org/allaymc/api/form/FormException.java
index a15a6fea0..7d8020ac6 100644
--- a/Allay-API/src/main/java/org/allaymc/api/form/FormException.java
+++ b/Allay-API/src/main/java/org/allaymc/api/form/FormException.java
@@ -6,9 +6,6 @@
  * @author daoge_cmd
  */
 public class FormException extends RuntimeException {
-    public FormException() {
-    }
-
     public FormException(String message) {
         super(message);
     }
diff --git a/Allay-API/src/main/java/org/allaymc/api/form/element/CustomFormElement.java b/Allay-API/src/main/java/org/allaymc/api/form/element/CustomFormElement.java
index 1275adc10..b4af7b01a 100644
--- a/Allay-API/src/main/java/org/allaymc/api/form/element/CustomFormElement.java
+++ b/Allay-API/src/main/java/org/allaymc/api/form/element/CustomFormElement.java
@@ -8,6 +8,8 @@
 public abstract sealed class CustomFormElement permits
         Dropdown, Input, Label, Slider, StepSlider, Toggle {
 
-    // Only used for server settings form
+    /**
+     * Only used for server settings form
+     */
     public abstract void syncDefaultValueToResponse(String response);
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/form/element/Dropdown.java b/Allay-API/src/main/java/org/allaymc/api/form/element/Dropdown.java
index 32fee8322..7296f79e0 100644
--- a/Allay-API/src/main/java/org/allaymc/api/form/element/Dropdown.java
+++ b/Allay-API/src/main/java/org/allaymc/api/form/element/Dropdown.java
@@ -14,6 +14,7 @@ public final class Dropdown extends CustomFormElement {
 
     @SuppressWarnings("unused")
     private final String type = "dropdown";
+
     @Getter
     private final String text;
     @Getter
diff --git a/Allay-API/src/main/java/org/allaymc/api/form/element/Input.java b/Allay-API/src/main/java/org/allaymc/api/form/element/Input.java
index 6fbc58c73..558eda190 100644
--- a/Allay-API/src/main/java/org/allaymc/api/form/element/Input.java
+++ b/Allay-API/src/main/java/org/allaymc/api/form/element/Input.java
@@ -12,6 +12,7 @@ public final class Input extends CustomFormElement {
 
     @SuppressWarnings("unused")
     private final String type = "input";
+
     @Getter
     private final String text;
     @Getter
diff --git a/Allay-API/src/main/java/org/allaymc/api/form/element/Label.java b/Allay-API/src/main/java/org/allaymc/api/form/element/Label.java
index 506fd65ad..e025938d1 100644
--- a/Allay-API/src/main/java/org/allaymc/api/form/element/Label.java
+++ b/Allay-API/src/main/java/org/allaymc/api/form/element/Label.java
@@ -11,6 +11,7 @@ public final class Label extends CustomFormElement {
 
     @SuppressWarnings("unused")
     private final String type = "label";
+
     @Getter
     private final String text;
 
diff --git a/Allay-API/src/main/java/org/allaymc/api/form/element/Slider.java b/Allay-API/src/main/java/org/allaymc/api/form/element/Slider.java
index 01efb3312..3dc20bcfa 100644
--- a/Allay-API/src/main/java/org/allaymc/api/form/element/Slider.java
+++ b/Allay-API/src/main/java/org/allaymc/api/form/element/Slider.java
@@ -12,6 +12,7 @@ public final class Slider extends CustomFormElement {
 
     @SuppressWarnings("unused")
     private final String type = "slider";
+
     @Getter
     private final String text;
     @Getter
diff --git a/Allay-API/src/main/java/org/allaymc/api/form/element/StepSlider.java b/Allay-API/src/main/java/org/allaymc/api/form/element/StepSlider.java
index 9eef4307b..bddaaa569 100644
--- a/Allay-API/src/main/java/org/allaymc/api/form/element/StepSlider.java
+++ b/Allay-API/src/main/java/org/allaymc/api/form/element/StepSlider.java
@@ -14,6 +14,7 @@ public final class StepSlider extends CustomFormElement {
 
     @SuppressWarnings("unused")
     private final String type = "step_slider";
+
     @Getter
     private final String text;
     @Getter
diff --git a/Allay-API/src/main/java/org/allaymc/api/form/element/Toggle.java b/Allay-API/src/main/java/org/allaymc/api/form/element/Toggle.java
index 4b07bc0ce..5216ed0e2 100644
--- a/Allay-API/src/main/java/org/allaymc/api/form/element/Toggle.java
+++ b/Allay-API/src/main/java/org/allaymc/api/form/element/Toggle.java
@@ -12,6 +12,7 @@ public final class Toggle extends CustomFormElement {
 
     @SuppressWarnings("unused")
     private final String type = "toggle";
+
     @Getter
     private final String text;
     @Getter
diff --git a/Allay-API/src/main/java/org/allaymc/api/form/type/CustomForm.java b/Allay-API/src/main/java/org/allaymc/api/form/type/CustomForm.java
index 459fa115d..8cfd6a56d 100644
--- a/Allay-API/src/main/java/org/allaymc/api/form/type/CustomForm.java
+++ b/Allay-API/src/main/java/org/allaymc/api/form/type/CustomForm.java
@@ -20,6 +20,7 @@
 public final class CustomForm extends Form {
     @SuppressWarnings("unused")
     private final String type = "custom_form";
+
     private final List<CustomFormElement> content = new ArrayList<>();
     private String title = "";
     private ImageData icon;
diff --git a/Allay-API/src/main/java/org/allaymc/api/form/type/Form.java b/Allay-API/src/main/java/org/allaymc/api/form/type/Form.java
index 4da3b2809..d8d1487be 100644
--- a/Allay-API/src/main/java/org/allaymc/api/form/type/Form.java
+++ b/Allay-API/src/main/java/org/allaymc/api/form/type/Form.java
@@ -12,6 +12,7 @@
 public abstract sealed class Form permits SimpleForm, ModalForm, CustomForm {
 
     protected static final Gson GSON = new Gson();
+
     protected transient Runnable onClose = () -> {};
     @Getter
     protected transient Object response;
diff --git a/Allay-API/src/main/java/org/allaymc/api/form/type/ModalForm.java b/Allay-API/src/main/java/org/allaymc/api/form/type/ModalForm.java
index 634044cd0..971f8833e 100644
--- a/Allay-API/src/main/java/org/allaymc/api/form/type/ModalForm.java
+++ b/Allay-API/src/main/java/org/allaymc/api/form/type/ModalForm.java
@@ -14,6 +14,7 @@
 public final class ModalForm extends Form {
     @SuppressWarnings("unused")
     private final String type = "modal";
+
     private String title = "";
     private String content = "";
     @SerializedName("button1")
@@ -67,11 +68,8 @@ public void handleResponse(String data) {
             return;
         }
         onResponse.accept(data);
-        if (data.equals("true")) {
-            onTrue.run();
-        } else {
-            onFalse.run();
-        }
+        if (data.equals("true")) onTrue.run();
+        else onFalse.run();
     }
 
     @Override
diff --git a/Allay-API/src/main/java/org/allaymc/api/form/type/SimpleForm.java b/Allay-API/src/main/java/org/allaymc/api/form/type/SimpleForm.java
index 4deb238ec..e3c3898a9 100644
--- a/Allay-API/src/main/java/org/allaymc/api/form/type/SimpleForm.java
+++ b/Allay-API/src/main/java/org/allaymc/api/form/type/SimpleForm.java
@@ -19,6 +19,7 @@
 public final class SimpleForm extends Form {
     @SuppressWarnings("unused")
     private final String type = "form";
+
     private final List<Button> buttons = new ArrayList<>();
     private String title = "";
     private String content = "";
@@ -72,11 +73,11 @@ public void handleResponse(String data) {
         try {
             buttonIndex = Integer.parseInt(data);
         } catch (Exception e) {
-            log.warn("Invalid simple form response: " + data);
+            log.warn("Invalid simple form response: {}", data);
             return;
         }
         if (buttonIndex >= this.buttons.size()) {
-            log.warn("Button index out of range: " + buttonIndex);
+            log.warn("Button index out of range: {}", buttonIndex);
             return;
         }
         var button = this.buttons.get(buttonIndex);
diff --git a/Allay-API/src/main/java/org/allaymc/api/i18n/I18n.java b/Allay-API/src/main/java/org/allaymc/api/i18n/I18n.java
index 90903c305..535cc233f 100644
--- a/Allay-API/src/main/java/org/allaymc/api/i18n/I18n.java
+++ b/Allay-API/src/main/java/org/allaymc/api/i18n/I18n.java
@@ -72,7 +72,7 @@ default Pair<String, Boolean> toClientFriendlyStyle0(LangCode langCode, @MayCont
         if (VANILLA_LANG_NAMESPACE.equals(namespace)) {
             String left;
             if (keyInfo.hasStarter) {
-                // 保留 '%'
+                // Preserve '%'
                 left = tr.substring(0, keyInfo.startIndex + 1);
             } else {
                 left = "";
diff --git a/Allay-API/src/main/java/org/allaymc/api/i18n/LangCode.java b/Allay-API/src/main/java/org/allaymc/api/i18n/LangCode.java
index 402a04dbd..91bcf7587 100644
--- a/Allay-API/src/main/java/org/allaymc/api/i18n/LangCode.java
+++ b/Allay-API/src/main/java/org/allaymc/api/i18n/LangCode.java
@@ -1,5 +1,8 @@
 package org.allaymc.api.i18n;
 
+import lombok.AllArgsConstructor;
+
+@AllArgsConstructor
 public enum LangCode {
     en_US("English (United States)"),
     en_GB("English (United Kingdom)"),
@@ -32,11 +35,8 @@ public enum LangCode {
     uk_UA("Українська (Україна)");
 
     private static final LangCode[] VALUES = values();
-    private final String string;
 
-    LangCode(String string) {
-        this.string = string;
-    }
+    private final String string;
 
     public static LangCode byName(String name) {
         return byName(name, true);
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/ItemHelper.java b/Allay-API/src/main/java/org/allaymc/api/item/ItemHelper.java
index cff36c514..7b9a454ac 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/ItemHelper.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/ItemHelper.java
@@ -1,5 +1,6 @@
 package org.allaymc.api.item;
 
+import lombok.experimental.UtilityClass;
 import org.allaymc.api.data.VanillaItemTags;
 import org.allaymc.api.item.init.SimpleItemStackInitInfo;
 import org.allaymc.api.item.registry.ItemTypeRegistry;
@@ -7,6 +8,7 @@
 import org.allaymc.api.utils.Identifier;
 import org.cloudburstmc.nbt.NbtMap;
 
+import java.util.Arrays;
 import java.util.Objects;
 
 /**
@@ -14,6 +16,7 @@
  *
  * @author daoge_cmd
  */
+@UtilityClass
 public final class ItemHelper {
     public static ItemStack fromNBT(NbtMap nbt) {
         int count = nbt.getByte("Count");
@@ -26,20 +29,22 @@ public static ItemStack fromNBT(NbtMap nbt) {
                         .count(count)
                         .meta(meta)
                         .extraTag(nbt.getCompound("tag"))
-                        .build());
+                        .build()
+        );
     }
 
     /**
-     * 获取物品的物品等级 <br>
-     * @return ItemTier对象, 或者null如果此物品不存在物品等级
+     * Get the item tier of an item.
+     *
+     * @param itemType The {@link ItemType} of the item.
+     *
+     * @return The {@link ItemTier} object, or {@code null} if the item does not have an item tier.
      */
     public static ItemTier getItemTier(ItemType<?> itemType) {
-        for (var tier : ItemTier.ORDER_OF_QUALITY) {
-            if (itemType.hasItemTag(tier.getItemTag())) {
-                return tier;
-            }
-        }
-        return null;
+        return Arrays.stream(ItemTier.ORDER_OF_QUALITY)
+                .filter(tier -> itemType.hasItemTag(tier.getItemTag()))
+                .findFirst()
+                .orElse(null);
     }
 
     public static boolean isTool(ItemType<?> itemType) {
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/ItemTier.java b/Allay-API/src/main/java/org/allaymc/api/item/ItemTier.java
index 6d638bc22..ea100f9d4 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/ItemTier.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/ItemTier.java
@@ -1,5 +1,6 @@
 package org.allaymc.api.item;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.allaymc.api.item.tag.ItemTag;
 
@@ -10,6 +11,8 @@
  *
  * @author daoge_cmd
  */
+@Getter
+@AllArgsConstructor
 public enum ItemTier {
     WOODEN(WOODEN_TIER),
     STONE(STONE_TIER),
@@ -18,16 +21,10 @@ public enum ItemTier {
     NETHERITE(NETHERITE_TIER),
     GOLD(GOLDEN_TIER);
 
-    public static final ItemTier[] ORDER_OF_QUALITY =
-            {GOLD, NETHERITE, DIAMOND, IRON, STONE, WOODEN};
+    public static final ItemTier[] ORDER_OF_QUALITY = {GOLD, NETHERITE, DIAMOND, IRON, STONE, WOODEN};
 
-    @Getter
     private final ItemTag itemTag;
 
-    ItemTier(ItemTag itemTag) {
-        this.itemTag = itemTag;
-    }
-
     public boolean isBetterThan(ItemTier tier) {
         return this.ordinal() > tier.ordinal();
     }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/component/common/ItemBaseComponent.java b/Allay-API/src/main/java/org/allaymc/api/item/component/common/ItemBaseComponent.java
index fa2b78ac5..33d0fd56b 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/component/common/ItemBaseComponent.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/component/common/ItemBaseComponent.java
@@ -1,7 +1,6 @@
 package org.allaymc.api.item.component.common;
 
 import org.allaymc.api.block.component.common.PlayerInteractInfo;
-import org.allaymc.api.block.data.BlockFace;
 import org.allaymc.api.block.type.BlockState;
 import org.allaymc.api.block.type.BlockTypes;
 import org.allaymc.api.entity.interfaces.EntityPlayer;
@@ -13,7 +12,6 @@
 import org.allaymc.api.world.Dimension;
 import org.cloudburstmc.nbt.NbtMap;
 import org.cloudburstmc.protocol.bedrock.data.inventory.ItemData;
-import org.joml.Vector3fc;
 import org.joml.Vector3ic;
 
 import java.util.Collection;
@@ -90,7 +88,7 @@ default void clearStackNetworkId() {
      * This method should handle reducing item count, durability, etc., on successful use.
      * No need to send item updates separately as the caller will handle it.
      * <p>
-     * Note: Placing blocks will not invoke this method. <br>
+     * Note: Placing blocks will not invoke this method.
      *
      * @return true if successfully used
      */
@@ -101,8 +99,8 @@ default boolean useItemOn(Dimension dimension, Vector3ic placeBlockPos, PlayerIn
     /**
      * Attempt to place a block using this item, regardless of whether this item is a block item.
      *
-     * @return true if the block is successfully placed,
-     * false if placement fails (reasons: not a block item, placement check fails, event is canceled)
+     * @return {@code true} if the block is successfully placed,
+     * {@code false} if placement fails (reasons: not a block item, placement check fails, event is canceled)
      */
     default boolean placeBlock(Dimension dimension, Vector3ic placeBlockPos, PlayerInteractInfo placementInfo) {
         return false;
@@ -145,7 +143,7 @@ default NbtMap saveNBT() {
 
     boolean hasEnchantment(EnchantmentType enchantmentType);
 
-    short getEnchantmentLevel(EnchantmentType enchantmentType);
+    int getEnchantmentLevel(EnchantmentType enchantmentType);
 
     Collection<EnchantmentInstance> getEnchantments();
 
@@ -216,7 +214,7 @@ default boolean checkEnchantmentCompatibility(EnchantmentType type) {
 
     default EnchantmentType getIncompatibleEnchantmentType(EnchantmentType type) {
         for (var enchantmentInstance : getEnchantments()) {
-            if (!enchantmentInstance.getType().checkCompatibility(type)) {
+            if (enchantmentInstance.getType().checkIncompatible(type)) {
                 return enchantmentInstance.getType();
             }
         }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/descriptor/ComplexAliasDescriptor.java b/Allay-API/src/main/java/org/allaymc/api/item/descriptor/ComplexAliasDescriptor.java
index 5ed09947b..24c1e1720 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/descriptor/ComplexAliasDescriptor.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/descriptor/ComplexAliasDescriptor.java
@@ -5,7 +5,7 @@
 /**
  * Allay Project 2023/11/26
  * <p>
- * TODO: 目前暂时不知道ComplexAliasDescriptor和DefaultDescriptor有什么区别
+ * TODO: Currently unsure of the differences between {@link ComplexAliasDescriptor} and {@link DefaultDescriptor}.
  *
  * @author daoge_cmd
  */
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/descriptor/DefaultDescriptor.java b/Allay-API/src/main/java/org/allaymc/api/item/descriptor/DefaultDescriptor.java
index 6019e4264..1ae330495 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/descriptor/DefaultDescriptor.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/descriptor/DefaultDescriptor.java
@@ -10,8 +10,8 @@
  *
  * @author daoge_cmd
  */
-@AllArgsConstructor
 @Getter
+@AllArgsConstructor
 public class DefaultDescriptor implements ItemDescriptor {
 
     public static final int WILDCARD_META = 32767;
@@ -26,7 +26,7 @@ public DefaultDescriptor(ItemType<?> itemType) {
     @Override
     public boolean match(ItemStack itemStack) {
         return itemStack.getItemType().getIdentifier().equals(itemType.getIdentifier()) &&
-                (meta == WILDCARD_META || itemStack.getMeta() == meta);
+               (meta == WILDCARD_META || itemStack.getMeta() == meta);
     }
 
     @Override
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/descriptor/ItemDescriptorWithCount.java b/Allay-API/src/main/java/org/allaymc/api/item/descriptor/ItemDescriptorWithCount.java
index 982af4911..92c228afd 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/descriptor/ItemDescriptorWithCount.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/descriptor/ItemDescriptorWithCount.java
@@ -9,8 +9,8 @@
  *
  * @author daoge_cmd
  */
-@AllArgsConstructor
 @Getter
+@AllArgsConstructor
 public class ItemDescriptorWithCount {
     protected ItemDescriptor itemDescriptor;
     protected int count;
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/descriptor/ItemTagDescriptor.java b/Allay-API/src/main/java/org/allaymc/api/item/descriptor/ItemTagDescriptor.java
index 1bad10532..6483c5ef0 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/descriptor/ItemTagDescriptor.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/descriptor/ItemTagDescriptor.java
@@ -10,8 +10,8 @@
  *
  * @author daoge_cmd
  */
-@AllArgsConstructor
 @Getter
+@AllArgsConstructor
 public class ItemTagDescriptor implements ItemDescriptor {
     protected ItemTag itemTag;
 
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/AbstractEnchantmentType.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/AbstractEnchantmentType.java
index 53296da9e..e257247ae 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/AbstractEnchantmentType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/AbstractEnchantmentType.java
@@ -1,6 +1,8 @@
 package org.allaymc.api.item.enchantment;
 
-import it.unimi.dsi.fastutil.shorts.Short2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import lombok.AccessLevel;
+import lombok.Getter;
 import org.allaymc.api.utils.Identifier;
 
 import java.util.Map;
@@ -10,48 +12,32 @@
  *
  * @author daoge_cmd
  */
-public class AbstractEnchantmentType implements EnchantmentType {
+@Getter
+public abstract class AbstractEnchantmentType implements EnchantmentType {
 
     protected final Identifier identifier;
-    protected final short id;
-    protected final short maxLevel;
+    protected final int id;
+    protected final int maxLevel;
     protected final Rarity rarity;
-    protected final Map<Short, EnchantmentInstance> instances = new Short2ObjectOpenHashMap<>();
+    @Getter(AccessLevel.NONE)
+    protected final Map<Integer, EnchantmentInstance> instances = new Int2ObjectOpenHashMap<>();
 
     protected AbstractEnchantmentType(
             Identifier identifier,
-            int id, int maxLevel,
-            Rarity rarity) {
+            int id,
+            int maxLevel,
+            Rarity rarity
+    ) {
         this.identifier = identifier;
         // Use int types in formal parameters to avoid forcing the nasty int -> short type in subclasses
-        this.id = (short) id;
-        this.maxLevel = (short) maxLevel;
+        this.id = id;
+        this.maxLevel = maxLevel;
         this.rarity = rarity;
         EnchantmentRegistry.getRegistry().register(this.id, identifier, this);
     }
 
     @Override
-    public Identifier getIdentifier() {
-        return identifier;
-    }
-
-    @Override
-    public short getId() {
-        return id;
-    }
-
-    @Override
-    public short getMaxLevel() {
-        return maxLevel;
-    }
-
-    @Override
-    public Rarity getRarity() {
-        return rarity;
-    }
-
-    @Override
-    public EnchantmentInstance createInstance(short level) {
+    public EnchantmentInstance createInstance(int level) {
         return instances.computeIfAbsent(level, l -> new SimpleEnchantmentInstance(this, l));
     }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/EnchantmentHelper.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/EnchantmentHelper.java
index cc6bcff36..471fe7c6c 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/EnchantmentHelper.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/EnchantmentHelper.java
@@ -9,12 +9,12 @@
  *
  * @author daoge_cmd
  */
-@UtilityClass
 @Slf4j
+@UtilityClass
 public class EnchantmentHelper {
     public EnchantmentInstance fromNBT(NbtMap nbtMap) {
         var id = nbtMap.getShort("id");
-        var enchantmentType = EnchantmentRegistry.getRegistry().getByK1(id);
+        var enchantmentType = EnchantmentRegistry.getRegistry().getByK1((int) id);
         if (enchantmentType == null) {
             log.warn("Unknown enchantment id {}", id);
             return null;
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/EnchantmentInstance.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/EnchantmentInstance.java
index c47350b1f..4c7164857 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/EnchantmentInstance.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/EnchantmentInstance.java
@@ -11,16 +11,16 @@ public interface EnchantmentInstance {
 
     EnchantmentType getType();
 
-    short getLevel();
+    int getLevel();
 
-    default EnchantmentInstance setLevel(short level) {
+    default EnchantmentInstance setLevel(int level) {
         return getType().createInstance(level);
     }
 
     default NbtMap saveNBT() {
         return NbtMap.builder()
-                .putShort("id", getType().getId())
-                .putShort("lvl", getLevel())
+                .putShort("id", (short) getType().getId())
+                .putShort("lvl", (short) getLevel())
                 .build();
     }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/EnchantmentRegistry.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/EnchantmentRegistry.java
index b02b42b62..64f8ddb0c 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/EnchantmentRegistry.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/EnchantmentRegistry.java
@@ -9,7 +9,7 @@
  *
  * @author daoge_cmd
  */
-public interface EnchantmentRegistry extends DoubleKeyMappedRegistry<Short, Identifier, EnchantmentType> {
+public interface EnchantmentRegistry extends DoubleKeyMappedRegistry<Integer, Identifier, EnchantmentType> {
     ApiInstanceHolder<EnchantmentRegistry> REGISTRY = ApiInstanceHolder.create();
 
     static EnchantmentRegistry getRegistry() {
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/EnchantmentType.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/EnchantmentType.java
index f678e2e66..5f69ab725 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/EnchantmentType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/EnchantmentType.java
@@ -11,16 +11,15 @@ public interface EnchantmentType {
 
     Identifier getIdentifier();
 
-    short getId();
+    int getId();
 
-    short getMaxLevel();
+    int getMaxLevel();
 
     Rarity getRarity();
 
-    EnchantmentInstance createInstance(short level);
+    EnchantmentInstance createInstance(int level);
 
-    default boolean checkCompatibility(EnchantmentType other) {
-        // TODO
-        return true;
+    default boolean checkIncompatible(EnchantmentType other) {
+        return false;
     }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/Rarity.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/Rarity.java
index 936b677a0..31f266953 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/Rarity.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/Rarity.java
@@ -1,5 +1,6 @@
 package org.allaymc.api.item.enchantment;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
@@ -8,6 +9,7 @@
  * @author daoge_cmd
  */
 @Getter
+@AllArgsConstructor
 public enum Rarity {
     COMMON(10),
     UNCOMMON(5),
@@ -16,10 +18,6 @@ public enum Rarity {
 
     private final int weight;
 
-    Rarity(int weight) {
-        this.weight = weight;
-    }
-
     /**
      * Converts the weight to the closest rarity using floor semantic.
      *
@@ -28,13 +26,9 @@ public enum Rarity {
      * @return The closest rarity
      */
     public static Rarity fromWeight(int weight) {
-        if (weight < 2) {
-            return VERY_RARE;
-        } else if (weight < 5) {
-            return RARE;
-        } else if (weight < 10) {
-            return UNCOMMON;
-        }
+        if (weight < 2) return VERY_RARE;
+        else if (weight < 5) return RARE;
+        else if (weight < 10) return UNCOMMON;
         return COMMON;
     }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/SimpleEnchantmentInstance.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/SimpleEnchantmentInstance.java
index 10a7c1314..8750d0e73 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/SimpleEnchantmentInstance.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/SimpleEnchantmentInstance.java
@@ -1,26 +1,16 @@
 package org.allaymc.api.item.enchantment;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
 /**
  * Allay Project 2023/10/21
  *
  * @author daoge_cmd
  */
+@Getter
+@AllArgsConstructor
 public class SimpleEnchantmentInstance implements EnchantmentInstance {
     protected final EnchantmentType type;
-    protected final short level;
-
-    public SimpleEnchantmentInstance(EnchantmentType type, short level) {
-        this.type = type;
-        this.level = level;
-    }
-
-    @Override
-    public EnchantmentType getType() {
-        return type;
-    }
-
-    @Override
-    public short getLevel() {
-        return level;
-    }
+    protected final int level;
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentBaneOfArthropodsType.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentBaneOfArthropodsType.java
index 3d60b5110..669f30071 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentBaneOfArthropodsType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentBaneOfArthropodsType.java
@@ -1,6 +1,7 @@
 package org.allaymc.api.item.enchantment.type;
 
 import org.allaymc.api.item.enchantment.AbstractEnchantmentType;
+import org.allaymc.api.item.enchantment.EnchantmentType;
 import org.allaymc.api.item.enchantment.Rarity;
 import org.allaymc.api.utils.Identifier;
 
@@ -14,4 +15,12 @@ public class EnchantmentBaneOfArthropodsType extends AbstractEnchantmentType {
     private EnchantmentBaneOfArthropodsType() {
         super(new Identifier("minecraft:bane_of_arthropods"), 11, 5, Rarity.UNCOMMON);
     }
+
+    @Override
+    public boolean checkIncompatible(EnchantmentType other) {
+        return other instanceof EnchantmentSmiteType ||
+               other instanceof EnchantmentSharpnessType ||
+               other instanceof EnchantmentBreachType ||
+               other instanceof EnchantmentDensityType;
+    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentBlastProtectionType.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentBlastProtectionType.java
index 8a4f11d76..19e979418 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentBlastProtectionType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentBlastProtectionType.java
@@ -1,6 +1,7 @@
 package org.allaymc.api.item.enchantment.type;
 
 import org.allaymc.api.item.enchantment.AbstractEnchantmentType;
+import org.allaymc.api.item.enchantment.EnchantmentType;
 import org.allaymc.api.item.enchantment.Rarity;
 import org.allaymc.api.utils.Identifier;
 
@@ -14,4 +15,11 @@ public class EnchantmentBlastProtectionType extends AbstractEnchantmentType {
     private EnchantmentBlastProtectionType() {
         super(new Identifier("minecraft:blast_protection"), 3, 4, Rarity.RARE);
     }
+
+    @Override
+    public boolean checkIncompatible(EnchantmentType other) {
+        return other instanceof EnchantmentFireProtectionType ||
+               other instanceof EnchantmentProtectionType ||
+               other instanceof EnchantmentProjectileProtectionType;
+    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentBreachType.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentBreachType.java
index ec5c879dc..b8578f289 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentBreachType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentBreachType.java
@@ -1,6 +1,7 @@
 package org.allaymc.api.item.enchantment.type;
 
 import org.allaymc.api.item.enchantment.AbstractEnchantmentType;
+import org.allaymc.api.item.enchantment.EnchantmentType;
 import org.allaymc.api.item.enchantment.Rarity;
 import org.allaymc.api.utils.Identifier;
 
@@ -11,8 +12,15 @@
  */
 public class EnchantmentBreachType extends AbstractEnchantmentType {
     public static final EnchantmentBreachType BREACH_TYPE = new EnchantmentBreachType();
+
     private EnchantmentBreachType() {
-        // TODO: Check rarity
-        super(new Identifier("minecraft:breach"), 40, 4, Rarity.VERY_RARE);
+        super(new Identifier("minecraft:breach"), 40, 4, Rarity.RARE);
+    }
+
+    @Override
+    public boolean checkIncompatible(EnchantmentType other) {
+        return other instanceof EnchantmentDensityType ||
+               other instanceof EnchantmentBaneOfArthropodsType ||
+               other instanceof EnchantmentSmiteType;
     }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentChannelingType.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentChannelingType.java
index 11cb19deb..ba40933a0 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentChannelingType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentChannelingType.java
@@ -1,6 +1,7 @@
 package org.allaymc.api.item.enchantment.type;
 
 import org.allaymc.api.item.enchantment.AbstractEnchantmentType;
+import org.allaymc.api.item.enchantment.EnchantmentType;
 import org.allaymc.api.item.enchantment.Rarity;
 import org.allaymc.api.utils.Identifier;
 
@@ -14,4 +15,9 @@ public class EnchantmentChannelingType extends AbstractEnchantmentType {
     private EnchantmentChannelingType() {
         super(new Identifier("minecraft:channeling"), 32, 1, Rarity.VERY_RARE);
     }
+
+    @Override
+    public boolean checkIncompatible(EnchantmentType other) {
+        return other instanceof EnchantmentRiptideType;
+    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentDensityType.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentDensityType.java
index 5b4d31744..b4737e714 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentDensityType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentDensityType.java
@@ -1,6 +1,7 @@
 package org.allaymc.api.item.enchantment.type;
 
 import org.allaymc.api.item.enchantment.AbstractEnchantmentType;
+import org.allaymc.api.item.enchantment.EnchantmentType;
 import org.allaymc.api.item.enchantment.Rarity;
 import org.allaymc.api.utils.Identifier;
 
@@ -11,8 +12,15 @@
  */
 public class EnchantmentDensityType extends AbstractEnchantmentType {
     public static final EnchantmentDensityType DENSITY_TYPE = new EnchantmentDensityType();
+
     private EnchantmentDensityType() {
-        // TODO: Check rarity
-        super(new Identifier("minecraft:density"), 39, 5, Rarity.VERY_RARE);
+        super(new Identifier("minecraft:density"), 39, 5, Rarity.UNCOMMON);
+    }
+
+    @Override
+    public boolean checkIncompatible(EnchantmentType other) {
+        return other instanceof EnchantmentBreachType ||
+               other instanceof EnchantmentBaneOfArthropodsType ||
+               other instanceof EnchantmentSmiteType;
     }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentDepthStriderType.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentDepthStriderType.java
index 4e6d0abea..e8a917188 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentDepthStriderType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentDepthStriderType.java
@@ -1,6 +1,7 @@
 package org.allaymc.api.item.enchantment.type;
 
 import org.allaymc.api.item.enchantment.AbstractEnchantmentType;
+import org.allaymc.api.item.enchantment.EnchantmentType;
 import org.allaymc.api.item.enchantment.Rarity;
 import org.allaymc.api.utils.Identifier;
 
@@ -14,4 +15,9 @@ public class EnchantmentDepthStriderType extends AbstractEnchantmentType {
     private EnchantmentDepthStriderType() {
         super(new Identifier("minecraft:depth_strider"), 7, 3, Rarity.RARE);
     }
+
+    @Override
+    public boolean checkIncompatible(EnchantmentType other) {
+        return other instanceof EnchantmentFrostWalkerType;
+    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentFireProtectionType.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentFireProtectionType.java
index 91c65f710..c160a91be 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentFireProtectionType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentFireProtectionType.java
@@ -1,6 +1,7 @@
 package org.allaymc.api.item.enchantment.type;
 
 import org.allaymc.api.item.enchantment.AbstractEnchantmentType;
+import org.allaymc.api.item.enchantment.EnchantmentType;
 import org.allaymc.api.item.enchantment.Rarity;
 import org.allaymc.api.utils.Identifier;
 
@@ -14,4 +15,11 @@ public class EnchantmentFireProtectionType extends AbstractEnchantmentType {
     private EnchantmentFireProtectionType() {
         super(new Identifier("minecraft:fire_protection"), 1, 4, Rarity.UNCOMMON);
     }
+
+    @Override
+    public boolean checkIncompatible(EnchantmentType other) {
+        return other instanceof EnchantmentBlastProtectionType ||
+               other instanceof EnchantmentProtectionType ||
+               other instanceof EnchantmentProjectileProtectionType;
+    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentFortuneType.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentFortuneType.java
index bce39fa23..47bd89e76 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentFortuneType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentFortuneType.java
@@ -1,6 +1,7 @@
 package org.allaymc.api.item.enchantment.type;
 
 import org.allaymc.api.item.enchantment.AbstractEnchantmentType;
+import org.allaymc.api.item.enchantment.EnchantmentType;
 import org.allaymc.api.item.enchantment.Rarity;
 import org.allaymc.api.utils.Identifier;
 
@@ -14,4 +15,9 @@ public class EnchantmentFortuneType extends AbstractEnchantmentType {
     private EnchantmentFortuneType() {
         super(new Identifier("minecraft:fortune"), 18, 3, Rarity.RARE);
     }
+
+    @Override
+    public boolean checkIncompatible(EnchantmentType other) {
+        return other instanceof EnchantmentSilkTouchType;
+    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentFrostWalkerType.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentFrostWalkerType.java
index 193f2286f..02c1e6301 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentFrostWalkerType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentFrostWalkerType.java
@@ -1,6 +1,7 @@
 package org.allaymc.api.item.enchantment.type;
 
 import org.allaymc.api.item.enchantment.AbstractEnchantmentType;
+import org.allaymc.api.item.enchantment.EnchantmentType;
 import org.allaymc.api.item.enchantment.Rarity;
 import org.allaymc.api.utils.Identifier;
 
@@ -15,4 +16,9 @@ public class EnchantmentFrostWalkerType extends AbstractEnchantmentType {
     private EnchantmentFrostWalkerType() {
         super(new Identifier("minecraft:frost_walker"), 25, 3, Rarity.RARE);
     }
+
+    @Override
+    public boolean checkIncompatible(EnchantmentType other) {
+        return other instanceof EnchantmentDepthStriderType;
+    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentInfinityType.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentInfinityType.java
index cc4ab9d6f..c3e3fa0e5 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentInfinityType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentInfinityType.java
@@ -1,6 +1,7 @@
 package org.allaymc.api.item.enchantment.type;
 
 import org.allaymc.api.item.enchantment.AbstractEnchantmentType;
+import org.allaymc.api.item.enchantment.EnchantmentType;
 import org.allaymc.api.item.enchantment.Rarity;
 import org.allaymc.api.utils.Identifier;
 
@@ -14,4 +15,9 @@ public class EnchantmentInfinityType extends AbstractEnchantmentType {
     private EnchantmentInfinityType() {
         super(new Identifier("minecraft:infinity"), 22, 1, Rarity.VERY_RARE);
     }
+
+    @Override
+    public boolean checkIncompatible(EnchantmentType other) {
+        return other instanceof EnchantmentMendingType;
+    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentLoyaltyType.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentLoyaltyType.java
index c58eb645b..6848c2dde 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentLoyaltyType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentLoyaltyType.java
@@ -1,6 +1,7 @@
 package org.allaymc.api.item.enchantment.type;
 
 import org.allaymc.api.item.enchantment.AbstractEnchantmentType;
+import org.allaymc.api.item.enchantment.EnchantmentType;
 import org.allaymc.api.item.enchantment.Rarity;
 import org.allaymc.api.utils.Identifier;
 
@@ -14,4 +15,9 @@ public class EnchantmentLoyaltyType extends AbstractEnchantmentType {
     private EnchantmentLoyaltyType() {
         super(new Identifier("minecraft:loyalty"), 31, 3, Rarity.UNCOMMON);
     }
+
+    @Override
+    public boolean checkIncompatible(EnchantmentType other) {
+        return other instanceof EnchantmentRiptideType;
+    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentMendingType.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentMendingType.java
index e63780960..dc3da6941 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentMendingType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentMendingType.java
@@ -1,6 +1,7 @@
 package org.allaymc.api.item.enchantment.type;
 
 import org.allaymc.api.item.enchantment.AbstractEnchantmentType;
+import org.allaymc.api.item.enchantment.EnchantmentType;
 import org.allaymc.api.item.enchantment.Rarity;
 import org.allaymc.api.utils.Identifier;
 
@@ -14,4 +15,9 @@ public class EnchantmentMendingType extends AbstractEnchantmentType {
     private EnchantmentMendingType() {
         super(new Identifier("minecraft:mending"), 26, 3, Rarity.RARE);
     }
+
+    @Override
+    public boolean checkIncompatible(EnchantmentType other) {
+        return other instanceof EnchantmentInfinityType;
+    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentMultishotType.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentMultishotType.java
index 932827de2..9d45df4b7 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentMultishotType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentMultishotType.java
@@ -1,6 +1,7 @@
 package org.allaymc.api.item.enchantment.type;
 
 import org.allaymc.api.item.enchantment.AbstractEnchantmentType;
+import org.allaymc.api.item.enchantment.EnchantmentType;
 import org.allaymc.api.item.enchantment.Rarity;
 import org.allaymc.api.utils.Identifier;
 
@@ -14,4 +15,9 @@ public class EnchantmentMultishotType extends AbstractEnchantmentType {
     private EnchantmentMultishotType() {
         super(new Identifier("minecraft:multishot"), 33, 1, Rarity.RARE);
     }
+
+    @Override
+    public boolean checkIncompatible(EnchantmentType other) {
+        return other instanceof EnchantmentPiercingType;
+    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentPiercingType.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentPiercingType.java
index 65ddab83b..1e8ab21d6 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentPiercingType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentPiercingType.java
@@ -1,6 +1,7 @@
 package org.allaymc.api.item.enchantment.type;
 
 import org.allaymc.api.item.enchantment.AbstractEnchantmentType;
+import org.allaymc.api.item.enchantment.EnchantmentType;
 import org.allaymc.api.item.enchantment.Rarity;
 import org.allaymc.api.utils.Identifier;
 
@@ -14,4 +15,9 @@ public class EnchantmentPiercingType extends AbstractEnchantmentType {
     private EnchantmentPiercingType() {
         super(new Identifier("minecraft:piercing"), 34, 4, Rarity.COMMON);
     }
+
+    @Override
+    public boolean checkIncompatible(EnchantmentType other) {
+        return other instanceof EnchantmentMultishotType;
+    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentProjectileProtectionType.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentProjectileProtectionType.java
index 99ae31f21..f0f637e3a 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentProjectileProtectionType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentProjectileProtectionType.java
@@ -1,6 +1,7 @@
 package org.allaymc.api.item.enchantment.type;
 
 import org.allaymc.api.item.enchantment.AbstractEnchantmentType;
+import org.allaymc.api.item.enchantment.EnchantmentType;
 import org.allaymc.api.item.enchantment.Rarity;
 import org.allaymc.api.utils.Identifier;
 
@@ -14,4 +15,11 @@ public class EnchantmentProjectileProtectionType extends AbstractEnchantmentType
     private EnchantmentProjectileProtectionType() {
         super(new Identifier("minecraft:projectile_protection"), 4, 4, Rarity.UNCOMMON);
     }
+
+    @Override
+    public boolean checkIncompatible(EnchantmentType other) {
+        return other instanceof EnchantmentProtectionType ||
+               other instanceof EnchantmentBlastProtectionType ||
+               other instanceof EnchantmentFireProtectionType;
+    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentProtectionType.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentProtectionType.java
index 79cc932c4..c6950aa03 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentProtectionType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentProtectionType.java
@@ -1,6 +1,7 @@
 package org.allaymc.api.item.enchantment.type;
 
 import org.allaymc.api.item.enchantment.AbstractEnchantmentType;
+import org.allaymc.api.item.enchantment.EnchantmentType;
 import org.allaymc.api.item.enchantment.Rarity;
 import org.allaymc.api.utils.Identifier;
 
@@ -14,4 +15,11 @@ public class EnchantmentProtectionType extends AbstractEnchantmentType {
     private EnchantmentProtectionType() {
         super(new Identifier("minecraft:protection"), 0, 4, Rarity.COMMON);
     }
+
+    @Override
+    public boolean checkIncompatible(EnchantmentType other) {
+        return other instanceof EnchantmentBlastProtectionType ||
+               other instanceof EnchantmentFireProtectionType ||
+               other instanceof EnchantmentProjectileProtectionType;
+    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentRiptideType.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentRiptideType.java
index 8af0933ba..77a37b1c6 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentRiptideType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentRiptideType.java
@@ -1,6 +1,7 @@
 package org.allaymc.api.item.enchantment.type;
 
 import org.allaymc.api.item.enchantment.AbstractEnchantmentType;
+import org.allaymc.api.item.enchantment.EnchantmentType;
 import org.allaymc.api.item.enchantment.Rarity;
 import org.allaymc.api.utils.Identifier;
 
@@ -14,4 +15,9 @@ public class EnchantmentRiptideType extends AbstractEnchantmentType {
     private EnchantmentRiptideType() {
         super(new Identifier("minecraft:riptide"), 30, 3, Rarity.RARE);
     }
+
+    @Override
+    public boolean checkIncompatible(EnchantmentType other) {
+        return other instanceof EnchantmentChannelingType || other instanceof EnchantmentLoyaltyType;
+    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentSharpnessType.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentSharpnessType.java
index a7b0d04f4..0421b9da0 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentSharpnessType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentSharpnessType.java
@@ -1,6 +1,7 @@
 package org.allaymc.api.item.enchantment.type;
 
 import org.allaymc.api.item.enchantment.AbstractEnchantmentType;
+import org.allaymc.api.item.enchantment.EnchantmentType;
 import org.allaymc.api.item.enchantment.Rarity;
 import org.allaymc.api.utils.Identifier;
 
@@ -14,4 +15,9 @@ public class EnchantmentSharpnessType extends AbstractEnchantmentType {
     private EnchantmentSharpnessType() {
         super(new Identifier("minecraft:sharpness"), 9, 5, Rarity.COMMON);
     }
+
+    @Override
+    public boolean checkIncompatible(EnchantmentType other) {
+        return other instanceof EnchantmentBaneOfArthropodsType || other instanceof EnchantmentSmiteType;
+    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentSilkTouchType.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentSilkTouchType.java
index 43f795928..742958f13 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentSilkTouchType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentSilkTouchType.java
@@ -1,6 +1,7 @@
 package org.allaymc.api.item.enchantment.type;
 
 import org.allaymc.api.item.enchantment.AbstractEnchantmentType;
+import org.allaymc.api.item.enchantment.EnchantmentType;
 import org.allaymc.api.item.enchantment.Rarity;
 import org.allaymc.api.utils.Identifier;
 
@@ -14,4 +15,9 @@ public class EnchantmentSilkTouchType extends AbstractEnchantmentType {
     private EnchantmentSilkTouchType() {
         super(new Identifier("minecraft:silk_touch"), 16, 1, Rarity.VERY_RARE);
     }
+
+    @Override
+    public boolean checkIncompatible(EnchantmentType other) {
+        return other instanceof EnchantmentFortuneType;
+    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentSmiteType.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentSmiteType.java
index bdb67b02e..84ab884ee 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentSmiteType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentSmiteType.java
@@ -1,6 +1,7 @@
 package org.allaymc.api.item.enchantment.type;
 
 import org.allaymc.api.item.enchantment.AbstractEnchantmentType;
+import org.allaymc.api.item.enchantment.EnchantmentType;
 import org.allaymc.api.item.enchantment.Rarity;
 import org.allaymc.api.utils.Identifier;
 
@@ -14,4 +15,12 @@ public class EnchantmentSmiteType extends AbstractEnchantmentType {
     private EnchantmentSmiteType() {
         super(new Identifier("minecraft:smite"), 10, 5, Rarity.UNCOMMON);
     }
+
+    @Override
+    public boolean checkIncompatible(EnchantmentType other) {
+        return other instanceof EnchantmentBaneOfArthropodsType ||
+               other instanceof EnchantmentSharpnessType ||
+               other instanceof EnchantmentBreachType ||
+               other instanceof EnchantmentDensityType;
+    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentWindBurstType.java b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentWindBurstType.java
index ac73c63a2..b73b9fb20 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentWindBurstType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/enchantment/type/EnchantmentWindBurstType.java
@@ -11,8 +11,8 @@
  */
 public class EnchantmentWindBurstType extends AbstractEnchantmentType {
     public static final EnchantmentWindBurstType WIND_BURST_TYPE = new EnchantmentWindBurstType();
+
     private EnchantmentWindBurstType() {
-        // TODO: Check rarity
-        super(new Identifier("minecraft:wind_burst"), 38, 4, Rarity.VERY_RARE);
+        super(new Identifier("minecraft:wind_burst"), 38, 4, Rarity.RARE);
     }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/recipe/CraftingRecipe.java b/Allay-API/src/main/java/org/allaymc/api/item/recipe/CraftingRecipe.java
index f03a875fd..bb3451d48 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/recipe/CraftingRecipe.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/recipe/CraftingRecipe.java
@@ -1,12 +1,14 @@
 package org.allaymc.api.item.recipe;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 import org.allaymc.api.item.ItemStack;
+import org.allaymc.api.item.component.common.ItemBaseComponent;
 import org.allaymc.api.utils.Identifier;
 import org.cloudburstmc.protocol.bedrock.data.inventory.ItemData;
 import org.cloudburstmc.protocol.bedrock.data.inventory.crafting.recipe.RecipeData;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
@@ -15,16 +17,17 @@
  *
  * @author daoge_cmd
  */
+@Getter
 public abstract class CraftingRecipe implements Recipe, TaggedRecipe, UniqueRecipe, IdentifiedRecipe, NetworkRecipe {
     protected Identifier identifier;
     protected ItemStack[] outputs;
     protected String tag;
     protected int networkId;
     protected UUID uuid;
-    // 配方优先级，当出现多个匹配配方时客户端需要根据优先级决定使用哪个配方
-    // 服务端实现并不需要用到此参数，但是客户端需要
-    @Getter
+    // Recipe priority: when multiple matching recipes are available, the client decides which one to use based on this priority
+    // This parameter is not required for server-side implementation but is necessary for clients
     protected int priority;
+    @Getter(AccessLevel.NONE)
     protected RecipeData networkRecipeDataCache;
 
     protected CraftingRecipe(Identifier identifier, ItemStack[] outputs, String tag, UUID uuid, int priority) {
@@ -36,42 +39,12 @@ protected CraftingRecipe(Identifier identifier, ItemStack[] outputs, String tag,
         this.priority = priority;
     }
 
-
-    @Override
-    public Identifier getIdentifier() {
-        return identifier;
-    }
-
-    @Override
-    public ItemStack[] getOutputs() {
-        return outputs;
-    }
-
-    @Override
-    public String getTag() {
-        return tag;
-    }
-
-    @Override
-    public int getNetworkId() {
-        return networkId;
-    }
-
-    @Override
-    public UUID getUUID() {
-        return uuid;
-    }
-
     @Override
     public RecipeData toNetworkRecipeData() {
         return networkRecipeDataCache;
     }
 
     protected List<ItemData> buildNetworkOutputs() {
-        List<ItemData> results = new ArrayList<>();
-        for (var output : outputs) {
-            results.add(output.toNetworkItemData());
-        }
-        return results;
+        return Arrays.stream(outputs).map(ItemBaseComponent::toNetworkItemData).toList();
     }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/recipe/IdentifiedRecipe.java b/Allay-API/src/main/java/org/allaymc/api/item/recipe/IdentifiedRecipe.java
index b66eed910..d06139a44 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/recipe/IdentifiedRecipe.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/recipe/IdentifiedRecipe.java
@@ -5,7 +5,7 @@
 /**
  * Allay Project 2023/11/26
  * <p>
- * 具有标识符的配方
+ * Recipe with an identifier.
  *
  * @author daoge_cmd
  */
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/recipe/NetworkRecipe.java b/Allay-API/src/main/java/org/allaymc/api/item/recipe/NetworkRecipe.java
index 826dfb88a..b50a669d0 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/recipe/NetworkRecipe.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/recipe/NetworkRecipe.java
@@ -15,7 +15,7 @@ static int assignNetworkId() {
     }
 
     /**
-     * @return 配方的唯一网络id，由内部分配
+     * @return The unique network ID of the recipe, assigned internally.
      */
     int getNetworkId();
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/recipe/Recipe.java b/Allay-API/src/main/java/org/allaymc/api/item/recipe/Recipe.java
index 1db4a4d4e..d31d4b918 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/recipe/Recipe.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/recipe/Recipe.java
@@ -12,14 +12,14 @@
  */
 public interface Recipe {
     /**
-     * @param input 输入
+     * @param input Input
      *
-     * @return 输入是否匹配配方
+     * @return Whether the input matches the recipe
      */
     boolean match(Input input);
 
     /**
-     * @return 此配方的输出
+     * @return The outputs of this recipe
      */
     ItemStack[] getOutputs();
 
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/recipe/ShapedRecipe.java b/Allay-API/src/main/java/org/allaymc/api/item/recipe/ShapedRecipe.java
index 98905eda2..8d2513759 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/recipe/ShapedRecipe.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/recipe/ShapedRecipe.java
@@ -1,6 +1,7 @@
 package org.allaymc.api.item.recipe;
 
 import lombok.Builder;
+import lombok.Getter;
 import org.allaymc.api.item.ItemStack;
 import org.allaymc.api.item.descriptor.ItemDescriptor;
 import org.allaymc.api.item.recipe.input.CraftingInput;
@@ -11,10 +12,7 @@
 import org.cloudburstmc.protocol.bedrock.data.inventory.crafting.recipe.ShapedRecipeData;
 import org.cloudburstmc.protocol.bedrock.data.inventory.descriptor.ItemDescriptorWithCount;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 import static org.allaymc.api.item.type.ItemTypes.AIR_TYPE;
 
@@ -23,10 +21,13 @@
  *
  * @author daoge_cmd
  */
+@Getter
 public class ShapedRecipe extends CraftingRecipe {
 
     public static final char EMPTY_KEY_CHAR = ' ';
+
     protected static final ItemStack[][] EMPTY_ITEM_STACK_ARRAY = new ItemStack[0][0];
+
     protected char[][] pattern;
     protected Map<Character, ItemDescriptor> keys;
 
@@ -69,22 +70,13 @@ protected List<ItemDescriptorWithCount> buildNetworkIngredients() {
 
     @Override
     public boolean match(Input input) {
-        ItemStack[][] inputs;
-        if (input instanceof CraftingInput craftingInput) {
-            inputs = removeUselessRowAndColumn(craftingInput.getItems());
-        } else return false;
-
-        // Check size
-        if (inputs.length == 0) {
-            // Empty input not allowed
-            return false;
-        }
-        if (inputs.length > pattern.length) {
-            return false;
-        }
-        if (inputs[0].length > pattern[0].length) {
-            return false;
-        }
+        if (!(input instanceof CraftingInput craftingInput)) return false;
+
+        var inputs = removeUselessRowAndColumn(craftingInput.getItems());
+        // Empty input not allowed
+        if (inputs.length == 0) return false;
+        if (inputs.length > pattern.length) return false;
+        if (inputs[0].length > pattern[0].length) return false;
 
         for (int i = 0, patternLength = pattern.length; i < patternLength; i++) {
             var row = pattern[i];
@@ -92,14 +84,10 @@ public boolean match(Input input) {
                 var key = row[j];
                 var item = inputs[i][j];
                 if (key == EMPTY_KEY_CHAR) {
-                    if (!item.getItemType().equals(AIR_TYPE)) {
-                        return false;
-                    }
+                    if (!item.getItemType().equals(AIR_TYPE)) return false;
                 } else {
                     var descriptor = keys.get(key);
-                    if (!descriptor.match(item)) {
-                        return false;
-                    }
+                    if (!descriptor.match(item)) return false;
                 }
             }
         }
@@ -107,39 +95,57 @@ public boolean match(Input input) {
         return true;
     }
 
+    // @formatter:off
     /**
      * Remove useless row and column
      *
-     * @param inputs [o, o, x]    [x, o, o]
+     * @param inputs <pre>
+     *               {@code
+     *               [o, o, x]    [x, o, o]
      *               [o, o, x] or [x, o, o] or etc...
      *               [x, x, x]    [x, x, x]
+     *               }
+     *               </pre>
      *
-     * @return [o, o]
-     * [o, o]
+     * @return <pre>
+     *     {@code
+     *     [o, o]
+     *     [o, o]
+     *     }
+     * </pre>
      */
+    // @formatter:on
     protected ItemStack[][] removeUselessRowAndColumn(ItemStack[][] inputs) {
-        int startRow = 0, endRow = inputs.length - 1;
+        int
+                startRow = 0,
+                endRow = inputs.length - 1;
         for (int row = 0; row < inputs.length; row++) {
             if (notAllEmptyRow(inputs[row])) {
                 startRow = row;
                 break;
             }
-            // 发现全部都是空气，直接返回空数组
+
+            // If all are air, return empty array directly
             if (row == inputs.length - 1) return EMPTY_ITEM_STACK_ARRAY;
         }
+
         for (int row = inputs.length - 1; row >= 0; row--) {
             if (notAllEmptyRow(inputs[row])) {
                 endRow = row;
                 break;
             }
         }
-        int startColumn = 0, endColumn = inputs[0].length - 1;
+
+        int
+                startColumn = 0,
+                endColumn = inputs[0].length - 1;
         for (int column = 0; column < inputs[0].length; column++) {
             if (notAllEmptyColumn(inputs, column)) {
                 startColumn = column;
                 break;
             }
         }
+
         for (int column = inputs[0].length - 1; column >= 0; column--) {
             if (notAllEmptyColumn(inputs, column)) {
                 endColumn = column;
@@ -147,11 +153,11 @@ protected ItemStack[][] removeUselessRowAndColumn(ItemStack[][] inputs) {
             }
         }
 
-        if (startRow == 0 && endRow == inputs.length - 1 && startColumn == 0 && endColumn == inputs[0].length - 1) {
-            return inputs;
-        }
+        if (startRow == 0 && endRow == inputs.length - 1 &&
+            startColumn == 0 && endColumn == inputs[0].length - 1
+        ) return inputs;
 
-        ItemStack[][] result = new ItemStack[endRow - startRow + 1][endColumn - startColumn + 1];
+        var result = new ItemStack[endRow - startRow + 1][endColumn - startColumn + 1];
         for (int row = startRow; row <= endRow; row++) {
             if (endColumn + 1 - startColumn >= 0)
                 System.arraycopy(inputs[row], startColumn, result[row - startRow], 0, endColumn + 1 - startColumn);
@@ -161,35 +167,19 @@ protected ItemStack[][] removeUselessRowAndColumn(ItemStack[][] inputs) {
     }
 
     protected boolean notAllEmptyRow(ItemStack[] inputs) {
-        for (var item : inputs) {
-            if (item.getItemType() != AIR_TYPE) {
-                return true;
-            }
-        }
-        return false;
+        return Arrays.stream(inputs).anyMatch(item -> item.getItemType() != AIR_TYPE);
     }
 
     protected boolean notAllEmptyColumn(ItemStack[][] inputs, int column) {
-        for (var row : inputs) {
-            if (row[column].getItemType() != AIR_TYPE) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public char[][] getPattern() {
-        return pattern;
-    }
-
-    public Map<Character, ItemDescriptor> getKeys() {
-        return keys;
+        return Arrays.stream(inputs).anyMatch(row -> row[column].getItemType() != AIR_TYPE);
     }
 
     public interface PatternHelper {
-        static char[][] build(char a, char b, char c,
-                              char d, char e, char f,
-                              char g, char h, char i) {
+        static char[][] build(
+                char a, char b, char c,
+                char d, char e, char f,
+                char g, char h, char i
+        ) {
             return new char[][]{
                     {a, b, c},
                     {d, e, f},
@@ -197,8 +187,10 @@ static char[][] build(char a, char b, char c,
             };
         }
 
-        static char[][] build(char a, char b,
-                              char c, char d) {
+        static char[][] build(
+                char a, char b,
+                char c, char d
+        ) {
             return new char[][]{
                     {a, b},
                     {c, d}
@@ -206,9 +198,7 @@ static char[][] build(char a, char b,
         }
 
         static char[][] build(char a) {
-            return new char[][]{
-                    {a}
-            };
+            return new char[][]{{a}};
         }
 
         static char[][] build(String l1, String l2, String l3) {
@@ -227,15 +217,17 @@ static char[][] build(String l1, String l2) {
         }
 
         static char[][] build(List<String> stringList) {
-            var commonLength = stringList.get(0).length();
-            char[][] pattern = new char[stringList.size()][commonLength];
+            var commonLength = stringList.getFirst().length();
+            var pattern = new char[stringList.size()][commonLength];
             for (int row = 0; row < stringList.size(); row++) {
                 var line = stringList.get(row);
                 if (line.length() != commonLength)
                     throw new IllegalArgumentException("All row in pattern must have the same length");
+
                 var charArray = line.toCharArray();
                 System.arraycopy(charArray, 0, pattern[row], 0, charArray.length);
             }
+
             return pattern;
         }
     }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/recipe/ShapelessRecipe.java b/Allay-API/src/main/java/org/allaymc/api/item/recipe/ShapelessRecipe.java
index 5b70715a7..8fb5bb1c1 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/recipe/ShapelessRecipe.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/recipe/ShapelessRecipe.java
@@ -1,6 +1,7 @@
 package org.allaymc.api.item.recipe;
 
 import lombok.Builder;
+import lombok.Getter;
 import org.allaymc.api.item.ItemStack;
 import org.allaymc.api.item.descriptor.ItemDescriptor;
 import org.allaymc.api.item.recipe.input.CraftingInput;
@@ -12,6 +13,7 @@
 import org.cloudburstmc.protocol.bedrock.data.inventory.descriptor.ItemDescriptorWithCount;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
@@ -23,7 +25,7 @@
  * @author daoge_cmd
  */
 public class ShapelessRecipe extends CraftingRecipe {
-
+    @Getter
     protected ItemDescriptor[] ingredients;
 
     @Builder
@@ -35,17 +37,13 @@ protected ShapelessRecipe(ItemDescriptor[] ingredients, Identifier identifier, I
 
     @Override
     public boolean match(Input input) {
-        CraftingInput craftingInput;
-        if (input instanceof CraftingInput c) {
-            craftingInput = c;
-        } else return false;
+        if (!(input instanceof CraftingInput craftingInput)) return false;
 
         var inputItems = collectNonAirItems(craftingInput.getFlattenItems());
-        if (inputItems.size() != ingredients.length) {
-            return false;
-        }
+        if (inputItems.size() != ingredients.length) return false;
+
+        var itemPool = new ArrayList<>(inputItems);
 
-        List<ItemStack> itemPool = new ArrayList<>(inputItems);
         var checkCount = ingredients.length;
         for (var ingredient : ingredients) {
             var index = findItem(itemPool, ingredient);
@@ -54,17 +52,12 @@ public boolean match(Input input) {
                 checkCount--;
             }
         }
+
         return checkCount == 0 && itemPool.isEmpty();
     }
 
     protected List<ItemStack> collectNonAirItems(ItemStack[] items) {
-        var result = new ArrayList<ItemStack>();
-        for (var item : items) {
-            if (item.getItemType() != AIR_TYPE) {
-                result.add(item);
-            }
-        }
-        return result;
+        return Arrays.stream(items).filter(item -> item.getItemType() != AIR_TYPE).toList();
     }
 
     protected int findItem(List<ItemStack> itemPool, ItemDescriptor target) {
@@ -91,14 +84,8 @@ protected RecipeData buildNetworkRecipeData() {
     }
 
     protected List<ItemDescriptorWithCount> buildNetworkIngredients() {
-        var result = new ArrayList<ItemDescriptorWithCount>();
-        for (var ingredient : ingredients) {
-            result.add(new ItemDescriptorWithCount(ingredient.toNetwork(), 1));
-        }
-        return result;
-    }
-
-    public ItemDescriptor[] getIngredients() {
-        return ingredients;
+        return Arrays.stream(ingredients)
+                .map(ingredient -> new ItemDescriptorWithCount(ingredient.toNetwork(), 1))
+                .toList();
     }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/recipe/TaggedRecipe.java b/Allay-API/src/main/java/org/allaymc/api/item/recipe/TaggedRecipe.java
index e53b21938..6db4d160b 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/recipe/TaggedRecipe.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/recipe/TaggedRecipe.java
@@ -7,7 +7,8 @@
  */
 public interface TaggedRecipe extends Recipe {
     /**
-     * @return 这个配方所适用的合成类型。例如，工作台配方应具有 "crafting_table" tag
+     * @return The tag indicating the crafting type applicable to this recipe.
+     * For example, a crafting table recipe should have the "crafting_table" tag.
      */
     String getTag();
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/recipe/UniqueRecipe.java b/Allay-API/src/main/java/org/allaymc/api/item/recipe/UniqueRecipe.java
index cd0b52453..207e10ae4 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/recipe/UniqueRecipe.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/recipe/UniqueRecipe.java
@@ -8,9 +8,8 @@
  * @author daoge_cmd
  */
 public interface UniqueRecipe extends Recipe {
-
     /**
-     * @return 配方的UUID
+     * @return The UUID of the recipe
      */
-    UUID getUUID();
+    UUID getUuid();
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/item/recipe/input/CraftingInput.java b/Allay-API/src/main/java/org/allaymc/api/item/recipe/input/CraftingInput.java
index 94d2f1104..bb90a80aa 100644
--- a/Allay-API/src/main/java/org/allaymc/api/item/recipe/input/CraftingInput.java
+++ b/Allay-API/src/main/java/org/allaymc/api/item/recipe/input/CraftingInput.java
@@ -12,7 +12,7 @@
  */
 @Getter
 public class CraftingInput implements Input {
-    // 我们规定左上角物品索引为[0][0]，坐标轴为[行][列]
+    // We define the top-left item index as [0][0], with the coordinate system as [row][column]
     protected ItemStack[][] items;
 
     // 3x3
diff --git a/Allay-API/src/main/java/org/allaymc/api/math/voxelshape/CommonShapes.java b/Allay-API/src/main/java/org/allaymc/api/math/voxelshape/CommonShapes.java
index cf5126455..c9ee88872 100644
--- a/Allay-API/src/main/java/org/allaymc/api/math/voxelshape/CommonShapes.java
+++ b/Allay-API/src/main/java/org/allaymc/api/math/voxelshape/CommonShapes.java
@@ -16,17 +16,14 @@
  */
 public abstract class CommonShapes {
 
-    //Stair
-
+    // Stairs
     public static final Map<BlockFace, VoxelShape> UPWARDS_STAIR_SHAPES = new EnumMap<>(BlockFace.class);
     public static final Map<BlockFace, VoxelShape> DOWNWARDS_STAIR_SHAPES = new EnumMap<>(BlockFace.class);
-    private static final VoxelShape UPWARDS_STAIR_SHAPE = VoxelShape
-            .builder()
+    private static final VoxelShape UPWARDS_STAIR_SHAPE = VoxelShape.builder()
             .solid(0, 0, 0, 1, 1, 1)
             .vacancy(0, 0.5f, 0, 0.5f, 1, 1)
             .build();
-    private static final VoxelShape DOWNWARDS_STAIR_SHAPE = VoxelShape
-            .builder()
+    private static final VoxelShape DOWNWARDS_STAIR_SHAPE = VoxelShape.builder()
             .solid(0, 0, 0, 1, 1, 1)
             .vacancy(0, 0, 0, 0.5f, 0.5f, 1)
             .build();
diff --git a/Allay-API/src/main/java/org/allaymc/api/math/voxelshape/VoxelShape.java b/Allay-API/src/main/java/org/allaymc/api/math/voxelshape/VoxelShape.java
index 8f106b762..44fcb8602 100644
--- a/Allay-API/src/main/java/org/allaymc/api/math/voxelshape/VoxelShape.java
+++ b/Allay-API/src/main/java/org/allaymc/api/math/voxelshape/VoxelShape.java
@@ -1,5 +1,7 @@
 package org.allaymc.api.math.voxelshape;
 
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.allaymc.api.block.data.BlockFace;
 import org.joml.Vector3fc;
@@ -8,6 +10,7 @@
 
 import java.util.HashSet;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * Allay Project 2023/8/26
@@ -15,22 +18,24 @@
  * @author daoge_cmd
  */
 @Getter
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
 public final class VoxelShape {
-    private final Set<AABBfc> vacancies;
     private final Set<AABBfc> solids;
-
-    private VoxelShape(Set<AABBfc> solids, Set<AABBfc> vacancies) {
-        this.solids = solids;
-        this.vacancies = vacancies;
-    }
+    private final Set<AABBfc> vacancies;
 
     public static VoxelShapeBuilder builder() {
         return new VoxelShapeBuilder();
     }
 
     public AABBf unionAABB() {
-        float minX = Float.MAX_VALUE, minY = Float.MAX_VALUE, minZ = Float.MAX_VALUE;
-        float maxX = -Float.MAX_VALUE, maxY = -Float.MAX_VALUE, maxZ = -Float.MAX_VALUE;
+        float
+                minX = Float.MAX_VALUE,
+                minY = Float.MAX_VALUE,
+                minZ = Float.MAX_VALUE;
+        float
+                maxX = -Float.MAX_VALUE,
+                maxY = -Float.MAX_VALUE,
+                maxZ = -Float.MAX_VALUE;
         for (var solid : solids) {
             if (solid.minX() < minX) minX = solid.minX();
             if (solid.minY() < minY) minY = solid.minY();
@@ -46,51 +51,51 @@ public AABBf unionAABB() {
     }
 
     public VoxelShape rotate(BlockFace face) {
-        var newVacancies = new HashSet<AABBfc>();
-        var newSolids = new HashSet<AABBfc>();
-        vacancies.forEach(vacancy -> newVacancies.add(face.rotateAABB(vacancy)));
-        solids.forEach(solid -> newSolids.add(face.rotateAABB(solid)));
+        Set<AABBfc> newSolids = solids.stream()
+                .map(face::rotateAABB)
+                .collect(Collectors.toSet());
+        Set<AABBfc> newVacancies = vacancies.stream()
+                .map(face::rotateAABB)
+                .collect(Collectors.toSet());
         return new VoxelShape(newSolids, newVacancies);
     }
 
     public VoxelShape translate(float x, float y, float z) {
-        var newVacancies = new HashSet<AABBfc>();
-        var newSolids = new HashSet<AABBfc>();
-        vacancies.forEach(vacancy -> newVacancies.add(vacancy.translate(x, y, z, new AABBf())));
-        solids.forEach(solid -> newSolids.add(solid.translate(x, y, z, new AABBf())));
+        Set<AABBfc> newSolids = solids.stream()
+                .map(solid -> solid.translate(x, y, z, new AABBf()))
+                .collect(Collectors.toSet());
+        Set<AABBfc> newVacancies = vacancies.stream()
+                .map(vacancy -> vacancy.translate(x, y, z, new AABBf()))
+                .collect(Collectors.toSet());
         return new VoxelShape(newSolids, newVacancies);
     }
 
     public VoxelShape translate(Vector3fc vec) {
-        var newVacancies = new HashSet<AABBfc>();
-        var newSolids = new HashSet<AABBfc>();
-        vacancies.forEach(vacancy -> newVacancies.add(vacancy.translate(vec, new AABBf())));
-        solids.forEach(solid -> newSolids.add(solid.translate(vec, new AABBf())));
+        Set<AABBfc> newSolids = solids.stream()
+                .map(solid -> solid.translate(vec, new AABBf()))
+                .collect(Collectors.toSet());
+        Set<AABBfc> newVacancies = vacancies.stream()
+                .map(vacancy -> vacancy.translate(vec, new AABBf()))
+                .collect(Collectors.toSet());
         return new VoxelShape(newSolids, newVacancies);
     }
 
     public boolean intersectsAABB(AABBfc other) {
-        AABBf aabb = unionAABB();
-        if (!aabb.intersectsAABB(other))
-            return false;
+        var aabb = unionAABB();
+        if (!aabb.intersectsAABB(other)) return false;
+
         other.intersection(aabb, aabb);
-        if (vacancies.stream().anyMatch(vacancy -> vacancy.containsAABB(aabb))) {
-            return false;
-        }
+        if (vacancies.stream().anyMatch(vacancy -> vacancy.containsAABB(aabb))) return false;
         return solids.stream().anyMatch(solid -> solid.intersectsAABB(aabb));
     }
 
     public boolean intersectsPoint(Vector3fc vec) {
-        if (vacancies.stream().anyMatch(vacancy -> vacancy.containsPoint(vec))) {
-            return false;
-        }
+        if (vacancies.stream().anyMatch(vacancy -> vacancy.containsPoint(vec))) return false;
         return solids.stream().anyMatch(solid -> solid.containsPoint(vec));
     }
 
     public boolean intersectsPoint(float x, float y, float z) {
-        if (vacancies.stream().anyMatch(vacancy -> vacancy.containsPoint(x, y, z))) {
-            return false;
-        }
+        if (vacancies.stream().anyMatch(vacancy -> vacancy.containsPoint(x, y, z))) return false;
         return solids.stream().anyMatch(solid -> solid.containsPoint(x, y, z));
     }
 
diff --git a/Allay-API/src/main/java/org/allaymc/api/network/ProtocolInfo.java b/Allay-API/src/main/java/org/allaymc/api/network/ProtocolInfo.java
index ea4a7e4e6..0300055da 100644
--- a/Allay-API/src/main/java/org/allaymc/api/network/ProtocolInfo.java
+++ b/Allay-API/src/main/java/org/allaymc/api/network/ProtocolInfo.java
@@ -3,7 +3,6 @@
 import lombok.experimental.UtilityClass;
 import org.allaymc.api.datastruct.SemVersion;
 import org.cloudburstmc.protocol.bedrock.codec.BedrockCodec;
-import org.cloudburstmc.protocol.bedrock.codec.v671.Bedrock_v671;
 import org.cloudburstmc.protocol.bedrock.codec.v685.Bedrock_v685;
 
 @UtilityClass
@@ -14,8 +13,8 @@ public final class ProtocolInfo {
     public static final SemVersion MINECRAFT_VERSION = new SemVersion(1, 21, 0, 3, 0);
 
     public static final int BLOCK_STATE_VERSION_NO_REVISION = (MINECRAFT_VERSION.major() << 24) | // major
-            (MINECRAFT_VERSION.minor() << 16) | // minor
-            (MINECRAFT_VERSION.patch() << 8); // patch
+                                                              (MINECRAFT_VERSION.minor() << 16) | // minor
+                                                              (MINECRAFT_VERSION.patch() << 8); // patch
 
     public static final int BLOCK_STATE_VERSION = BLOCK_STATE_VERSION_NO_REVISION | MINECRAFT_VERSION.revision(); // revision
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/pack/PackManifest.java b/Allay-API/src/main/java/org/allaymc/api/pack/PackManifest.java
index 8e9f03923..8c92b7a2e 100644
--- a/Allay-API/src/main/java/org/allaymc/api/pack/PackManifest.java
+++ b/Allay-API/src/main/java/org/allaymc/api/pack/PackManifest.java
@@ -41,7 +41,7 @@ public static PackManifest load(PackLoader loader) {
         try {
             return JSONUtils.from(loader.getFile(PATH), PackManifest.class);
         } catch (IllegalStateException | IOException exception) {
-            log.error("Failed to load " + loader.getLocation(), exception);
+            log.error("Failed to load {}", loader.getLocation(), exception);
             return null;
         }
     }
@@ -50,9 +50,9 @@ public boolean isValid() {
         if (this.formatVersion == null || this.header == null || this.modules == null) return false;
 
         return this.header.description != null &&
-                this.header.name != null &&
-                this.header.uuid != null &&
-                this.header.version != null;
+               this.header.name != null &&
+               this.header.uuid != null &&
+               this.header.version != null;
     }
 
     public enum Capability {
diff --git a/Allay-API/src/main/java/org/allaymc/api/perm/PermKeys.java b/Allay-API/src/main/java/org/allaymc/api/perm/PermKeys.java
index 8bcd86ff7..776ab5c1e 100644
--- a/Allay-API/src/main/java/org/allaymc/api/perm/PermKeys.java
+++ b/Allay-API/src/main/java/org/allaymc/api/perm/PermKeys.java
@@ -16,6 +16,7 @@ public interface PermKeys {
     String MAY_FLY = "ability.mayfly";
     String SUMMON_LIGHTNING = "ability.summon_lightning";
     String MUTED = "ability.muted";
+
     // Vanilla adventure settings
     String PVM = "adventure_setting.pvm";
     String MVP = "adventure_setting.mvp";
diff --git a/Allay-API/src/main/java/org/allaymc/api/perm/Permissible.java b/Allay-API/src/main/java/org/allaymc/api/perm/Permissible.java
index 362337698..82efcf5e8 100644
--- a/Allay-API/src/main/java/org/allaymc/api/perm/Permissible.java
+++ b/Allay-API/src/main/java/org/allaymc/api/perm/Permissible.java
@@ -36,8 +36,8 @@ default Permissible removePerm(String perm) {
         return this;
     }
 
-    default Permissible setPerm(String perm, boolean value) {
-        if (value) addPerm(perm);
+    default Permissible setPerm(String perm, boolean add) {
+        if (add) addPerm(perm);
         else removePerm(perm);
         return this;
     }
diff --git a/Allay-API/src/main/java/org/allaymc/api/perm/tree/PermTree.java b/Allay-API/src/main/java/org/allaymc/api/perm/tree/PermTree.java
index e7a9c29fb..13c7f7836 100644
--- a/Allay-API/src/main/java/org/allaymc/api/perm/tree/PermTree.java
+++ b/Allay-API/src/main/java/org/allaymc/api/perm/tree/PermTree.java
@@ -6,7 +6,6 @@
 import org.cloudburstmc.nbt.NbtType;
 import org.jetbrains.annotations.UnmodifiableView;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
@@ -92,13 +91,12 @@ default List<PermNode> getLeaves() {
 
     default NbtMap saveNBT() {
         var builder = NbtMap.builder();
-        var list = new ArrayList<String>();
-        for (var leaf : getLeaves()) {
-            list.add(leaf.getFullName());
-        }
+        var list = getLeaves().stream().map(PermNode::getFullName).toList();
         builder.putList("Perms", NbtType.STRING, list);
+
         if (getParent() != null)
             builder.putString("Parent", getParent().getName());
+
         builder.put(
                 "PermLevel",
                 containsSubSet(OPERATOR) ? OPERATOR.getName() :
@@ -113,8 +111,7 @@ default void loadNBT(NbtMap nbt) {
     }
 
     default void loadNBT(NbtMap nbt, boolean callListener) {
-        for (var perm : nbt.getList("Perms", NbtType.STRING))
-            addPerm(perm, callListener);
+        nbt.getList("Perms", NbtType.STRING).forEach(perm -> addPerm(perm, callListener));
         copyFrom(DefaultPermissions.byName(nbt.getString("PermLevel")));
     }
 
diff --git a/Allay-API/src/main/java/org/allaymc/api/plugin/PluginContainer.java b/Allay-API/src/main/java/org/allaymc/api/plugin/PluginContainer.java
index 165420752..1b141cb7f 100644
--- a/Allay-API/src/main/java/org/allaymc/api/plugin/PluginContainer.java
+++ b/Allay-API/src/main/java/org/allaymc/api/plugin/PluginContainer.java
@@ -22,7 +22,8 @@ public static PluginContainer createPluginContainer(
             PluginDescriptor descriptor,
             PluginLoader loader,
             Path dataFolder,
-            I18n i18n) {
+            I18n i18n
+    ) {
         var pluginContainer = new PluginContainer(plugin, descriptor, loader, dataFolder, i18n);
         plugin.setPluginContainer(pluginContainer);
         return pluginContainer;
diff --git a/Allay-API/src/main/java/org/allaymc/api/registry/MappedRegistry.java b/Allay-API/src/main/java/org/allaymc/api/registry/MappedRegistry.java
index 0100a79bc..f46bd5e66 100644
--- a/Allay-API/src/main/java/org/allaymc/api/registry/MappedRegistry.java
+++ b/Allay-API/src/main/java/org/allaymc/api/registry/MappedRegistry.java
@@ -26,7 +26,6 @@ public interface MappedRegistry<KEY, VALUE, MAPPING extends Map<KEY, VALUE>> ext
      *
      * @return the value registered by the given key.
      */
-
     default VALUE get(KEY key) {
         return getContent().get(key);
     }
@@ -41,12 +40,8 @@ default VALUE get(KEY key) {
      * @return the mapped value from the given key if present
      */
     default <U> Optional<U> map(KEY key, Function<? super VALUE, ? extends U> mapper) {
-        VALUE value = this.get(key);
-        if (value == null) {
-            return Optional.empty();
-        } else {
-            return Optional.ofNullable(mapper.apply(value));
-        }
+        var value = this.get(key);
+        return value == null ? Optional.empty() : Optional.ofNullable(mapper.apply(value));
     }
 
     /**
diff --git a/Allay-API/src/main/java/org/allaymc/api/registry/SimpleBiMappedRegistry.java b/Allay-API/src/main/java/org/allaymc/api/registry/SimpleBiMappedRegistry.java
index 11499cb89..5660f50a8 100644
--- a/Allay-API/src/main/java/org/allaymc/api/registry/SimpleBiMappedRegistry.java
+++ b/Allay-API/src/main/java/org/allaymc/api/registry/SimpleBiMappedRegistry.java
@@ -21,7 +21,7 @@ public static <INPUT, LEFT, RIGHT> SimpleBiMappedRegistry<LEFT, RIGHT> of(Regist
 
     @Override
     public BiMap<LEFT, RIGHT> getContent() {
-        return mappings;
+        return this.mappings;
     }
 
     @Override
diff --git a/Allay-API/src/main/java/org/allaymc/api/registry/SimpleDoubleKeyMappedRegistry.java b/Allay-API/src/main/java/org/allaymc/api/registry/SimpleDoubleKeyMappedRegistry.java
index fd6e85f63..fc053d371 100644
--- a/Allay-API/src/main/java/org/allaymc/api/registry/SimpleDoubleKeyMappedRegistry.java
+++ b/Allay-API/src/main/java/org/allaymc/api/registry/SimpleDoubleKeyMappedRegistry.java
@@ -15,7 +15,7 @@ protected <INPUT> SimpleDoubleKeyMappedRegistry(INPUT input, RegistryLoader<INPU
 
     @Override
     public MapPair<K1, K2, VALUE> getContent() {
-        return mapPair;
+        return this.mapPair;
     }
 
     @Override
diff --git a/Allay-API/src/main/java/org/allaymc/api/registry/SimpleMappedRegistry.java b/Allay-API/src/main/java/org/allaymc/api/registry/SimpleMappedRegistry.java
index 5061c7f4f..d8693ca67 100644
--- a/Allay-API/src/main/java/org/allaymc/api/registry/SimpleMappedRegistry.java
+++ b/Allay-API/src/main/java/org/allaymc/api/registry/SimpleMappedRegistry.java
@@ -91,7 +91,7 @@ public static <INPUT, KEY, VALUE, MAPPING extends Map<KEY, VALUE>> MappedRegistr
 
     @Override
     public MAPPING getContent() {
-        return mappings;
+        return this.mappings;
     }
 
     @Override
diff --git a/Allay-API/src/main/java/org/allaymc/api/registry/SimpleRegistry.java b/Allay-API/src/main/java/org/allaymc/api/registry/SimpleRegistry.java
index f8b8898ec..4fb3b6235 100644
--- a/Allay-API/src/main/java/org/allaymc/api/registry/SimpleRegistry.java
+++ b/Allay-API/src/main/java/org/allaymc/api/registry/SimpleRegistry.java
@@ -82,7 +82,7 @@ public static <INPUT, CONTENT> SimpleRegistry<CONTENT> of(INPUT input, RegistryL
 
     @Override
     public CONTENT getContent() {
-        return content;
+        return this.content;
     }
 
     @Override
diff --git a/Allay-API/src/main/java/org/allaymc/api/scheduler/Scheduler.java b/Allay-API/src/main/java/org/allaymc/api/scheduler/Scheduler.java
index 83c9ced8a..c42974131 100644
--- a/Allay-API/src/main/java/org/allaymc/api/scheduler/Scheduler.java
+++ b/Allay-API/src/main/java/org/allaymc/api/scheduler/Scheduler.java
@@ -1,13 +1,10 @@
 package org.allaymc.api.scheduler;
 
 import org.allaymc.api.ApiInstanceHolder;
-import org.allaymc.api.server.Server;
 
 import java.util.concurrent.ExecutorService;
 
 /**
- * scheduler
- * <p>
  * Allay Project 2023/3/12
  *
  * @author daoge_cmd
diff --git a/Allay-API/src/main/java/org/allaymc/api/scheduler/TaskCreator.java b/Allay-API/src/main/java/org/allaymc/api/scheduler/TaskCreator.java
index 3e7282157..5883cffcc 100644
--- a/Allay-API/src/main/java/org/allaymc/api/scheduler/TaskCreator.java
+++ b/Allay-API/src/main/java/org/allaymc/api/scheduler/TaskCreator.java
@@ -1,8 +1,9 @@
 package org.allaymc.api.scheduler;
 
 /**
- * Describes a task creator (eg: plugin) <br/>
- * Each time a task is executed, the creator of the task is first checked to be valid, and if not, the task is canceled <br/>
+ * Describes a task creator (eg: plugin)
+ * <p>
+ * Each time a task is executed, the creator of the task is first checked to be valid, and if not, the task is canceled
  * <p>
  * Allay Project 2023/3/12
  *
diff --git a/Allay-API/src/main/java/org/allaymc/api/scoreboard/Scoreboard.java b/Allay-API/src/main/java/org/allaymc/api/scoreboard/Scoreboard.java
index 9e024e355..7c2014d5b 100644
--- a/Allay-API/src/main/java/org/allaymc/api/scoreboard/Scoreboard.java
+++ b/Allay-API/src/main/java/org/allaymc/api/scoreboard/Scoreboard.java
@@ -13,27 +13,28 @@
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
-
+import java.util.stream.Collectors;
 
 @Getter
 public final class Scoreboard {
     /**
-     * 此计分板的标识名称
+     * The identifier name of this scoreboard
      */
     private final String objectiveName;
     /**
-     * 此计分板的显示名称
+     * The display name of this scoreboard
      */
     private final String displayName;
     /**
-     * 此计分板的 “准则” (eg: dummy)
+     * The "criteria" of this scoreboard (e.g., dummy)
      */
     private final String criteriaName;
     private final Map<DisplaySlot, Set<ScoreboardViewer>> viewers = new ConcurrentHashMap<>();
     private final Map<Scorer, ScoreboardLine> lines = new ConcurrentHashMap<>();
     /**
-     * 此计分板的排序规则 <br>
-     * 排序动作由客户端执行，所以说服务端不需要去处理排序
+     * The sorting rule of this scoreboard
+     * <p>
+     * The sorting action is performed by the client, so the server does not need to handle sorting
      */
     @Setter
     private SortOrder sortOrder;
@@ -64,7 +65,7 @@ public Scoreboard(String objectiveName, String displayName, String criteriaName,
     }
 
     /**
-     * @return 此计分板的所有观察者
+     * @return All viewers of this scoreboard
      */
     public Set<ScoreboardViewer> getAllViewers() {
         var all = new HashSet<ScoreboardViewer>();
@@ -73,39 +74,39 @@ public Set<ScoreboardViewer> getAllViewers() {
     }
 
     /**
-     * @param slot 目标槽位
+     * @param slot Target slot
      *
-     * @return 此计分板目标槽位的观察者
+     * @return Viewers of the target slot of this scoreboard
      */
     public Set<ScoreboardViewer> getViewers(DisplaySlot slot) {
         return this.viewers.get(slot);
     }
 
     /**
-     * 删除此计分板目标槽位中的某个观察者
+     * Remove a specific viewer from the target slot of this scoreboard
      *
-     * @param viewer 目标观察者
-     * @param slot   目标槽位
+     * @param viewer Target viewer
+     * @param slot   Target slot
      *
-     * @return 是否删除成功
+     * @return Whether the removal was successful
      */
     public boolean removeViewer(ScoreboardViewer viewer, DisplaySlot slot) {
-        boolean removed = this.viewers.get(slot).remove(viewer);
+        var removed = this.viewers.get(slot).remove(viewer);
         if (removed) viewer.hideScoreboardSlot(slot);
         return removed;
     }
 
     /**
-     * 向此计分板目标槽位中添加一个观察者
+     * Add a viewer to the target slot of this scoreboard
      *
-     * @param viewer 目标观察者
-     * @param slot   目标槽位
+     * @param viewer Target viewer
+     * @param slot   Target slot
      *
-     * @return 是否添加成功
+     * @return Whether the addition was successful
      */
     public boolean addViewer(ScoreboardViewer viewer, DisplaySlot slot) {
         removeInvalidViewers();
-        boolean added = this.viewers.get(slot).add(viewer);
+        var added = this.viewers.get(slot).add(viewer);
         if (added) viewer.displayScoreboard(this, slot);
         return added;
     }
@@ -115,53 +116,50 @@ public boolean addViewer(ScoreboardViewer viewer, DisplaySlot slot) {
      */
     private void removeInvalidViewers() {
         this.viewers.forEach((slot, slotViewers) -> {
-            var invalid = new HashSet<ScoreboardViewer>();
-            slotViewers.forEach(viewer -> {
-                if (!viewer.isScoreboardViewerValid()) {
-                    invalid.add(viewer);
-                }
-            });
+            var invalid = slotViewers.stream()
+                    .filter(viewer -> !viewer.isScoreboardViewerValid())
+                    .collect(Collectors.toSet());
             slotViewers.removeAll(invalid);
         });
     }
 
     /**
-     * 检查此计分板目标槽位中是否有特定观察者
+     * Check if a specific viewer exists in the target slot of this scoreboard
      *
-     * @param viewer 目标观察者
-     * @param slot   目标槽位
+     * @param viewer Target viewer
+     * @param slot   Target slot
      *
-     * @return 是否存在
+     * @return Whether it exists
      */
     public boolean containViewer(ScoreboardViewer viewer, DisplaySlot slot) {
         return this.viewers.get(slot).contains(viewer);
     }
 
     /**
-     * 获取追踪对象在此计分板上对应的行（如果存在）
+     * Get the line corresponding to the tracker in this scoreboard (if it exists)
      *
-     * @param scorer 追踪对象
+     * @param scorer Tracker
      *
-     * @return 对应行
+     * @return Corresponding line
      */
     public @Nullable ScoreboardLine getLine(Scorer scorer) {
         return this.lines.get(scorer);
     }
 
     /**
-     * 为此计分板添加一个行
+     * Add a line to this scoreboard
      *
-     * @param line 目标行
+     * @param line Target line
      *
-     * @return 是否添加成功
+     * @return Whether the addition was successful
      */
     public boolean addLine(ScoreboardLine line) {
         if (wouldCallEvent()) {
             // TODO: event
-//            var event = new ScoreboardLineChangeEvent(this, line, line.getScore(), line.getScore(), ScoreboardLineChangeEvent.ActionType.ADD_LINE);
-//            Server.getInstance().getPluginManager().callEvent(event);
-//            if (event.isCancelled()) return false;
-//            line = event.getLine();
+            //       var event = new ScoreboardLineChangeEvent(this, line, line.getScore(), line.getScore(), ScoreboardLineChangeEvent.ActionType.ADD_LINE);
+            //       Server.getInstance().getPluginManager().callEvent(event);
+            //       if (event.isCancelled()) return false;
+            //       line = event.getLine();
         }
         this.lines.put(line.getScorer(), line);
         updateScore(line);
@@ -169,24 +167,24 @@ public boolean addLine(ScoreboardLine line) {
     }
 
     /**
-     * 为此计分板添加一个行
+     * Add a line to this scoreboard
      *
-     * @param scorer 追踪对象
-     * @param score  分数
+     * @param scorer Tracker
+     * @param score  Score
      *
-     * @return 是否添加成功
+     * @return Whether the addition was successful
      */
     public boolean addLine(Scorer scorer, int score) {
         return addLine(new ScoreboardLine(this, scorer, score));
     }
 
     /**
-     * 为插件提供的便捷的计分板显示接口
+     * Convenient interface for plugins to display scores
      *
-     * @param text  FakeScorer的名称
-     * @param score 分数
+     * @param text  Name of FakeScorer
+     * @param score Score
      *
-     * @return 是否添加成功
+     * @return Whether the addition was successful
      */
     public boolean addLine(String text, int score) {
         var fakeScorer = new FakeScorer(text);
@@ -194,21 +192,23 @@ public boolean addLine(String text, int score) {
     }
 
     /**
-     * 删除追踪对象在此计分板上对应的行（如果存在）
+     * Remove the line corresponding to the tracker in this scoreboard (if it exists)
      *
-     * @param scorer 目标追踪对象
+     * @param scorer Target tracker
      *
-     * @return 是否删除成功
+     * @return Whether the removal was successful
      */
     public boolean removeLine(Scorer scorer) {
         if (lines.isEmpty()) return false;
+
         var removed = lines.get(scorer);
         if (removed == null) return false;
+
         if (wouldCallEvent()) {
             // TODO: event
-//            var event = new ScoreboardLineChangeEvent(this, removed, removed.getScore(), removed.getScore(), ScoreboardLineChangeEvent.ActionType.REMOVE_LINE);
-//            Server.getInstance().getPluginManager().callEvent(event);
-//            if (event.isCancelled()) return false;
+            //       var event = new ScoreboardLineChangeEvent(this, removed, removed.getScore(), removed.getScore(), ScoreboardLineChangeEvent.ActionType.REMOVE_LINE);
+            //       Server.getInstance().getPluginManager().callEvent(event);
+            //       if (event.isCancelled()) return false;
         }
         this.lines.remove(scorer);
         getAllViewers().forEach(viewer -> viewer.removeScoreboardLine(removed));
@@ -216,69 +216,70 @@ public boolean removeLine(Scorer scorer) {
     }
 
     /**
-     * 删除计分板所有行
+     * Remove all lines from the scoreboard
      *
-     * @param send 是否发送到观察者
+     * @param send Whether to send to viewers
      *
-     * @return 是否删除成功
+     * @return Whether the removal was successful
      */
     public boolean removeAllLines(boolean send) {
         if (lines.isEmpty()) return false;
         if (wouldCallEvent()) {
             // TODO: event
-//            var event = new ScoreboardLineChangeEvent(this, null, 0, 0, ScoreboardLineChangeEvent.ActionType.REMOVE_ALL_LINES);
-//            Server.getInstance().getPluginManager().callEvent(event);
-//            if (event.isCancelled()) return false;
-        }
-        if (send) {
-            this.lines.keySet().forEach(this::removeLine);
-        } else {
-            this.lines.clear();
+            //       var event = new ScoreboardLineChangeEvent(this, null, 0, 0, ScoreboardLineChangeEvent.ActionType.REMOVE_ALL_LINES);
+            //       Server.getInstance().getPluginManager().callEvent(event);
+            //       if (event.isCancelled()) return false;
         }
+        if (send) this.lines.keySet().forEach(this::removeLine);
+        else this.lines.clear();
         return true;
     }
 
     /**
-     * 检查追踪对象在此计分板上是否有记录
+     * Check if the tracker has a record in this scoreboard
      *
-     * @param scorer 目标追踪对象
+     * @param scorer Target tracker
      *
-     * @return 是否存在
+     * @return Whether it exists
      */
     public boolean containLine(Scorer scorer) {
         return this.lines.containsKey(scorer);
     }
 
     /**
-     * 向所有观察者发送新的分数 <br>
+     * Send new scores to all viewers <br>
      *
-     * @param update 需要更新的行
+     * @param update Line to update
      */
     public void updateScore(ScoreboardLine update) {
         getAllViewers().forEach(viewer -> viewer.updateScore(update));
     }
 
     /**
-     * 向所有观察者重新发送此计分板以及行信息 <br>
-     * 例如当对计分板进行了大量的更改后，调用此方法 <br>
-     * 可节省大量带宽
+     * Resend this scoreboard and line information to all viewers
+     * <p>
+     * For example, after making a lot of changes to the scoreboard, call this method
+     * <p>
+     * It can save a lot of bandwidth
      */
     public void resend() {
         getAllViewers().forEach(viewer -> viewer.removeScoreboard(this));
 
-        this.viewers.forEach((slot, slotViewers) -> {
-            slotViewers.forEach(slotViewer -> {
-                slotViewer.displayScoreboard(this, slot);
-            });
-        });
+        this.viewers.forEach((slot, slotViewers) ->
+                slotViewers.forEach(slotViewer ->
+                        slotViewer.displayScoreboard(this, slot)
+                )
+        );
     }
 
     /**
-     * 为插件提供的快捷接口 <br>
-     * 按照List顺序设置计分板的内容 (使用FakeScorer作为追踪对象) <br>
-     * 会覆盖之前的所有行 <br>
+     * Convenient interface for plugins
+     * <p>
+     * Set the content of the scoreboard in the order of the List (using FakeScorer as the tracker)
+     * <p>
+     * It will overwrite all previous lines
      *
-     * @param lines 需要设置的字符串内容
+     * @param lines String content to set
      */
     public void setLines(List<String> lines) {
         removeAllLines(false);
@@ -291,10 +292,10 @@ public void setLines(List<String> lines) {
     }
 
     /**
-     * 按照List顺序设置计分板的内容 <br>
-     * 会覆盖之前的所有行 <br>
+     * Set the content of the scoreboard in the order of the List <br>
+     * It will overwrite all previous lines <br>
      *
-     * @param lines 需要设置的行内容
+     * @param lines Line content to set
      */
     public void setLines(Collection<ScoreboardLine> lines) {
         removeAllLines(false);
@@ -303,7 +304,7 @@ public void setLines(Collection<ScoreboardLine> lines) {
     }
 
     /**
-     * @return 对此计分板的更改是否会产生事件
+     * @return Whether changes to this scoreboard will trigger events
      */
     public boolean wouldCallEvent() {
         return Server.getInstance().getScoreboardService().contain(this);
diff --git a/Allay-API/src/main/java/org/allaymc/api/scoreboard/ScoreboardLine.java b/Allay-API/src/main/java/org/allaymc/api/scoreboard/ScoreboardLine.java
index c01423136..fd22ce5e5 100644
--- a/Allay-API/src/main/java/org/allaymc/api/scoreboard/ScoreboardLine.java
+++ b/Allay-API/src/main/java/org/allaymc/api/scoreboard/ScoreboardLine.java
@@ -7,12 +7,13 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 /**
+ * A single line on the scoreboard
+ * <p>
+ * Composed of {@link Scorer} and score
+ * <p>
  * Allay Project 2024/2/27
  *
  * @author daoge_cmd
- * <p>
- * 计分板上的单个行 <br>
- * 由{@link Scorer}和分数组成
  */
 @Getter
 public final class ScoreboardLine {
@@ -20,20 +21,17 @@ public final class ScoreboardLine {
     private static final AtomicLong LINE_ID_COUNTER = new AtomicLong(0);
 
     /**
-     * 此计分行所属的计分板
+     * The scoreboard to which this score line belongs
      */
     private final Scoreboard scoreboard;
     /**
-     * 追踪对象
+     * Tracker
      */
     private final Scorer scorer;
     /**
-     * 行id, 客户端通过此id标识计分板上的每个行
+     * Line ID, each line on the scoreboard is identified by this ID on the client
      */
     private final long lineId;
-    /**
-     * 分数
-     */
     private int score;
 
     public ScoreboardLine(Scoreboard scoreboard, Scorer scorer) {
@@ -50,12 +48,10 @@ public ScoreboardLine(Scoreboard scoreboard, Scorer scorer, int score) {
     public boolean setScore(int score) {
         if (scoreboard.wouldCallEvent()) {
             // TODO: event
-//            var event = new ScoreboardLineChangeEvent(scoreboard, this, score, this.score, ScoreboardLineChangeEvent.ActionType.SCORE_CHANGE);
-//            Server.getInstance().getPluginManager().callEvent(event);
-//            if (event.isCancelled()) {
-//                return false;
-//            }
-//            score = event.getNewValue();
+            //       var event = new ScoreboardLineChangeEvent(scoreboard, this, score, this.score, ScoreboardLineChangeEvent.ActionType.SCORE_CHANGE);
+            //       Server.getInstance().getPluginManager().callEvent(event);
+            //       if (event.isCancelled()) return false;
+            //       score = event.getNewValue();
         }
         this.score = score;
         updateScore();
@@ -63,38 +59,38 @@ public boolean setScore(int score) {
     }
 
     /**
-     * 增加分数
+     * Increase the score
      *
-     * @param addition 增加量
+     * @param addition Amount to increase
      *
-     * @return 是否成功（事件被撤回就会false）
+     * @return Whether it was successful (false if the event was cancelled)
      */
     public boolean addScore(int addition) {
         return setScore(getScore() + addition);
     }
 
     /**
-     * 减少分数
+     * Decrease the score
      *
-     * @param reduction 减少量
+     * @param reduction Amount to decrease
      *
-     * @return 是否成功（事件被撤回就会false）
+     * @return Whether it was successful (false if the event was cancelled)
      */
     public boolean removeScore(int reduction) {
         return setScore(getScore() - reduction);
     }
 
     /**
-     * 转换到network信息
+     * Convert to network information
      *
-     * @return network信息
+     * @return Network information
      */
     public ScoreInfo toNetworkInfo() {
         return getScorer().toNetworkInfo(getScoreboard(), this);
     }
 
     /**
-     * 通知所属计分板对象更新此行信息
+     * Notify the owning scoreboard object to update this line information
      */
     private void updateScore() {
         scoreboard.updateScore(this);
diff --git a/Allay-API/src/main/java/org/allaymc/api/scoreboard/ScoreboardService.java b/Allay-API/src/main/java/org/allaymc/api/scoreboard/ScoreboardService.java
index f80f597c8..76663ab5f 100644
--- a/Allay-API/src/main/java/org/allaymc/api/scoreboard/ScoreboardService.java
+++ b/Allay-API/src/main/java/org/allaymc/api/scoreboard/ScoreboardService.java
@@ -21,12 +21,14 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
+ * Manages and stores a batch of scoreboards
+ * <p>
+ * This interface is for /scoreboard command;
+ * if you just want to display information, please operate directly on the scoreboard object
+ * <p>
  * Allay Project 2024/2/28
  *
  * @author daoge_cmd
- * <p>
- * 管理，储存一批计分板 <br>
- * 此接口面向/scoreboard命令，若只是想要显示信息，请直接操作scoreboard对象
  */
 @Getter
 public final class ScoreboardService {
@@ -45,14 +47,12 @@ public ScoreboardService(Server server, ScoreboardStorage storage) {
 
     public boolean add(Scoreboard scoreboard) {
         // TODO: event
-//        var event = new ScoreboardObjectiveChangeEvent(scoreboard, ScoreboardObjectiveChangeEvent.ActionType.ADD);
-//        Server.getInstance().getPluginManager().callEvent(event);
-//        if (event.isCancelled()) {
-//            return false;
-//        }
+        //       var event = new ScoreboardObjectiveChangeEvent(scoreboard, ScoreboardObjectiveChangeEvent.ActionType.ADD);
+        //       Server.getInstance().getPluginManager().callEvent(event);
+        //       if (event.isCancelled()) return false;
         scoreboards.put(scoreboard.getObjectiveName(), scoreboard);
         // TODO: soft enum
-//        CommandEnum.SCOREBOARD_OBJECTIVES.updateSoftEnum(UpdateSoftEnumPacket.Type.ADD, scoreboard.getObjectiveName());
+        //       CommandEnum.SCOREBOARD_OBJECTIVES.updateSoftEnum(UpdateSoftEnumPacket.Type.ADD, scoreboard.getObjectiveName());
         return true;
     }
 
@@ -64,13 +64,11 @@ public boolean remove(String objectiveName) {
         var removed = scoreboards.remove(objectiveName);
         if (removed == null) return false;
         // TODO: event
-//        var event = new ScoreboardObjectiveChangeEvent(removed, ScoreboardObjectiveChangeEvent.ActionType.REMOVE);
-//        Server.getInstance().getPluginManager().callEvent(event);
-//        if (event.isCancelled()) {
-//            return false;
-//        }
+        //       var event = new ScoreboardObjectiveChangeEvent(removed, ScoreboardObjectiveChangeEvent.ActionType.REMOVE);
+        //       Server.getInstance().getPluginManager().callEvent(event);
+        //       if (event.isCancelled()) return false;
         // TODO: soft enum
-//        CommandEnum.SCOREBOARD_OBJECTIVES.updateSoftEnum(UpdateSoftEnumPacket.Type.REMOVE, objectiveName);
+        //       CommandEnum.SCOREBOARD_OBJECTIVES.updateSoftEnum(UpdateSoftEnumPacket.Type.REMOVE, objectiveName);
         viewers.forEach(viewer -> viewer.removeScoreboard(removed));
         display.forEach((slot, scoreboard) -> {
             if (scoreboard != null && scoreboard.getObjectiveName().equals(objectiveName)) {
@@ -129,7 +127,7 @@ public void save() {
     }
 
     public void read() {
-        //新建一个列表避免迭代冲突
+        // Create a new list to avoid iteration conflicts
         new ArrayList<>(scoreboards.values()).forEach(this::remove);
         this.display.keySet().forEach(this::clearDisplaySlot);
 
diff --git a/Allay-API/src/main/java/org/allaymc/api/scoreboard/ScoreboardViewer.java b/Allay-API/src/main/java/org/allaymc/api/scoreboard/ScoreboardViewer.java
index 389fd17f1..b7279dcdb 100644
--- a/Allay-API/src/main/java/org/allaymc/api/scoreboard/ScoreboardViewer.java
+++ b/Allay-API/src/main/java/org/allaymc/api/scoreboard/ScoreboardViewer.java
@@ -1,51 +1,52 @@
 package org.allaymc.api.scoreboard;
 
-
 import org.allaymc.api.scoreboard.data.DisplaySlot;
 
 /**
+ * Describes a scoreboard viewer (e.g., EntityPlayer)
+ * <p>
+ * This interface is used to abstract the server-to-client protocol methods
+ * <p>
+ * The term "Scoreboard" is deliberately used in the method names to prevent confusion with other EntityPlayer interfaces
+ * <p>
  * Allay Project 2024/2/27
  *
  * @author daoge_cmd
- * <p>
- * 描述一个计分板观察者 (eg: EntityPlayer) <br>
- * 此接口用于抽象服务端到客户端的协议层方法 <br>
- * 刻意在方法名中使用了“Scoreboard”防止和EntityPlayer中的其他接口混淆
  */
 public interface ScoreboardViewer {
     /**
-     * 在指定槽位显示计分板
+     * Display a scoreboard in a specified slot
      *
-     * @param scoreboard 目标计分板
-     * @param slot       目标槽位
+     * @param scoreboard The target scoreboard
+     * @param slot       The target slot
      */
     void displayScoreboard(Scoreboard scoreboard, DisplaySlot slot);
 
     /**
-     * 清除指定槽位的显示内容
+     * Clear the display content of the specified slot
      *
-     * @param slot 目标槽位
+     * @param slot The target slot
      */
     void hideScoreboardSlot(DisplaySlot slot);
 
     /**
-     * 通知观察者计分板已删除（若计分板在任意显示槽位中，则会一并清除槽位）
+     * Notify the viewer that the scoreboard has been deleted (if the scoreboard is in any display slot, the slot will be cleared as well)
      *
-     * @param scoreboard 目标计分板
+     * @param scoreboard The target scoreboard
      */
     void removeScoreboard(Scoreboard scoreboard);
 
     /**
-     * 通知观察者指定计分板上的指定行已删除
+     * Notify the viewer that the specified line on the specified scoreboard has been deleted
      *
-     * @param line 目标行
+     * @param line The target line
      */
     void removeScoreboardLine(ScoreboardLine line);
 
     /**
-     * 向观察者发送指定行的新分数
+     * Send the new score of the specified line to the viewer
      *
-     * @param line 目标行
+     * @param line The target line
      */
     void updateScore(ScoreboardLine line);
 
diff --git a/Allay-API/src/main/java/org/allaymc/api/scoreboard/data/DisplaySlot.java b/Allay-API/src/main/java/org/allaymc/api/scoreboard/data/DisplaySlot.java
index 8d5cead3d..f8b5bae39 100644
--- a/Allay-API/src/main/java/org/allaymc/api/scoreboard/data/DisplaySlot.java
+++ b/Allay-API/src/main/java/org/allaymc/api/scoreboard/data/DisplaySlot.java
@@ -1,26 +1,30 @@
 package org.allaymc.api.scoreboard.data;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
+ * Scoreboard display slot enum
+ * <p>
  * Allay Project 2024/2/27
  *
  * @author daoge_cmd
- * <p>
- * Scoreboard display slot enum
  */
+@Getter
+@AllArgsConstructor
 public enum DisplaySlot {
-    // Right side of player's screen
+    /**
+     * Right side of player's screen
+     */
     SIDEBAR("sidebar"),
-    // Player list
+    /**
+     * Player list
+     */
     LIST("list"),
-    // Below the player's name tag
+    /**
+     * Below the player's name tag
+     */
     BELOW_NAME("belowname");
 
-    @Getter
     private final String slotName;
-
-    DisplaySlot(String slotName) {
-        this.slotName = slotName;
-    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/scoreboard/data/SortOrder.java b/Allay-API/src/main/java/org/allaymc/api/scoreboard/data/SortOrder.java
index bf79608c3..9f09ad482 100644
--- a/Allay-API/src/main/java/org/allaymc/api/scoreboard/data/SortOrder.java
+++ b/Allay-API/src/main/java/org/allaymc/api/scoreboard/data/SortOrder.java
@@ -1,16 +1,14 @@
 package org.allaymc.api.scoreboard.data;
 
 /**
+ * The tracking targets are displayed according to the sorting criteria,
+ * and the client will sort all the tracking targets according to the score
+ * <p>
  * Allay Project 2024/2/27
  *
  * @author daoge_cmd
- * <p>
- * The tracking targets are displayed according to the sorting criteria,
- * and the client will sort all the tracking targets according to the score
  */
 public enum SortOrder {
-    //升序
     ASCENDING,
-    //降序
     DESCENDING
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/scoreboard/scorer/EntityScorer.java b/Allay-API/src/main/java/org/allaymc/api/scoreboard/scorer/EntityScorer.java
index 9ac0efb73..aeea90ef7 100644
--- a/Allay-API/src/main/java/org/allaymc/api/scoreboard/scorer/EntityScorer.java
+++ b/Allay-API/src/main/java/org/allaymc/api/scoreboard/scorer/EntityScorer.java
@@ -1,5 +1,6 @@
 package org.allaymc.api.scoreboard.scorer;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.allaymc.api.entity.Entity;
 import org.allaymc.api.scoreboard.Scoreboard;
@@ -12,16 +13,13 @@
  * @author daoge_cmd
  */
 @Getter
+@AllArgsConstructor
 public final class EntityScorer implements Scorer {
 
     private final long uniqueId;
 
-    public EntityScorer(long uniqueId) {
-        this.uniqueId = uniqueId;
-    }
-
     public EntityScorer(Entity entity) {
-        this.uniqueId = entity.getUniqueId();
+        this(entity.getUniqueId());
     }
 
     @Override
@@ -49,6 +47,12 @@ public String getName() {
 
     @Override
     public ScoreInfo toNetworkInfo(Scoreboard scoreboard, ScoreboardLine line) {
-        return new ScoreInfo(line.getLineId(), scoreboard.getObjectiveName(), line.getScore(), ScoreInfo.ScorerType.ENTITY, uniqueId);
+        return new ScoreInfo(
+                line.getLineId(),
+                scoreboard.getObjectiveName(),
+                line.getScore(),
+                ScoreInfo.ScorerType.ENTITY,
+                uniqueId
+        );
     }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/scoreboard/scorer/FakeScorer.java b/Allay-API/src/main/java/org/allaymc/api/scoreboard/scorer/FakeScorer.java
index f48d9aa01..866d25d2a 100644
--- a/Allay-API/src/main/java/org/allaymc/api/scoreboard/scorer/FakeScorer.java
+++ b/Allay-API/src/main/java/org/allaymc/api/scoreboard/scorer/FakeScorer.java
@@ -1,5 +1,6 @@
 package org.allaymc.api.scoreboard.scorer;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.allaymc.api.scoreboard.Scoreboard;
 import org.allaymc.api.scoreboard.ScoreboardLine;
@@ -11,14 +12,11 @@
  * @author daoge_cmd
  */
 @Getter
+@AllArgsConstructor
 public final class FakeScorer implements Scorer {
 
     private final String fakeName;
 
-    public FakeScorer(String fakeName) {
-        this.fakeName = fakeName;
-    }
-
     @Override
     public ScoreInfo.ScorerType getScorerType() {
         return ScoreInfo.ScorerType.FAKE;
@@ -44,6 +42,6 @@ public String getName() {
 
     @Override
     public ScoreInfo toNetworkInfo(Scoreboard scoreboard, ScoreboardLine line) {
-        return new ScoreInfo(line.getLineId(), scoreboard.getObjectiveName(), line.getScore(), getFakeName());
+        return new ScoreInfo(line.getLineId(), scoreboard.getObjectiveName(), line.getScore(), fakeName);
     }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/scoreboard/scorer/PlayerScorer.java b/Allay-API/src/main/java/org/allaymc/api/scoreboard/scorer/PlayerScorer.java
index 109e7adc1..b26940e66 100644
--- a/Allay-API/src/main/java/org/allaymc/api/scoreboard/scorer/PlayerScorer.java
+++ b/Allay-API/src/main/java/org/allaymc/api/scoreboard/scorer/PlayerScorer.java
@@ -1,5 +1,6 @@
 package org.allaymc.api.scoreboard.scorer;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.allaymc.api.entity.interfaces.EntityPlayer;
 import org.allaymc.api.scoreboard.Scoreboard;
@@ -17,22 +18,19 @@
  * @author daoge_cmd
  */
 @Getter
+@AllArgsConstructor
 public final class PlayerScorer implements Scorer {
 
-    // 使用uuid而不是uniqueId方便获取玩家对象
-    // 这在本质上没有区别，因为玩家的uniqueId是根据uuid生成的
+    // Use UUID instead of uniqueId for convenience in obtaining player objects
+    // This is essentially the same, as the player's uniqueId is generated from the UUID
     private final UUID uuid;
 
-    public PlayerScorer(UUID uuid) {
-        this.uuid = uuid;
-    }
-
     public PlayerScorer(String uuid) {
-        this.uuid = UUID.fromString(uuid);
+        this(UUID.fromString(uuid));
     }
 
     public PlayerScorer(EntityPlayer player) {
-        this.uuid = player.getUUID();
+        this(player.getUUID());
     }
 
     public EntityPlayer getPlayer() {
@@ -64,20 +62,21 @@ public boolean equals(Object obj) {
 
     @Override
     public String getName() {
-        return Server.getInstance().getOnlinePlayers().get(uuid) == null ? String.valueOf(uuid.getMostSignificantBits()) : Server.getInstance().getOnlinePlayers().get(uuid).getOriginName();
+        return Server.getInstance().getOnlinePlayers().get(uuid) == null ?
+                String.valueOf(uuid.getMostSignificantBits()) :
+                Server.getInstance().getOnlinePlayers().get(uuid).getOriginName();
     }
 
     @Override
     public ScoreInfo toNetworkInfo(Scoreboard scoreboard, ScoreboardLine line) {
         if (uuid == null) return null;
         var player = Server.getInstance().getOnlinePlayers().get(uuid);
-        return player != null ?
-                new ScoreInfo(
-                        line.getLineId(),
-                        scoreboard.getObjectiveName(),
-                        line.getScore(),
-                        PLAYER,
-                        player.getRuntimeId()
-                ) : null;
+        return player != null ? new ScoreInfo(
+                line.getLineId(),
+                scoreboard.getObjectiveName(),
+                line.getScore(),
+                PLAYER,
+                player.getRuntimeId()
+        ) : null;
     }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/scoreboard/scorer/Scorer.java b/Allay-API/src/main/java/org/allaymc/api/scoreboard/scorer/Scorer.java
index f6dbdb072..081b95ffe 100644
--- a/Allay-API/src/main/java/org/allaymc/api/scoreboard/scorer/Scorer.java
+++ b/Allay-API/src/main/java/org/allaymc/api/scoreboard/scorer/Scorer.java
@@ -5,36 +5,37 @@
 import org.cloudburstmc.protocol.bedrock.data.ScoreInfo;
 
 /**
+ * Describes a scoreboard tracking object
+ * <p>
  * Allay Project 2024/2/27
  *
  * @author daoge_cmd
- * <p>
- * 描述一个计分板追踪对象
  */
 public sealed interface Scorer permits EntityScorer, PlayerScorer, FakeScorer {
 
     /**
-     * 获取追踪对象类型
+     * Get the type of tracking object
      *
-     * @return 追踪对象类型
+     * @return The type of tracking object
      */
     ScoreInfo.ScorerType getScorerType();
 
     /**
-     * 获取名称
+     * Get the name
      *
-     * @return 追踪对象类型
+     * @return The name of the tracking object
      */
     String getName();
 
     /**
-     * 内部方法
-     * 转换到network信息
+     * Internal method
+     * <p>
+     * Convert to network information
      *
-     * @param scoreboard 所属计分板
-     * @param line       所属行
+     * @param scoreboard The associated scoreboard
+     * @param line       The associated line
      *
-     * @return network信息
+     * @return The network information
      */
     ScoreInfo toNetworkInfo(Scoreboard scoreboard, ScoreboardLine line);
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/scoreboard/storage/JsonScoreboardStorage.java b/Allay-API/src/main/java/org/allaymc/api/scoreboard/storage/JsonScoreboardStorage.java
index a526d469e..d754308a7 100644
--- a/Allay-API/src/main/java/org/allaymc/api/scoreboard/storage/JsonScoreboardStorage.java
+++ b/Allay-API/src/main/java/org/allaymc/api/scoreboard/storage/JsonScoreboardStorage.java
@@ -8,7 +8,6 @@
 import org.allaymc.api.scoreboard.scorer.EntityScorer;
 import org.allaymc.api.scoreboard.scorer.FakeScorer;
 import org.allaymc.api.scoreboard.scorer.PlayerScorer;
-import org.allaymc.api.scoreboard.scorer.Scorer;
 import org.allaymc.api.utils.config.Config;
 import org.cloudburstmc.protocol.bedrock.data.ScoreInfo;
 
@@ -48,12 +47,12 @@ public void save(Scoreboard scoreboard) {
 
     @Override
     public void save(Collection<Scoreboard> scoreboards) {
-        for (var scoreboard : scoreboards) save(scoreboard);
+        scoreboards.forEach(this::save);
     }
 
     @Override
     public void saveDisplay(Map<DisplaySlot, Scoreboard> display) {
-        for (Map.Entry<DisplaySlot, Scoreboard> entry : display.entrySet()) {
+        for (var entry : display.entrySet()) {
             json.set("display." + entry.getKey().name(), entry.getValue() != null ? entry.getValue().getObjectiveName() : null);
         }
         json.save();
@@ -108,8 +107,9 @@ private Map<String, Object> serializeToMap(Scoreboard scoreboard) {
         map.put("displayName", scoreboard.getDisplayName());
         map.put("criteriaName", scoreboard.getCriteriaName());
         map.put("sortOrder", scoreboard.getSortOrder().name());
+
         List<Map<String, Object>> lines = new ArrayList<>();
-        for (ScoreboardLine line : scoreboard.getLines().values()) {
+        for (var line : scoreboard.getLines().values()) {
             Map<String, Object> data = new HashMap<>();
             data.put("score", line.getScore());
             data.put("scorerType", line.getScorer().getScorerType().name());
@@ -120,20 +120,22 @@ private Map<String, Object> serializeToMap(Scoreboard scoreboard) {
             });
             lines.add(data);
         }
+
         map.put("lines", lines);
         return map;
     }
 
     private Scoreboard deserializeFromMap(Map<String, Object> map) {
-        String objectiveName = map.get("objectiveName").toString();
-        String displayName = map.get("displayName").toString();
-        String criteriaName = map.get("criteriaName").toString();
-        SortOrder sortOrder = SortOrder.valueOf(map.get("sortOrder").toString());
-        Scoreboard scoreboard = new Scoreboard(objectiveName, displayName, criteriaName, sortOrder);
-        for (Map<String, Object> line : (List<Map<String, Object>>) map.get("lines")) {
-            int score = ((Double) line.get("score")).intValue();
+        var objectiveName = map.get("objectiveName").toString();
+        var displayName = map.get("displayName").toString();
+        var criteriaName = map.get("criteriaName").toString();
+        var sortOrder = SortOrder.valueOf(map.get("sortOrder").toString());
+
+        var scoreboard = new Scoreboard(objectiveName, displayName, criteriaName, sortOrder);
+        for (var line : (List<Map<String, Object>>) map.get("lines")) {
+            var score = ((Double) line.get("score")).intValue();
             var name = (String) line.get("name");
-            Scorer scorer = switch (ScoreInfo.ScorerType.valueOf(line.get("scorerType").toString())) {
+            var scorer = switch (ScoreInfo.ScorerType.valueOf(line.get("scorerType").toString())) {
                 case PLAYER -> new PlayerScorer(UUID.fromString(name));
                 case ENTITY -> new EntityScorer(Long.parseLong(name));
                 case FAKE -> new FakeScorer(name);
@@ -141,6 +143,7 @@ private Scoreboard deserializeFromMap(Map<String, Object> map) {
             };
             scoreboard.addLine(new ScoreboardLine(scoreboard, scorer, score));
         }
+
         return scoreboard;
     }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/scoreboard/storage/ScoreboardStorage.java b/Allay-API/src/main/java/org/allaymc/api/scoreboard/storage/ScoreboardStorage.java
index 26694e6cb..e055d752f 100644
--- a/Allay-API/src/main/java/org/allaymc/api/scoreboard/storage/ScoreboardStorage.java
+++ b/Allay-API/src/main/java/org/allaymc/api/scoreboard/storage/ScoreboardStorage.java
@@ -11,8 +11,6 @@
  * Allay Project 2024/2/27
  *
  * @author daoge_cmd
- * <p>
- * 计分板存储器接口
  */
 public interface ScoreboardStorage {
     void save(Scoreboard scoreboard);
diff --git a/Allay-API/src/main/java/org/allaymc/api/server/Server.java b/Allay-API/src/main/java/org/allaymc/api/server/Server.java
index 58215b2a9..467959e22 100644
--- a/Allay-API/src/main/java/org/allaymc/api/server/Server.java
+++ b/Allay-API/src/main/java/org/allaymc/api/server/Server.java
@@ -29,9 +29,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
 
-/**
- * The server interface
- */
 public interface Server extends TaskCreator, CommandSender {
 
     ApiInstanceHolder<Server> INSTANCE = ApiInstanceHolder.create();
@@ -81,12 +78,10 @@ static Server getInstance() {
     Map<UUID, EntityPlayer> getOnlinePlayers();
 
     default EntityPlayer findOnlinePlayerByName(String playerName) {
-        for (var player : getOnlinePlayers().values()) {
-            if (player.getCommandSenderName().equals(playerName)) {
-                return player;
-            }
-        }
-        return null;
+        return getOnlinePlayers().values().stream()
+                .filter(player -> player.getCommandSenderName().equals(playerName))
+                .findFirst()
+                .orElse(null);
     }
 
     void onConnect(BedrockServerSession session);
@@ -191,11 +186,9 @@ default boolean hasPerm(String perm) {
     ScoreboardService getScoreboardService();
 
     default EntityPlayer getOnlinePlayerByName(String name) {
-        for (var player : getOnlinePlayers().values()) {
-            if (player.getOriginName().equals(name)) {
-                return player;
-            }
-        }
-        return null;
+        return getOnlinePlayers().values().stream()
+                .filter(player -> player.getOriginName().equals(name))
+                .findFirst()
+                .orElse(null);
     }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/server/ServerSettings.java b/Allay-API/src/main/java/org/allaymc/api/server/ServerSettings.java
index 7554a1f3f..ffb305dee 100644
--- a/Allay-API/src/main/java/org/allaymc/api/server/ServerSettings.java
+++ b/Allay-API/src/main/java/org/allaymc/api/server/ServerSettings.java
@@ -11,9 +11,6 @@
 import org.cloudburstmc.protocol.bedrock.data.PacketCompressionAlgorithm;
 import org.cloudburstmc.protocol.bedrock.data.PlayerPermission;
 
-/**
- * Server settings
- */
 @Getter
 @Accessors(fluent = true)
 public class ServerSettings extends OkaeriConfig {
@@ -70,9 +67,10 @@ public static class GenericSettings extends OkaeriConfig {
     @Getter
     @Accessors(fluent = true)
     public static class NetworkSettings extends OkaeriConfig {
-
+        @Comment("Server ip")
         private String ip = "127.0.0.1";
 
+        @Comment("Server port")
         private int port = 19132;
 
         @CustomKey("xbox-auth")
diff --git a/Allay-API/src/main/java/org/allaymc/api/world/Dimension.java b/Allay-API/src/main/java/org/allaymc/api/world/Dimension.java
index 5fd601b28..958f749eb 100644
--- a/Allay-API/src/main/java/org/allaymc/api/world/Dimension.java
+++ b/Allay-API/src/main/java/org/allaymc/api/world/Dimension.java
@@ -34,9 +34,7 @@
 import org.joml.Vector3ic;
 import org.joml.primitives.AABBfc;
 
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.ThreadLocalRandom;
 
 import static org.allaymc.api.block.type.BlockTypes.AIR_TYPE;
@@ -87,13 +85,11 @@ default int getEntityCount() {
     }
 
     default Entity getEntityByRuntimeId(long runtimeId) {
-        for (var chunk : getChunkService().getLoadedChunks()) {
-            var entity = chunk.getEntities().get(runtimeId);
-            if (entity != null) {
-                return entity;
-            }
-        }
-        return null;
+        return getChunkService().getLoadedChunks().stream()
+                .map(chunk -> chunk.getEntities().get(runtimeId))
+                .filter(Objects::nonNull)
+                .findFirst()
+                .orElse(null);
     }
 
     default void addPlayer(EntityPlayer player) {
@@ -149,24 +145,19 @@ default void setBlockState(int x, int y, int z, BlockState blockState, PlayerInt
 
     default void setBlockState(int x, int y, int z, BlockState blockState, int layer, boolean send, boolean update, PlayerInteractInfo placementInfo) {
         var chunk = getChunkService().getChunkByLevelPos(x, z);
-        if (chunk == null) {
-            chunk = getChunkService().getOrLoadChunkSynchronously(x >> 4, z >> 4);
-        }
-        int xIndex = x & 15;
-        int zIndex = z & 15;
-        BlockState oldBlockState = chunk.getBlockState(xIndex, y, zIndex, layer);
+        if (chunk == null) chunk = getChunkService().getOrLoadChunkSynchronously(x >> 4, z >> 4);
 
-        Position3i blockPos = new Position3i(x, y, z, this);
+        var xIndex = x & 15;
+        var zIndex = z & 15;
+        var oldBlockState = chunk.getBlockState(xIndex, y, zIndex, layer);
+
+        var blockPos = new Position3i(x, y, z, this);
         blockState.getBehavior().onPlace(new BlockStateWithPos(oldBlockState, blockPos, layer), blockState, placementInfo);
         oldBlockState.getBehavior().onReplace(new BlockStateWithPos(oldBlockState, blockPos, layer), blockState, placementInfo);
         chunk.setBlockState(xIndex, y, zIndex, blockState, layer);
 
-        if (update) {
-            updateAround(x, y, z);
-        }
-        if (send) {
-            chunk.sendChunkPacket(createBlockUpdatePacket(blockState, x, y, z, layer));
-        }
+        if (update) updateAround(x, y, z);
+        if (send) chunk.sendChunkPacket(createBlockUpdatePacket(blockState, x, y, z, layer));
     }
 
     default void sendBlockUpdateTo(BlockState blockState, Vector3ic pos, int layer, EntityPlayer player) {
@@ -192,29 +183,29 @@ default BlockState getBlockState(int x, int y, int z) {
     default BlockState getBlockState(int x, int y, int z, int layer) {
         if (y < this.getDimensionInfo().minHeight() || y > getDimensionInfo().maxHeight())
             return AIR_TYPE.getDefaultState();
+
         var chunk = getChunkService().getChunkByLevelPos(x, z);
-        if (chunk == null) {
-            chunk = getChunkService().getOrLoadChunkSynchronously(x >> 4, z >> 4);
-        }
+        if (chunk == null) chunk = getChunkService().getOrLoadChunkSynchronously(x >> 4, z >> 4);
         return chunk.getBlockState(x & 15, y, z & 15, layer);
     }
 
     default BlockState[][][] getBlockStates(int x, int y, int z, int sizeX, int sizeY, int sizeZ, int layer) {
         if (sizeX < 1 || sizeY < 1 || sizeZ < 1) return Utils.EMPTY_BLOCK_STATE_ARRAY_3D;
-        BlockState[][][] blockStates = new BlockState[sizeX][sizeY][sizeZ];
-        int startX = x >> 4;
-        int endX = (x + sizeX - 1) >> 4;
-        int startZ = z >> 4;
-        int endZ = (z + sizeZ - 1) >> 4;
 
+        var blockStates = new BlockState[sizeX][sizeY][sizeZ];
+
+        var startX = x >> 4;
+        var endX = (x + sizeX - 1) >> 4;
+        var startZ = z >> 4;
+        var endZ = (z + sizeZ - 1) >> 4;
         for (int chunkX = startX; chunkX <= endX; chunkX++) {
             for (int chunkZ = startZ; chunkZ <= endZ; chunkZ++) {
-                final int cX = chunkX << 4;
-                final int cZ = chunkZ << 4;
-                int localStartX = Math.max(x - cX, 0);
-                int localStartZ = Math.max(z - cZ, 0);
-                int localEndX = Math.min(x + sizeX - cX, 16);
-                int localEndZ = Math.min(z + sizeZ - cZ, 16);
+                var cX = chunkX << 4;
+                var cZ = chunkZ << 4;
+                var localStartX = Math.max(x - cX, 0);
+                var localStartZ = Math.max(z - cZ, 0);
+                var localEndX = Math.min(x + sizeX - cX, 16);
+                var localEndZ = Math.min(z + sizeZ - cZ, 16);
 
                 var chunk = getChunkService().getChunk(chunkX, chunkZ);
                 if (chunk != null) {
@@ -222,8 +213,8 @@ default BlockState[][][] getBlockStates(int x, int y, int z, int sizeX, int size
                         for (int localX = localStartX; localX < localEndX; localX++) {
                             for (int globalY = y; globalY < y + sizeY; globalY++) {
                                 for (int localZ = localStartZ; localZ < localEndZ; localZ++) {
-                                    int globalX = cX + localX;
-                                    int globalZ = cZ + localZ;
+                                    var globalX = cX + localX;
+                                    var globalZ = cZ + localZ;
                                     blockStates[globalX - x][globalY - y][globalZ - z] = c.getBlockState(localX, globalY, localZ, layer);
                                 }
                             }
@@ -234,8 +225,8 @@ default BlockState[][][] getBlockStates(int x, int y, int z, int sizeX, int size
                     for (int localX = localStartX; localX < localEndX; localX++) {
                         for (int globalY = y; globalY < y + sizeY; globalY++) {
                             for (int localZ = localStartZ; localZ < localEndZ; localZ++) {
-                                int globalX = cX + localX;
-                                int globalZ = cZ + localZ;
+                                var globalX = cX + localX;
+                                var globalZ = cZ + localZ;
                                 blockStates[globalX - x][globalY - y][globalZ - z] = air;
                             }
                         }
@@ -256,16 +247,16 @@ default BlockState[][][] getCollidingBlocks(AABBfc aabb, int layer) {
     }
 
     default BlockState[][][] getCollidingBlocks(AABBfc aabb, int layer, boolean ignoreCollision) {
-        int maxX = (int) Math.ceil(aabb.maxX());
-        int maxY = (int) Math.ceil(aabb.maxY());
-        int maxZ = (int) Math.ceil(aabb.maxZ());
-        int minX = (int) Math.floor(aabb.minX());
-        int minY = (int) Math.floor(aabb.minY());
-        int minZ = (int) Math.floor(aabb.minZ());
+        var maxX = (int) Math.ceil(aabb.maxX());
+        var maxY = (int) Math.ceil(aabb.maxY());
+        var maxZ = (int) Math.ceil(aabb.maxZ());
+        var minX = (int) Math.floor(aabb.minX());
+        var minY = (int) Math.floor(aabb.minY());
+        var minZ = (int) Math.floor(aabb.minZ());
         var blockStates = getBlockStates(minX, minY, minZ, maxX - minX, maxY - minY, maxZ - minZ, layer);
         boolean notEmpty = false;
         if (!ignoreCollision) {
-            //过滤掉没有碰撞的方块
+            // Filter out blocks without collision
             for (int x = 0; x < blockStates.length; x++) {
                 for (int y = 0; y < blockStates[x].length; y++) {
                     for (int z = 0; z < blockStates[x][y].length; z++) {
@@ -286,6 +277,7 @@ default BlockState[][][] getCollidingBlocks(AABBfc aabb, int layer, boolean igno
     default void addLevelEvent(float x, float y, float z, LevelEventType levelEventType, int data) {
         var chunk = getChunkService().getChunk((int) x >> 4, (int) z >> 4);
         if (chunk == null) return;
+
         var levelEventPacket = new LevelEventPacket();
         levelEventPacket.setPosition(Vector3f.from(x, y, z));
         levelEventPacket.setType(levelEventType);
@@ -300,31 +292,20 @@ default void updateAroundIgnoreFace(int x, int y, int z, BlockFace... ignoreFace
     default void updateAroundIgnoreFace(Vector3ic pos, BlockFace... ignoreFaces) {
         for (var face : BlockFace.values()) {
             if (ignoreFaces != null && ignoreFaces.length > 0) {
-                var ignore = false;
-                for (var ignoreFace : ignoreFaces) {
-                    if (ignoreFace == face) {
-                        ignore = true;
-                        break;
-                    }
-                }
-                if (ignore) {
-                    continue;
-                }
+                var ignore = Arrays.stream(ignoreFaces).anyMatch(ignoreFace -> ignoreFace == face);
+                if (ignore) continue;
             }
+
             updateAtFace(pos, face);
         }
     }
 
     default void updateAround(int x, int y, int z) {
-        for (var face : BlockFace.values()) {
-            updateAtFace(x, y, z, face);
-        }
+        for (var face : BlockFace.values()) updateAtFace(x, y, z, face);
     }
 
     default void updateAround(Vector3ic pos) {
-        for (var face : BlockFace.values()) {
-            updateAtFace(pos, face);
-        }
+        for (var face : BlockFace.values()) updateAtFace(pos, face);
     }
 
     default void updateAtFace(int x, int y, int z, BlockFace face) {
@@ -351,7 +332,7 @@ default BlockStateWithPos[] getNeighboursBlockState(Vector3ic pos) {
      * @see #getNeighboursBlockState(org.joml.Vector3ic)
      */
     default BlockStateWithPos[] getNeighboursBlockState(int x, int y, int z) {
-        BlockStateWithPos[] result = new BlockStateWithPos[6];
+        var result = new BlockStateWithPos[6];
         for (int i = 0; i < BlockFace.values().length; i++) {
             var offsetPos = BlockFace.values()[i].offsetPos(x, y, z);
             var neighborBlockState = getBlockState(offsetPos.x(), offsetPos.y(), offsetPos.z(), 0);
@@ -374,9 +355,7 @@ default boolean isAABBInWorld(AABBfc aabb) {
 
     default BlockEntity getBlockEntity(int x, int y, int z) {
         var chunk = getChunkService().getChunkByLevelPos(x, z);
-        if (chunk == null) {
-            chunk = getChunkService().getOrLoadChunkSynchronously(x >> 4, z >> 4);
-        }
+        if (chunk == null) chunk = getChunkService().getOrLoadChunkSynchronously(x >> 4, z >> 4);
         return chunk.getBlockEntity(x & 15, y, z & 15);
     }
 
@@ -401,9 +380,7 @@ default void addParticle(ParticleType particleType, Vector3fc pos, int data) {
     }
 
     default void broadcastPacket(BedrockPacket packet) {
-        for (var player : getPlayers()) {
-            player.sendPacket(packet);
-        }
+        getPlayers().forEach(player -> player.sendPacket(packet));
     }
 
     default void addSound(float x, float y, float z, String sound) {
@@ -414,7 +391,7 @@ default void addSound(float x, float y, float z, String sound, float volume, flo
         Preconditions.checkArgument(volume >= 0 && volume <= 1, "Sound volume must be between 0 and 1");
         Preconditions.checkArgument(pitch >= 0, "Sound pitch must be higher than 0");
 
-        PlaySoundPacket packet = new PlaySoundPacket();
+        var packet = new PlaySoundPacket();
         packet.setSound(sound);
         packet.setVolume(volume);
         packet.setPitch(pitch);
diff --git a/Allay-API/src/main/java/org/allaymc/api/world/World.java b/Allay-API/src/main/java/org/allaymc/api/world/World.java
index 35435652b..83dc7554d 100644
--- a/Allay-API/src/main/java/org/allaymc/api/world/World.java
+++ b/Allay-API/src/main/java/org/allaymc/api/world/World.java
@@ -70,9 +70,7 @@ default Dimension getTheEnd() {
 
     @ApiStatus.Internal
     default void sendTime(Collection<EntityPlayer> players) {
-        for (var player : players) {
-            sendTime(player);
-        }
+        players.forEach(this::sendTime);
     }
 
     void setTime(long time);
@@ -91,9 +89,7 @@ default void addTime(long amount) {
     <V> V getGameRule(GameRule gameRule);
 
     default void broadcastPacket(BedrockPacket packet) {
-        for (var dim : getDimensions().values()) {
-            dim.broadcastPacket(packet);
-        }
+        getDimensions().values().forEach(dim -> dim.broadcastPacket(packet));
     }
 
     EventBus getEventBus();
diff --git a/Allay-API/src/main/java/org/allaymc/api/world/WorldData.java b/Allay-API/src/main/java/org/allaymc/api/world/WorldData.java
index a6eebbbbd..57ea980f7 100644
--- a/Allay-API/src/main/java/org/allaymc/api/world/WorldData.java
+++ b/Allay-API/src/main/java/org/allaymc/api/world/WorldData.java
@@ -356,6 +356,5 @@ public static class Experiments {
 
     @Value
     @Builder
-    public static class WorldPolicies {
-    }
+    public static class WorldPolicies {}
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/world/biome/BiomeData.java b/Allay-API/src/main/java/org/allaymc/api/world/biome/BiomeData.java
index 96990361b..04aa67cdd 100644
--- a/Allay-API/src/main/java/org/allaymc/api/world/biome/BiomeData.java
+++ b/Allay-API/src/main/java/org/allaymc/api/world/biome/BiomeData.java
@@ -4,20 +4,22 @@
 import org.cloudburstmc.nbt.annotation.NBT;
 
 @NBT
-public record BiomeData(float ash,
-                        float blue_spores,
-                        float depth,
-                        float downfall,
-                        float height,
-                        String name_hash,
-                        byte rain,
-                        float red_spores,
-                        NbtList<String> tags,
-                        float temperature,
-                        float waterColorA,
-                        float waterColorB,
-                        float waterColorG,
-                        float waterColorR,
-                        float waterTransparency,
-                        float white_ash) {
+public record BiomeData(
+        float ash,
+        float blue_spores,
+        float depth,
+        float downfall,
+        float height,
+        String name_hash,
+        byte rain,
+        float red_spores,
+        NbtList<String> tags,
+        float temperature,
+        float waterColorA,
+        float waterColorB,
+        float waterColorG,
+        float waterColorR,
+        float waterTransparency,
+        float white_ash
+) {
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/world/bitarray/BitArray.java b/Allay-API/src/main/java/org/allaymc/api/world/bitarray/BitArray.java
index c14f2b9af..c111b7351 100644
--- a/Allay-API/src/main/java/org/allaymc/api/world/bitarray/BitArray.java
+++ b/Allay-API/src/main/java/org/allaymc/api/world/bitarray/BitArray.java
@@ -30,5 +30,4 @@ default int readSizeFromNetwork(ByteBuf buffer) {
     BitArrayVersion version();
 
     BitArray copy();
-
 }
\ No newline at end of file
diff --git a/Allay-API/src/main/java/org/allaymc/api/world/bitarray/BitArrayVersion.java b/Allay-API/src/main/java/org/allaymc/api/world/bitarray/BitArrayVersion.java
index 89e7fc1c8..48c07e626 100644
--- a/Allay-API/src/main/java/org/allaymc/api/world/bitarray/BitArrayVersion.java
+++ b/Allay-API/src/main/java/org/allaymc/api/world/bitarray/BitArrayVersion.java
@@ -44,7 +44,7 @@ public static BitArrayVersion get(int version, boolean read) {
 
     public static BitArrayVersion forBitsCeil(int bits) {
         for (int i = VALUES.length - 1; i >= 0; i--) {
-            final BitArrayVersion version = VALUES[i];
+            var version = VALUES[i];
             if (version.bits >= bits) return version;
         }
 
@@ -67,5 +67,4 @@ else if (this == V0)
         else
             return new Pow2BitArray(this, size, words);
     }
-
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/world/bitarray/PaddedBitArray.java b/Allay-API/src/main/java/org/allaymc/api/world/bitarray/PaddedBitArray.java
index c0936aebf..c489d6582 100644
--- a/Allay-API/src/main/java/org/allaymc/api/world/bitarray/PaddedBitArray.java
+++ b/Allay-API/src/main/java/org/allaymc/api/world/bitarray/PaddedBitArray.java
@@ -16,24 +16,25 @@ public PaddedBitArray(BitArrayVersion version, int size, int[] words) {
         this.size = size;
         this.version = version;
         this.words = words;
-        int expectedWordsLength = GenericMath.ceil((float) size / version.entriesPerWord);
+
+        var expectedWordsLength = GenericMath.ceil((float) size / version.entriesPerWord);
         if (words.length != expectedWordsLength) {
             throw new IllegalArgumentException("Invalid length given for storage, got: " + words.length +
-                    " but expected: " + expectedWordsLength);
+                                               " but expected: " + expectedWordsLength);
         }
     }
 
     @Override
     public void set(int index, int value) {
-        final int arrayIndex = index / this.version.entriesPerWord;
-        final int offset = (index % this.version.entriesPerWord) * this.version.bits;
+        var arrayIndex = index / this.version.entriesPerWord;
+        var offset = (index % this.version.entriesPerWord) * this.version.bits;
         this.words[arrayIndex] = this.words[arrayIndex] & ~(this.version.maxEntryValue << offset) | (value & this.version.maxEntryValue) << offset;
     }
 
     @Override
     public int get(int index) {
-        final int arrayIndex = index / this.version.entriesPerWord;
-        final int offset = (index % this.version.entriesPerWord) * this.version.bits;
+        var arrayIndex = index / this.version.entriesPerWord;
+        var offset = (index % this.version.entriesPerWord) * this.version.bits;
         return (this.words[arrayIndex] >>> offset) & this.version.maxEntryValue;
     }
 
diff --git a/Allay-API/src/main/java/org/allaymc/api/world/bitarray/Pow2BitArray.java b/Allay-API/src/main/java/org/allaymc/api/world/bitarray/Pow2BitArray.java
index cc0e78b1f..d0a49888d 100644
--- a/Allay-API/src/main/java/org/allaymc/api/world/bitarray/Pow2BitArray.java
+++ b/Allay-API/src/main/java/org/allaymc/api/world/bitarray/Pow2BitArray.java
@@ -16,24 +16,25 @@ public Pow2BitArray(BitArrayVersion version, int size, int[] words) {
         this.size = size;
         this.version = version;
         this.words = words;
-        int expectedWordsLength = GenericMath.ceil((float) size / version.entriesPerWord);
+
+        var expectedWordsLength = GenericMath.ceil((float) size / version.entriesPerWord);
         if (words.length != expectedWordsLength) {
             throw new IllegalArgumentException("Invalid length given for storage, got: " + words.length +
-                    " but expected: " + expectedWordsLength);
+                                               " but expected: " + expectedWordsLength);
         }
     }
 
     public void set(int index, int value) {
-        final int bitIndex = index * this.version.bits;
-        final int arrayIndex = bitIndex >> 5;
-        final int offset = bitIndex & 31;
+        var bitIndex = index * this.version.bits;
+        var arrayIndex = bitIndex >> 5;
+        var offset = bitIndex & 31;
         this.words[arrayIndex] = this.words[arrayIndex] & ~(this.version.maxEntryValue << offset) | (value & this.version.maxEntryValue) << offset;
     }
 
     public int get(int index) {
-        final int bitIndex = index * this.version.bits;
-        final int arrayIndex = bitIndex >> 5;
-        final int wordOffset = bitIndex & 31;
+        var bitIndex = index * this.version.bits;
+        var arrayIndex = bitIndex >> 5;
+        var wordOffset = bitIndex & 31;
         return this.words[arrayIndex] >>> wordOffset & this.version.maxEntryValue;
     }
 
diff --git a/Allay-API/src/main/java/org/allaymc/api/world/chunk/Chunk.java b/Allay-API/src/main/java/org/allaymc/api/world/chunk/Chunk.java
index 9d07faa86..ac8a55c7d 100644
--- a/Allay-API/src/main/java/org/allaymc/api/world/chunk/Chunk.java
+++ b/Allay-API/src/main/java/org/allaymc/api/world/chunk/Chunk.java
@@ -31,11 +31,15 @@ public interface Chunk extends UnsafeChunk {
 
     @UnmodifiableView
     default Set<EntityPlayer> getPlayerChunkLoaders() {
-        return getChunkLoaders().stream().filter(EntityPlayer.class::isInstance).map(EntityPlayer.class::cast).collect(Collectors.toSet());
+        return getChunkLoaders().stream()
+                .filter(EntityPlayer.class::isInstance)
+                .map(EntityPlayer.class::cast)
+                .collect(Collectors.toSet());
     }
 
     /**
      * Set the callback to be called when the chunk is loaded into the world
+     *
      * @param callback the callback
      */
     @ApiStatus.Internal
diff --git a/Allay-API/src/main/java/org/allaymc/api/world/chunk/ChunkSection.java b/Allay-API/src/main/java/org/allaymc/api/world/chunk/ChunkSection.java
index bcd949dee..a889bfc28 100644
--- a/Allay-API/src/main/java/org/allaymc/api/world/chunk/ChunkSection.java
+++ b/Allay-API/src/main/java/org/allaymc/api/world/chunk/ChunkSection.java
@@ -18,27 +18,34 @@
  * @author Cool_Loong
  */
 @NotThreadSafe
-public record ChunkSection(byte sectionY,
-                           Palette<BlockState>[] blockLayer,
-                           Palette<BiomeType> biomes,
-                           NibbleArray blockLights,
-                           NibbleArray skyLights) {
+public record ChunkSection(
+        byte sectionY,
+        Palette<BlockState>[] blockLayer,
+        Palette<BiomeType> biomes,
+        NibbleArray blockLights,
+        NibbleArray skyLights
+) {
     public static final int LAYER_COUNT = 2;
     public static final int VERSION = 9;
 
+    @SuppressWarnings("unchecked")
     public ChunkSection(byte sectionY) {
-        this(sectionY,
+        this(
+                sectionY,
                 new Palette[]{new Palette<>(AIR_TYPE.getDefaultState()), new Palette<>(AIR_TYPE.getDefaultState())},
                 new Palette<>(VanillaBiomeId.PLAINS),
                 new NibbleArray(Chunk.SECTION_SIZE),
-                new NibbleArray(Chunk.SECTION_SIZE));
+                new NibbleArray(Chunk.SECTION_SIZE)
+        );
     }
 
     public ChunkSection(byte sectionY, Palette<BlockState>[] blockLayer) {
-        this(sectionY, blockLayer,
+        this(
+                sectionY, blockLayer,
                 new Palette<>(VanillaBiomeId.PLAINS),
                 new NibbleArray(Chunk.SECTION_SIZE),
-                new NibbleArray(Chunk.SECTION_SIZE));
+                new NibbleArray(Chunk.SECTION_SIZE)
+        );
     }
 
     public BlockState getBlockState(int x, int y, int z, int layer) {
@@ -79,11 +86,10 @@ public boolean isEmpty() {
 
     public void writeToNetwork(ByteBuf byteBuf) {
         byteBuf.writeByte(VERSION);
-        //block layer count
+        // block layer count
         byteBuf.writeByte(LAYER_COUNT);
         byteBuf.writeByte(sectionY & 0xFF);
 
-        blockLayer[0].writeToNetwork(byteBuf, BlockState::blockStateHash);
-        blockLayer[1].writeToNetwork(byteBuf, BlockState::blockStateHash);
+        for (var palette : blockLayer) palette.writeToNetwork(byteBuf, BlockState::blockStateHash);
     }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/world/chunk/EntityOperate.java b/Allay-API/src/main/java/org/allaymc/api/world/chunk/EntityOperate.java
index 6e3eebec2..b80c3e721 100644
--- a/Allay-API/src/main/java/org/allaymc/api/world/chunk/EntityOperate.java
+++ b/Allay-API/src/main/java/org/allaymc/api/world/chunk/EntityOperate.java
@@ -12,10 +12,8 @@
 public interface EntityOperate {
     void addEntity(Entity entity);
 
-
     Entity removeEntity(Long runtimeId);
 
-
     default Entity removeEntity(Entity entity) {
         return removeEntity(entity.getRuntimeId());
     }
diff --git a/Allay-API/src/main/java/org/allaymc/api/world/chunk/UnsafeChunk.java b/Allay-API/src/main/java/org/allaymc/api/world/chunk/UnsafeChunk.java
index 6c4728a32..b60b465b3 100644
--- a/Allay-API/src/main/java/org/allaymc/api/world/chunk/UnsafeChunk.java
+++ b/Allay-API/src/main/java/org/allaymc/api/world/chunk/UnsafeChunk.java
@@ -31,7 +31,7 @@ static int index(int x, int y, int z) {
         Preconditions.checkArgument(x >= 0 && x <= 15);
         Preconditions.checkArgument(y >= 0 && y <= 15);
         Preconditions.checkArgument(z >= 0 && z <= 15);
-        //The bedrock chunk order is xzy,the chunk order of java version is yzx
+        // The bedrock chunk order is xzy,the chunk order of java version is yzx
         return (x << 8) + (z << 4) + y;
     }
 
@@ -70,7 +70,7 @@ static int index(int x, int y, int z) {
     void afterSetChunk(Dimension dimension);
 
     /**
-     * Gets Chunk section , range -1 -> -4 , 0 -> 59
+     * Gets Chunk section, range -1 -> -4, 0 -> 59
      * <p>
      * Since the array index starts at 0, the maximum value is 59
      *
@@ -82,7 +82,7 @@ static int index(int x, int y, int z) {
     ChunkSection getSection(int sectionY);
 
     /**
-     * Gets Chunk section , range -1 -> -4 , 0 -> 59
+     * Gets Chunk section, range -1 -> -4, 0 -> 59
      * <p>
      * Since the array index starts at 0, the maximum value is 59
      *
@@ -94,7 +94,7 @@ static int index(int x, int y, int z) {
     ChunkSection getOrCreateSection(int sectionY);
 
     /**
-     * Gets Chunk section , range -1 -> -4 , 0 -> 59
+     * Gets Chunk section, range -1 -> -4, 0 -> 59
      * <p>
      * Since the array index starts at 0, the maximum value is 59
      *
@@ -127,7 +127,7 @@ default BlockState getBlockState(@Range(from = 0, to = 15) int x, int y, @Range(
     void setHeight(@Range(from = 0, to = 15) int x, @Range(from = 0, to = 15) int z, int height);
 
     /**
-     * Different from getHeight(), all values in the short[] array returned by this method are
+     * @return Different from getHeight(), all values in the short[] array returned by this method are
      * greater than or equal to 0 (can be understood as getHeight() - minHeight())
      */
     short[] getHeightArray();
diff --git a/Allay-API/src/main/java/org/allaymc/api/world/gamerule/GameRule.java b/Allay-API/src/main/java/org/allaymc/api/world/gamerule/GameRule.java
index 4f50d9fc6..c714ec2d5 100644
--- a/Allay-API/src/main/java/org/allaymc/api/world/gamerule/GameRule.java
+++ b/Allay-API/src/main/java/org/allaymc/api/world/gamerule/GameRule.java
@@ -1,5 +1,6 @@
 package org.allaymc.api.world.gamerule;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.cloudburstmc.protocol.bedrock.data.GameRuleData;
 
@@ -11,8 +12,8 @@
  * @author Jukebox | Cool_Loong
  */
 @Getter
+@AllArgsConstructor
 public enum GameRule {
-
     COMMAND_BLOCKS_ENABLED("commandBlocksEnabled", true, Type.BOOLEAN),
     COMMAND_BLOCK_OUTPUT("commandBlockOutput", true, Type.BOOLEAN),
     DO_DAYLIGHT_CYCLE("doDaylightCycle", true, Type.BOOLEAN),
@@ -51,15 +52,11 @@ public enum GameRule {
     private final Object defaultValue;
     private final Type type;
 
-    GameRule(String name, Object defaultValue, Type type) {
-        this.name = name;
-        this.defaultValue = defaultValue;
-        this.type = type;
-    }
-
-
     public static GameRule fromName(String name) {
-        return Arrays.stream(values()).filter(gameRule -> gameRule.getName().equalsIgnoreCase(name)).findFirst().orElse(null);
+        return Arrays.stream(values())
+                .filter(gameRule -> gameRule.getName().equalsIgnoreCase(name))
+                .findFirst()
+                .orElse(null);
     }
 
     public static boolean parseByteToBoolean(byte value) {
diff --git a/Allay-API/src/main/java/org/allaymc/api/world/gamerule/GameRules.java b/Allay-API/src/main/java/org/allaymc/api/world/gamerule/GameRules.java
index 2a14716d7..c60b92d5d 100644
--- a/Allay-API/src/main/java/org/allaymc/api/world/gamerule/GameRules.java
+++ b/Allay-API/src/main/java/org/allaymc/api/world/gamerule/GameRules.java
@@ -5,7 +5,11 @@
 import org.cloudburstmc.protocol.bedrock.packet.GameRulesChangedPacket;
 import org.jetbrains.annotations.UnmodifiableView;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * Allay Project 2023/3/4
@@ -17,7 +21,6 @@ public class GameRules {
 
     private final Map<GameRule, Object> gameRules = new HashMap<>();
 
-    // Used as dirty flag
     private boolean dirty;
 
     public GameRules() {
@@ -58,10 +61,8 @@ public GameRulesChangedPacket buildPacket() {
     }
 
     public List<GameRuleData<?>> toNetworkGameRuleData() {
-        List<GameRuleData<?>> gameRuleData = new ArrayList<>();
-        for (var entry : this.getGameRules().entrySet()) {
-            gameRuleData.add(new GameRuleData<>(entry.getKey().getName(), entry.getValue()));
-        }
-        return gameRuleData;
+        return this.getGameRules().entrySet().stream()
+                .map(entry -> new GameRuleData<>(entry.getKey().getName(), entry.getValue()))
+                .collect(Collectors.toList());
     }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/world/generator/WorldGenerator.java b/Allay-API/src/main/java/org/allaymc/api/world/generator/WorldGenerator.java
index bfdc9a050..dcda8656a 100644
--- a/Allay-API/src/main/java/org/allaymc/api/world/generator/WorldGenerator.java
+++ b/Allay-API/src/main/java/org/allaymc/api/world/generator/WorldGenerator.java
@@ -25,11 +25,14 @@ static WorldGeneratorBuilder builder() {
     }
 
     /**
-     * 生成一个区块 <br>
-     * 此方法可能被任意线程调用，故实现应确保线程安全
-     * @param x 区块x坐标
-     * @param z 区块z坐标
-     * @return 生成的区块
+     * Generate a chunk.
+     * <p>
+     * This method may be called by any thread, so implementations should ensure thread safety.
+     *
+     * @param x chunk x coordinate
+     * @param z chunk z coordinate
+     *
+     * @return generated chunk
      */
     CompletableFuture<Chunk> generateChunk(int x, int z);
 
@@ -39,10 +42,10 @@ static WorldGeneratorBuilder builder() {
 
     String getPreset();
 
+    Dimension getDimension();
+
     void setDimension(Dimension dimension);
 
-    Dimension getDimension();
-    
     interface WorldGeneratorBuilder {
         WorldGeneratorBuilder name(String name);
 
diff --git a/Allay-API/src/main/java/org/allaymc/api/world/generator/WorldGeneratorType.java b/Allay-API/src/main/java/org/allaymc/api/world/generator/WorldGeneratorType.java
index d8acfc721..d3d7cf4f6 100644
--- a/Allay-API/src/main/java/org/allaymc/api/world/generator/WorldGeneratorType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/world/generator/WorldGeneratorType.java
@@ -3,15 +3,14 @@
 import com.google.common.base.Preconditions;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import org.jetbrains.annotations.Contract;
 
 /**
  * Allay Project 2023/6/3
  *
  * @author daoge_cmd
  */
-@AllArgsConstructor
 @Getter
+@AllArgsConstructor
 public enum WorldGeneratorType {
     LIMIT(0),
     INFINITE(1),
@@ -19,7 +18,9 @@ public enum WorldGeneratorType {
     NETHER(3),
     THE_END(4);
 
-    // The generator id.
+    /**
+     * The generator id
+     */
     private final int id;
 
     public static WorldGeneratorType of(int id) {
diff --git a/Allay-API/src/main/java/org/allaymc/api/world/generator/context/Context.java b/Allay-API/src/main/java/org/allaymc/api/world/generator/context/Context.java
index 928fee88e..ceb95c171 100644
--- a/Allay-API/src/main/java/org/allaymc/api/world/generator/context/Context.java
+++ b/Allay-API/src/main/java/org/allaymc/api/world/generator/context/Context.java
@@ -1,5 +1,6 @@
 package org.allaymc.api.world.generator.context;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.allaymc.api.world.DimensionInfo;
 import org.allaymc.api.world.chunk.UnsafeChunk;
@@ -9,14 +10,11 @@
  *
  * @author daoge_cmd
  */
+@Getter
+@AllArgsConstructor
 public abstract class Context {
-    @Getter
     protected UnsafeChunk currentChunk;
 
-    public Context(UnsafeChunk currentChunk) {
-        this.currentChunk = currentChunk;
-    }
-
     public DimensionInfo getDimensionInfo() {
         return currentChunk.getDimensionInfo();
     }
diff --git a/Allay-API/src/main/java/org/allaymc/api/world/generator/context/EntitySpawnContext.java b/Allay-API/src/main/java/org/allaymc/api/world/generator/context/EntitySpawnContext.java
index e3cfa7390..970c22adb 100644
--- a/Allay-API/src/main/java/org/allaymc/api/world/generator/context/EntitySpawnContext.java
+++ b/Allay-API/src/main/java/org/allaymc/api/world/generator/context/EntitySpawnContext.java
@@ -1,6 +1,5 @@
 package org.allaymc.api.world.generator.context;
 
-import org.allaymc.api.world.chunk.ChunkAccessible;
 import org.allaymc.api.world.chunk.UnsafeChunk;
 
 /**
@@ -9,7 +8,6 @@
  * @author daoge_cmd
  */
 public class EntitySpawnContext extends Context {
-
     public EntitySpawnContext(UnsafeChunk currentChunk) {
         super(currentChunk);
     }
diff --git a/Allay-API/src/main/java/org/allaymc/api/world/generator/context/OtherChunkAccessibleContext.java b/Allay-API/src/main/java/org/allaymc/api/world/generator/context/OtherChunkAccessibleContext.java
index a3b38b0d9..bc1f82bac 100644
--- a/Allay-API/src/main/java/org/allaymc/api/world/generator/context/OtherChunkAccessibleContext.java
+++ b/Allay-API/src/main/java/org/allaymc/api/world/generator/context/OtherChunkAccessibleContext.java
@@ -13,8 +13,7 @@
  * @author daoge_cmd
  */
 public abstract class OtherChunkAccessibleContext extends Context {
-
-    private static BlockState AIR = BlockTypes.AIR_TYPE.getDefaultState();
+    private static final BlockState AIR = BlockTypes.AIR_TYPE.getDefaultState();
 
     @Getter
     protected ChunkAccessible chunkAccessor;
@@ -29,19 +28,21 @@ public void setBlockState(int x, int y, int z, BlockState blockState) {
     }
 
     public void setBlockState(int x, int y, int z, BlockState blockState, int layer) {
-        if(isInCurrentChunk(x, y, z)) {
+        if (isInCurrentChunk(x, y, z)) {
             currentChunk.setBlockState(x & 15, y, z & 15, blockState, layer);
             return;
         }
+
         setBlockStateInOtherChunk(x, y, z, blockState, layer);
     }
 
     private void setBlockStateInOtherChunk(int x, int y, int z, BlockState blockState, int layer) {
         var chunk = chunkAccessor.getChunk(x >> 4, z >> 4);
         if (chunk == null) return;
+
         chunk.setBlockState(x & 15, y, z & 15, blockState, layer);
         if (chunk.isLoaded()) {
-            // 区块已经载入世界了，所以需要发送方块更新包
+            // The chunk has been loaded into the world, so we need to send a block update packet
             chunk.addChunkPacket(Dimension.createBlockUpdatePacket(blockState, x, y, z, layer));
         }
     }
@@ -51,16 +52,14 @@ public BlockState getBlockState(int x, int y, int z) {
     }
 
     public BlockState getBlockState(int x, int y, int z, int layer) {
-        if(isInCurrentChunk(x, y, z)) {
-            return currentChunk.getBlockState(x & 15, y, z & 15, layer);
-        }
-        return getBlockStateInOtherChunk(x, y, z, layer);
+        return isInCurrentChunk(x, y, z) ?
+                currentChunk.getBlockState(x & 15, y, z & 15, layer) :
+                getBlockStateInOtherChunk(x, y, z, layer);
     }
 
     private BlockState getBlockStateInOtherChunk(int x, int y, int z, int layer) {
         var chunk = chunkAccessor.getChunk(x >> 4, z >> 4);
-        if (chunk == null) return AIR;
-        return chunk.getBlockState(x & 15, y, z & 15, layer);
+        return chunk == null ? AIR : chunk.getBlockState(x & 15, y, z & 15, layer);
     }
 
     private boolean isInCurrentChunk(int x, int y, int z) {
diff --git a/Allay-API/src/main/java/org/allaymc/api/world/generator/function/Populator.java b/Allay-API/src/main/java/org/allaymc/api/world/generator/function/Populator.java
index e9f3f84f2..8ea749777 100644
--- a/Allay-API/src/main/java/org/allaymc/api/world/generator/function/Populator.java
+++ b/Allay-API/src/main/java/org/allaymc/api/world/generator/function/Populator.java
@@ -9,6 +9,6 @@
  *
  * @author daoge_cmd
  */
-public interface Populator extends Function<PopulateContext, Boolean>, GenerateFunction  {
+public interface Populator extends Function<PopulateContext, Boolean>, GenerateFunction {
 
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/world/heightmap/HeightMap.java b/Allay-API/src/main/java/org/allaymc/api/world/heightmap/HeightMap.java
index 56a274d15..fc6f8db4c 100644
--- a/Allay-API/src/main/java/org/allaymc/api/world/heightmap/HeightMap.java
+++ b/Allay-API/src/main/java/org/allaymc/api/world/heightmap/HeightMap.java
@@ -1,19 +1,20 @@
 package org.allaymc.api.world.heightmap;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
 /**
  * Allay Project 2023/5/30
  *
  * @author Cool_Loong
  */
+@Getter
+@AllArgsConstructor
 public final class HeightMap {
     private final short[] heights;
 
     public HeightMap() {
-        this.heights = new short[256];
-    }
-
-    public HeightMap(short[] data) {
-        this.heights = data;
+        this(new short[256]);
     }
 
     public short get(int x, int z) {
@@ -27,8 +28,4 @@ public void set(int x, int z, short height) {
     public void fill(short[] heights) {
         System.arraycopy(heights, 0, this.heights, 0, 256);
     }
-
-    public short[] getHeights() {
-        return this.heights;
-    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/world/palette/Palette.java b/Allay-API/src/main/java/org/allaymc/api/world/palette/Palette.java
index f1193579d..5204cc4d1 100644
--- a/Allay-API/src/main/java/org/allaymc/api/world/palette/Palette.java
+++ b/Allay-API/src/main/java/org/allaymc/api/world/palette/Palette.java
@@ -4,9 +4,7 @@
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufInputStream;
 import io.netty.buffer.ByteBufOutputStream;
-import it.unimi.dsi.fastutil.Pair;
 import it.unimi.dsi.fastutil.objects.ReferenceArrayList;
-import org.allaymc.api.datastruct.SemVersion;
 import org.allaymc.api.utils.HashUtils;
 import org.allaymc.api.utils.PaletteUtils;
 import org.allaymc.api.world.bitarray.BitArray;
@@ -15,13 +13,13 @@
 import org.cloudburstmc.blockstateupdater.BlockStateUpdaters;
 import org.cloudburstmc.blockstateupdater.util.tagupdater.CompoundTagUpdaterContext;
 import org.cloudburstmc.nbt.NBTInputStream;
-import org.cloudburstmc.nbt.NBTOutputStream;
 import org.cloudburstmc.nbt.NbtMap;
 import org.cloudburstmc.nbt.NbtUtils;
 import org.cloudburstmc.nbt.util.stream.LittleEndianDataInputStream;
 import org.cloudburstmc.protocol.common.util.VarInts;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.List;
 import java.util.TreeMap;
 
@@ -32,6 +30,7 @@
  */
 public final class Palette<V> {
     private static final byte COPY_LAST_FLAG_HEADER = (byte) (0x7F << 1) | 1;
+
     private final List<V> palette;
     private BitArray bitArray;
 
@@ -40,9 +39,7 @@ public Palette(V first) {
     }
 
     public Palette(V first, BitArrayVersion version) {
-        this.bitArray = version.createArray(Chunk.SECTION_SIZE);
-        this.palette = new ReferenceArrayList<>(16);
-        this.palette.add(first);
+        this(first, new ReferenceArrayList<>(16), version);
     }
 
     public Palette(V first, List<V> palette, BitArrayVersion version) {
@@ -72,7 +69,7 @@ public V get(int index) {
     }
 
     public void set(int index, V value) {
-        final int paletteIndex = this.paletteIndexFor(value);
+        var paletteIndex = this.paletteIndexFor(value);
         this.bitArray.set(index, paletteIndex);
     }
 
@@ -88,16 +85,18 @@ public void writeToNetwork(ByteBuf byteBuf, RuntimeDataSerializer<V> serializer)
 
     public void readFromNetwork(ByteBuf byteBuf, RuntimeDataDeserializer<V> deserializer) {
         readWords(byteBuf, readBitArrayVersion(byteBuf));
-        final int size = this.bitArray.readSizeFromNetwork(byteBuf);
+        var size = this.bitArray.readSizeFromNetwork(byteBuf);
         for (int i = 0; i < size; i++) this.palette.add(deserializer.deserialize(VarInts.readInt(byteBuf)));
     }
 
     public void writeToStoragePersistent(ByteBuf byteBuf, PersistentDataSerializer<V> serializer) {
         byteBuf.writeByte(Palette.getPaletteHeader(this.bitArray.version(), false));
         for (int word : this.bitArray.words()) byteBuf.writeIntLE(word);
+
         byteBuf.writeIntLE(this.palette.size());
-        try (final ByteBufOutputStream bufOutputStream = new ByteBufOutputStream(byteBuf);
-             final NBTOutputStream outputStream = NbtUtils.createWriterLE(bufOutputStream)) {
+
+        try (var bufOutputStream = new ByteBufOutputStream(byteBuf);
+             var outputStream = NbtUtils.createWriterLE(bufOutputStream)) {
             for (V value : this.palette) outputStream.writeTag(serializer.serialize(value));
         } catch (IOException e) {
             throw new RuntimeException(e);
@@ -111,6 +110,7 @@ public void writeToStorageRuntime(ByteBuf byteBuf, RuntimeDataSerializer<V> seri
         byteBuf.writeByte(Palette.getPaletteHeader(this.bitArray.version(), true));
         for (int word : this.bitArray.words())
             byteBuf.writeIntLE(word);
+
         byteBuf.writeIntLE(this.palette.size());
         for (V value : this.palette) {
             byteBuf.writeIntLE(serializer.serialize(value));
@@ -118,14 +118,13 @@ public void writeToStorageRuntime(ByteBuf byteBuf, RuntimeDataSerializer<V> seri
     }
 
     public void readFromStorageRuntime(ByteBuf byteBuf, RuntimeDataDeserializer<V> deserializer, Palette<V> last) {
-        final short header = byteBuf.readUnsignedByte();
-
+        var header = byteBuf.readUnsignedByte();
         if (hasCopyLastFlag(header)) {
             last.copyTo(this);
             return;
         }
 
-        final BitArrayVersion version = Palette.getVersionFromPaletteHeader(header);
+        var version = Palette.getVersionFromPaletteHeader(header);
         if (version == BitArrayVersion.V0) {
             this.bitArray = version.createArray(Chunk.SECTION_SIZE, null);
             this.palette.clear();
@@ -136,24 +135,25 @@ public void readFromStorageRuntime(ByteBuf byteBuf, RuntimeDataDeserializer<V> d
 
         readWords(byteBuf, version);
 
-        final int paletteSize = byteBuf.readIntLE();
+        var paletteSize = byteBuf.readIntLE();
         for (int i = 0; i < paletteSize; i++) this.palette.add(deserializer.deserialize(byteBuf.readIntLE()));
     }
 
     public void readFromStoragePersistent(ByteBuf byteBuf, RuntimeDataDeserializer<V> deserializer) {
-        try (final ByteBufInputStream bufInputStream = new ByteBufInputStream(byteBuf);
-             final LittleEndianDataInputStream input = new LittleEndianDataInputStream(bufInputStream);
-             final NBTInputStream nbtInputStream = new NBTInputStream(input)) {
-            final BitArrayVersion bversion = readBitArrayVersion(byteBuf);
-            if (bversion == BitArrayVersion.V0) {
-                this.bitArray = bversion.createArray(Chunk.SECTION_SIZE, null);
+        try (var bufInputStream = new ByteBufInputStream(byteBuf);
+             var input = new LittleEndianDataInputStream(bufInputStream);
+             var nbtInputStream = new NBTInputStream(input)) {
+            var bitArrayVersion = readBitArrayVersion(byteBuf);
+            if (bitArrayVersion == BitArrayVersion.V0) {
+                this.bitArray = bitArrayVersion.createArray(Chunk.SECTION_SIZE, null);
                 this.palette.clear();
                 addBlockPalette(byteBuf, deserializer, input, nbtInputStream);
                 this.onResize(BitArrayVersion.V2);
                 return;
             }
-            readWords(byteBuf, bversion);
-            final int paletteSize = byteBuf.readIntLE();
+
+            readWords(byteBuf, bitArrayVersion);
+            var paletteSize = byteBuf.readIntLE();
             for (int i = 0; i < paletteSize; i++) {
                 addBlockPalette(byteBuf, deserializer, input, nbtInputStream);
             }
@@ -162,16 +162,18 @@ public void readFromStoragePersistent(ByteBuf byteBuf, RuntimeDataDeserializer<V
         }
     }
 
-    private void addBlockPalette(ByteBuf byteBuf,
-                                 RuntimeDataDeserializer<V> deserializer,
-                                 LittleEndianDataInputStream input,
-                                 NBTInputStream nbtInputStream) throws IOException {
-        Pair<Integer, SemVersion> p = PaletteUtils.fastReadBlockHash(input, byteBuf);
-        if (p.left() == null) {
-            NbtMap oldNbtMap = (NbtMap) nbtInputStream.readTag();
-            SemVersion semVersion = p.right();
-            int version = CompoundTagUpdaterContext.makeVersion(semVersion.major(), semVersion.minor(), semVersion.patch());
-            NbtMap newNbtMap = BlockStateUpdaters.updateBlockState(oldNbtMap, version);
+    private void addBlockPalette(
+            ByteBuf byteBuf,
+            RuntimeDataDeserializer<V> deserializer,
+            LittleEndianDataInputStream input,
+            NBTInputStream nbtInputStream
+    ) throws IOException {
+        var pair = PaletteUtils.fastReadBlockHash(input, byteBuf);
+        if (pair.left() == null) {
+            var oldNbtMap = (NbtMap) nbtInputStream.readTag();
+            var semVersion = pair.right();
+            var version = CompoundTagUpdaterContext.makeVersion(semVersion.major(), semVersion.minor(), semVersion.patch());
+            var newNbtMap = BlockStateUpdaters.updateBlockState(oldNbtMap, version);
             var states = new TreeMap<>(newNbtMap.getCompound("states"));
             var tag = NbtMap.builder()
                     .putString("name", newNbtMap.getString("name"))
@@ -179,20 +181,20 @@ private void addBlockPalette(ByteBuf byteBuf,
                     .build();
             this.palette.add(deserializer.deserialize(HashUtils.fnv1a_32_nbt(tag)));
         } else {
-            this.palette.add(deserializer.deserialize(p.left()));
+            this.palette.add(deserializer.deserialize(pair.left()));
         }
     }
 
     public int paletteIndexFor(V value) {
-        int index = this.palette.indexOf(value);
+        var index = this.palette.indexOf(value);
         if (index != -1) return index;
 
         index = this.palette.size();
         this.palette.add(value);
 
-        final BitArrayVersion version = this.bitArray.version();
+        var version = this.bitArray.version();
         if (index > version.maxEntryValue) {
-            final BitArrayVersion next = version.next;
+            var next = version.next;
             if (next != null) this.onResize(next);
         }
 
@@ -200,12 +202,9 @@ public int paletteIndexFor(V value) {
     }
 
     public boolean isEmpty() {
-        if (this.palette.size() == 1) {
-            for (int word : this.bitArray.words())
-                if (Integer.toUnsignedLong(word) != 0L)
-                    return false;
-            return true;
-        } else return false;
+        if (this.palette.size() == 1)
+            return Arrays.stream(this.bitArray.words()).noneMatch(word -> Integer.toUnsignedLong(word) != 0L);
+        else return false;
     }
 
     public void copyTo(Palette<V> palette) {
@@ -219,6 +218,7 @@ private boolean writeLast(ByteBuf byteBuf, Palette<V> last) {
             byteBuf.writeByte(COPY_LAST_FLAG_HEADER);
             return true;
         }
+
         return false;
     }
 
@@ -228,34 +228,35 @@ private boolean writeEmpty(ByteBuf byteBuf) {
             byteBuf.writeIntLE(0);
             return true;
         }
+
         return false;
     }
 
     private void writeWords(ByteBuf byteBuf, RuntimeDataSerializer<V> serializer) {
         byteBuf.writeByte(getPaletteHeader(this.bitArray.version(), true));
         for (int word : this.bitArray.words()) byteBuf.writeIntLE(word);
+
         if (this.bitArray.writeSizeToNetwork(byteBuf, this.palette.size())) {
-            for (V value : this.palette)
-                VarInts.writeInt(byteBuf, serializer.serialize(value));
+            this.palette.forEach(value -> VarInts.writeInt(byteBuf, serializer.serialize(value)));
         }
     }
 
     private BitArrayVersion readBitArrayVersion(ByteBuf byteBuf) {
-        short header = byteBuf.readUnsignedByte();
+        var header = byteBuf.readUnsignedByte();
         return Palette.getVersionFromPaletteHeader(header);
     }
 
     private void readWords(ByteBuf byteBuf, BitArrayVersion version) {
-        final int wordCount = version.getWordsForSize(Chunk.SECTION_SIZE);
-        final int[] words = new int[wordCount];
-        for (int i = 0; i < wordCount; i++) words[i] = byteBuf.readIntLE();
+        var wordCount = version.getWordsForSize(Chunk.SECTION_SIZE);
+        var words = new int[wordCount];
+        Arrays.setAll(words, i -> byteBuf.readIntLE());
 
         this.bitArray = version.createArray(Chunk.SECTION_SIZE, words);
         this.palette.clear();
     }
 
     private void onResize(BitArrayVersion version) {
-        final BitArray newBitArray = version.createArray(Chunk.SECTION_SIZE);
+        var newBitArray = version.createArray(Chunk.SECTION_SIZE);
         for (int i = 0; i < Chunk.SECTION_SIZE; i++)
             newBitArray.set(i, this.bitArray.get(i));
 
diff --git a/Allay-API/src/main/java/org/allaymc/api/world/storage/NativeFileWorldStorage.java b/Allay-API/src/main/java/org/allaymc/api/world/storage/NativeFileWorldStorage.java
index fa2f2920c..b6566c87e 100644
--- a/Allay-API/src/main/java/org/allaymc/api/world/storage/NativeFileWorldStorage.java
+++ b/Allay-API/src/main/java/org/allaymc/api/world/storage/NativeFileWorldStorage.java
@@ -8,6 +8,5 @@
  * @author daoge_cmd
  */
 public interface NativeFileWorldStorage extends WorldStorage {
-
     Path getWorldFolderPath();
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/zlib/ZlibProviderType.java b/Allay-API/src/main/java/org/allaymc/api/zlib/ZlibProviderType.java
index 41e509367..e6b3cb97f 100644
--- a/Allay-API/src/main/java/org/allaymc/api/zlib/ZlibProviderType.java
+++ b/Allay-API/src/main/java/org/allaymc/api/zlib/ZlibProviderType.java
@@ -10,7 +10,8 @@ public enum ZlibProviderType {
     JavaZlibThreadLocal;
 
     public ZlibProvider of(CompressionType type, int level) {
-        return this == ZlibProviderType.LibDeflateThreadLocal ? new LibDeflateThreadLocal(type, level) : new JavaZibThreadLocal(type, level);
-
+        return this == ZlibProviderType.LibDeflateThreadLocal ?
+                new LibDeflateThreadLocal(type, level) :
+                new JavaZibThreadLocal(type, level);
     }
 }
diff --git a/Allay-CodeGen/src/main/java/org/allaymc/codegen/VanillaBlockPropertyTypeGen.java b/Allay-CodeGen/src/main/java/org/allaymc/codegen/VanillaBlockPropertyTypeGen.java
index 1af965fcc..60f40c48d 100644
--- a/Allay-CodeGen/src/main/java/org/allaymc/codegen/VanillaBlockPropertyTypeGen.java
+++ b/Allay-CodeGen/src/main/java/org/allaymc/codegen/VanillaBlockPropertyTypeGen.java
@@ -24,8 +24,10 @@ public class VanillaBlockPropertyTypeGen {
     private static final Path ENUM_PATH = Path.of("Allay-API/src/main/java/org/allaymc/api/block/property");
     private static final String PACKAGE_NAME = "org.allaymc.api.data";
     private static final String JAVA_DOC = """
-            Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen} <br>
-            Allay Project <p>
+            Automatically generated by {@code org.allaymc.codegen.VanillaBlockPropertyTypeGen}
+            <p>
+            Allay Project
+            
             @author daoge_cmd
             """;
 
@@ -65,7 +67,7 @@ public static void generate() {
                     codeBuilder.addField(
                             FieldSpec
                                     .builder(ParameterizedTypeName.get(enumPropertyClass, enumClass), key, Modifier.PUBLIC, Modifier.FINAL, Modifier.STATIC)
-                                    .initializer("$T.of($S ,$T.class ,$T.values()[0])", enumPropertyClass, name, enumClass, enumClass)
+                                    .initializer("$T.of($S, $T.class, $T.values()[0])", enumPropertyClass, name, enumClass, enumClass)
                                     .build()
                     );
                 }
@@ -115,23 +117,26 @@ public static void generate() {
                         .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
                         .build()
         );
-        var javaFile = JavaFile.builder(PACKAGE_NAME, codeBuilder.build()).build();
+        var javaFile = JavaFile.builder(PACKAGE_NAME, codeBuilder.build()).indent("    ").build();
         Files.writeString(TYPE_DATA_PATH.resolve("VanillaBlockPropertyTypes.java"), javaFile.toString());
     }
 
     @SneakyThrows
     protected static void generateEnumClass(BlockPropertyTypeFile.BlockPropertyTypeInfo info) {
         var enumName = info.getEnumClassName();
-        TypeSpec.Builder codeBuilder = TypeSpec.enumBuilder(enumName)
+        TypeSpec.Builder enumBuilder = TypeSpec.enumBuilder(enumName)
                 .addJavadoc(JAVA_DOC)
                 .addModifiers(Modifier.PUBLIC);
         for (var value : info.values) {
-            codeBuilder.addEnumConstant(value.toUpperCase());
+            enumBuilder.addEnumConstant(value.toUpperCase());
         }
-        var javaFile = JavaFile.builder("org.allaymc.api.block.property.enums", codeBuilder.build()).build();
+
         var path = ENUM_PATH.resolve("enums/" + enumName + ".java");
-        if (Files.exists(path))
-            Files.delete(path);
+        if (Files.exists(path)) Files.delete(path);
+
+        var javaFile = JavaFile.builder("org.allaymc.api.block.property.enums", enumBuilder.build())
+                .indent("    ")
+                .build();
         Files.writeString(path, javaFile.toString());
     }
 
diff --git a/Allay-Server/src/main/java/org/allaymc/server/AllayServer.java b/Allay-Server/src/main/java/org/allaymc/server/AllayServer.java
index de28d7b0f..9f6626255 100644
--- a/Allay-Server/src/main/java/org/allaymc/server/AllayServer.java
+++ b/Allay-Server/src/main/java/org/allaymc/server/AllayServer.java
@@ -41,7 +41,6 @@
 import org.allaymc.server.client.storage.AllayNBTFilePlayerStorage;
 import org.allaymc.server.command.AllayCommandRegistry;
 import org.allaymc.server.eventbus.AllayEventBus;
-import org.allaymc.server.gui.Dashboard;
 import org.allaymc.server.network.AllayNetworkServer;
 import org.allaymc.server.plugin.AllayPluginManager;
 import org.allaymc.server.scheduler.AllayScheduler;
@@ -329,8 +328,8 @@ public void addToPlayerList(UUID uuid, long entityId,
         entry.setEntityId(entityId);
         entry.setName(name);
         entry.setXuid(xuid);
-        entry.setPlatformChatId(deviceInfo.getDeviceName());
-        entry.setBuildPlatform(deviceInfo.getDevice().getId());
+        entry.setPlatformChatId(deviceInfo.deviceName());
+        entry.setBuildPlatform(deviceInfo.device().getId());
         entry.setSkin(skin.toNetwork());
         entry.setTrustedSkin(skin.isTrusted());
         playerListPacket.getEntries().add(entry);
diff --git a/Allay-Server/src/main/java/org/allaymc/server/block/attribute/AllayVanillaBlockAttributeRegistry.java b/Allay-Server/src/main/java/org/allaymc/server/block/attribute/AllayVanillaBlockAttributeRegistry.java
index d8e51a360..1a21f8f3b 100644
--- a/Allay-Server/src/main/java/org/allaymc/server/block/attribute/AllayVanillaBlockAttributeRegistry.java
+++ b/Allay-Server/src/main/java/org/allaymc/server/block/attribute/AllayVanillaBlockAttributeRegistry.java
@@ -62,7 +62,7 @@ public Map<VanillaBlockId, Map<Integer, BlockAttributes>> load(Void input) {
                     try {
                         type = VanillaBlockId.valueOf(AllayStringUtils.fastTwoPartSplit(dataEntry.getString("name"), ":", "")[1].toUpperCase());
                     } catch (IllegalArgumentException ignore) {
-                        log.error("Unknown block name: " + dataEntry.getString("name"));
+                        log.error("Unknown block name: {}", dataEntry.getString("name"));
                         continue;
                     }
                     var blockAttributes = BlockAttributes.fromNBT(dataEntry);
diff --git a/Allay-Server/src/main/java/org/allaymc/server/block/component/common/BlockBaseComponentImpl.java b/Allay-Server/src/main/java/org/allaymc/server/block/component/common/BlockBaseComponentImpl.java
index 7a7e1ef25..8486e8622 100644
--- a/Allay-Server/src/main/java/org/allaymc/server/block/component/common/BlockBaseComponentImpl.java
+++ b/Allay-Server/src/main/java/org/allaymc/server/block/component/common/BlockBaseComponentImpl.java
@@ -84,7 +84,7 @@ public void onBreak(BlockStateWithPos blockState, ItemStack usedItem, EntityPlay
         var dropPos = new Vector3f(blockState.pos()).add(0.5f, 0.5f, 0.5f);
         var dimension = blockState.pos().dimension();
         if (usedItem != null && usedItem.hasEnchantment(EnchantmentSilkTouchType.SILK_TOUCH_TYPE)) {
-            // 精准采集, 直接掉落方块本身
+            // Silk Touch, directly drop the block itself
             dimension.dropItem(getSilkTouchDrop(blockState), dropPos);
             return;
         }
diff --git a/Allay-Server/src/main/java/org/allaymc/server/block/component/common/BlockTallWheatSeedDropableBaseComponentImpl.java b/Allay-Server/src/main/java/org/allaymc/server/block/component/common/BlockTallWheatSeedDropableBaseComponentImpl.java
index ebc91715e..37cb307ce 100644
--- a/Allay-Server/src/main/java/org/allaymc/server/block/component/common/BlockTallWheatSeedDropableBaseComponentImpl.java
+++ b/Allay-Server/src/main/java/org/allaymc/server/block/component/common/BlockTallWheatSeedDropableBaseComponentImpl.java
@@ -12,7 +12,8 @@
 /**
  * Allay Project 2024/6/18
  * <p>
- * 适用于两格高的可掉落小麦种子的植物
+ * Suitable for two-block high plants that can drop wheat seeds
+ *
  * @author daoge_cmd
  */
 @RequireBlockProperty(type = BlockPropertyType.Type.BOOLEAN, name = "upper_block_bit")
@@ -34,7 +35,8 @@ public boolean canKeepExisting(BlockStateWithPos current, BlockStateWithPos neig
             willBreak = notSamePlant(dimension.getBlockState(BlockFace.DOWN.offsetPos(current.pos())));
         } else {
             willBreak = notSamePlant(dimension.getBlockState(BlockFace.UP.offsetPos(current.pos())));
-            if (!willBreak) willBreak = isPlaceableBlock(dimension.getBlockState(BlockFace.DOWN.offsetPos(current.pos())).getBlockType());
+            if (!willBreak)
+                willBreak = isPlaceableBlock(dimension.getBlockState(BlockFace.DOWN.offsetPos(current.pos())).getBlockType());
         }
         return willBreak;
     }
diff --git a/Allay-Server/src/main/java/org/allaymc/server/block/component/common/BlockWheatSeedDropableBaseComponentImpl.java b/Allay-Server/src/main/java/org/allaymc/server/block/component/common/BlockWheatSeedDropableBaseComponentImpl.java
index ed1a3a262..5c5c9f2df 100644
--- a/Allay-Server/src/main/java/org/allaymc/server/block/component/common/BlockWheatSeedDropableBaseComponentImpl.java
+++ b/Allay-Server/src/main/java/org/allaymc/server/block/component/common/BlockWheatSeedDropableBaseComponentImpl.java
@@ -11,8 +11,6 @@
 
 import java.util.concurrent.ThreadLocalRandom;
 
-import static org.allaymc.api.block.type.BlockTypes.*;
-
 /**
  * Allay Project 2024/6/18
  *
@@ -26,7 +24,7 @@ public BlockWheatSeedDropableBaseComponentImpl(BlockType<? extends BlockBehavior
     @Override
     public ItemStack[] getDrops(BlockStateWithPos blockState, ItemStack usedItem) {
         var rand = ThreadLocalRandom.current();
-        // 有1/8的几率掉落种子
+        // Has a 1/8 chance to drop seeds
         if (rand.nextInt(8) == 0) {
             return new ItemStack[]{ItemTypes.WHEAT_SEEDS_TYPE.createItemStack()};
         }
diff --git a/Allay-Server/src/main/java/org/allaymc/server/block/component/shulkerbox/BlockShulkerBoxBaseComponentImpl.java b/Allay-Server/src/main/java/org/allaymc/server/block/component/shulkerbox/BlockShulkerBoxBaseComponentImpl.java
index 4d3080873..6bf64d1ac 100644
--- a/Allay-Server/src/main/java/org/allaymc/server/block/component/shulkerbox/BlockShulkerBoxBaseComponentImpl.java
+++ b/Allay-Server/src/main/java/org/allaymc/server/block/component/shulkerbox/BlockShulkerBoxBaseComponentImpl.java
@@ -2,19 +2,15 @@
 
 import org.allaymc.api.block.BlockBehavior;
 import org.allaymc.api.block.component.common.BlockEntityHolderComponent;
-import org.allaymc.api.block.component.common.PlayerInteractInfo;
 import org.allaymc.api.block.data.BlockStateWithPos;
-import org.allaymc.api.block.type.BlockState;
 import org.allaymc.api.block.type.BlockType;
 import org.allaymc.api.blockentity.interfaces.BlockEntityShulkerBox;
 import org.allaymc.api.component.annotation.Dependency;
 import org.allaymc.api.entity.interfaces.EntityPlayer;
 import org.allaymc.api.item.ItemStack;
 import org.allaymc.api.item.component.common.ItemItemStorableComponent;
-import org.allaymc.api.world.Dimension;
 import org.allaymc.server.block.component.common.BlockBaseComponentImpl;
 import org.cloudburstmc.protocol.bedrock.data.GameType;
-import org.joml.Vector3ic;
 
 /**
  * Allay Project 2024/6/20
@@ -45,16 +41,16 @@ protected ItemStack createShulkerBoxDrop(BlockStateWithPos blockState) {
         var container = blockEntity.getContainer();
         var containerItems = container.saveNBT();
         var drop = blockState.blockState().toItemStack();
-        ((ItemItemStorableComponent)drop).setStoredItems(containerItems);
+        ((ItemItemStorableComponent) drop).setStoredItems(containerItems);
         return drop;
     }
 
     @Override
     public boolean isDroppable(BlockStateWithPos blockState, ItemStack usedItem, EntityPlayer player) {
         // 2024/6/21 NOTICE
-        // BDS导出的数据不太对，按理说潜影盒可以被空手挖取，但是导出的数据显示不可以
-        // 考虑到潜影盒本身特殊的掉落逻辑（如果有内容物，创造模式下挖取也会掉落），猜测是bds内部的bug，故这边直接覆写了isDroppable()
-        // 并不使用BDS导出的数据
+        // The data exported by BDS is not quite correct. In theory, shulker boxes can be mined with bare hands, but the exported data shows they cannot.
+        // Considering the special drop logic of shulker boxes (if they contain items, they will still drop when mined in creative mode), it is suspected to be an internal bug of BDS. Therefore, isDroppable() is overridden here.
+        // The data exported by BDS is not used.
         var blockEntity = blockEntityHolderComponent.getBlockEntity(blockState.pos());
         var container = blockEntity.getContainer();
         if (!container.isEmpty()) return true;
diff --git a/Allay-Server/src/main/java/org/allaymc/server/block/registry/AllayBlockTypeRegistry.java b/Allay-Server/src/main/java/org/allaymc/server/block/registry/AllayBlockTypeRegistry.java
index 36adcacdd..02402e1ba 100644
--- a/Allay-Server/src/main/java/org/allaymc/server/block/registry/AllayBlockTypeRegistry.java
+++ b/Allay-Server/src/main/java/org/allaymc/server/block/registry/AllayBlockTypeRegistry.java
@@ -1,15 +1,16 @@
 package org.allaymc.server.block.registry;
 
+import lombok.Getter;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import me.tongfei.progressbar.ConsoleProgressBarConsumer;
 import me.tongfei.progressbar.ProgressBar;
 import org.allaymc.api.block.registry.BlockTypeRegistry;
 import org.allaymc.api.block.type.BlockType;
-import org.allaymc.api.utils.Identifier;
 import org.allaymc.api.i18n.I18n;
 import org.allaymc.api.i18n.TrKeys;
 import org.allaymc.api.registry.SimpleMappedRegistry;
+import org.allaymc.api.utils.Identifier;
 import org.allaymc.api.utils.ReflectionUtils;
 import org.allaymc.server.block.type.BlockTypeDefaultInitializer;
 import org.allaymc.server.block.type.BlockTypeInitializer;
@@ -29,10 +30,24 @@
  */
 @Slf4j
 public final class AllayBlockTypeRegistry extends SimpleMappedRegistry<Identifier, BlockType<?>, Map<Identifier, BlockType<?>>> implements BlockTypeRegistry {
+    @Getter
+    private final List<BlockDefinition> blockDefinitions = new ArrayList<>();
+
     public AllayBlockTypeRegistry() {
         super(null, input -> new ConcurrentHashMap<>());
     }
 
+    private static void callInitializer(Method method, ProgressBar progressBar) {
+        try {
+            method.invoke(null);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            throw new RuntimeException(e);
+        } finally {
+            if (progressBar != null)
+                progressBar.step();
+        }
+    }
+
     @SneakyThrows
     public void init() {
         log.info(I18n.get().tr(TrKeys.A_BLOCKTYPE_LOADING));
@@ -51,24 +66,6 @@ public void init() {
         log.info(I18n.get().tr(TrKeys.A_BLOCKTYPE_LOADED, defaultInitializers.size()));
     }
 
-    private static void callInitializer(Method method, ProgressBar progressBar) {
-        try {
-            method.invoke(null);
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            throw new RuntimeException(e);
-        } finally {
-            if (progressBar != null)
-                progressBar.step();
-        }
-    }
-
-    private final List<BlockDefinition> blockDefinitions = new ArrayList<>();
-
-    @Override
-    public List<BlockDefinition> getBlockDefinitions() {
-        return blockDefinitions;
-    }
-
     private void rebuildDefinitionList() {
         blockDefinitions.clear();
         for (var blockType : this.getContent().values()) {
diff --git a/Allay-Server/src/main/java/org/allaymc/server/block/type/BlockTypeBuildException.java b/Allay-Server/src/main/java/org/allaymc/server/block/type/BlockTypeBuildException.java
index 2a298841f..13d5de588 100644
--- a/Allay-Server/src/main/java/org/allaymc/server/block/type/BlockTypeBuildException.java
+++ b/Allay-Server/src/main/java/org/allaymc/server/block/type/BlockTypeBuildException.java
@@ -6,9 +6,6 @@
  * @author daoge_cmd
  */
 public class BlockTypeBuildException extends RuntimeException {
-    public BlockTypeBuildException() {
-    }
-
     public BlockTypeBuildException(String message) {
         super(message);
     }
diff --git a/Allay-Server/src/main/java/org/allaymc/server/block/type/BlockTypeInitializer.java b/Allay-Server/src/main/java/org/allaymc/server/block/type/BlockTypeInitializer.java
index e0848c367..b7b126d3f 100644
--- a/Allay-Server/src/main/java/org/allaymc/server/block/type/BlockTypeInitializer.java
+++ b/Allay-Server/src/main/java/org/allaymc/server/block/type/BlockTypeInitializer.java
@@ -162,7 +162,7 @@ public static void initTallGrass() {
     }
 
     public static void initLargeFern() {
-        // TODO: 需要适配
+        // TODO: Needs adaptation
         BlockTypes.LARGE_FERN_TYPE = BlockTypeBuilder
                 .builder(BlockLargeFernBehavior.class)
                 .vanillaBlock(VanillaBlockId.LARGE_FERN)
diff --git a/Allay-Server/src/main/java/org/allaymc/server/entity/component/player/EntityPlayerBaseComponentImpl.java b/Allay-Server/src/main/java/org/allaymc/server/entity/component/player/EntityPlayerBaseComponentImpl.java
index ea31f00a8..51f7c0cf4 100644
--- a/Allay-Server/src/main/java/org/allaymc/server/entity/component/player/EntityPlayerBaseComponentImpl.java
+++ b/Allay-Server/src/main/java/org/allaymc/server/entity/component/player/EntityPlayerBaseComponentImpl.java
@@ -264,13 +264,13 @@ public BedrockPacket createSpawnPacket() {
         addPlayerPacket.setUniqueEntityId(runtimeId);
         addPlayerPacket.setUuid(networkComponent.getLoginData().getUuid());
         addPlayerPacket.setUsername(networkComponent.getOriginName());
-        addPlayerPacket.setPlatformChatId(networkComponent.getLoginData().getDeviceInfo().getDeviceId());
+        addPlayerPacket.setPlatformChatId(networkComponent.getLoginData().getDeviceInfo().deviceId());
         addPlayerPacket.setPosition(Vector3f.from(location.x(), location.y() + getBaseOffset(), location.z()));
         addPlayerPacket.setMotion(Vector3f.from(motion.x(), motion.y(), motion.z()));
         addPlayerPacket.setRotation(Vector3f.from(location.pitch(), location.yaw(), location.headYaw()));
         addPlayerPacket.setGameType(gameType);
         addPlayerPacket.getMetadata().putAll(this.metadata.getEntityDataMap());
-        addPlayerPacket.setDeviceId(networkComponent.getLoginData().getDeviceInfo().getDeviceId());
+        addPlayerPacket.setDeviceId(networkComponent.getLoginData().getDeviceInfo().deviceId());
         addPlayerPacket.setHand(containerHolderComponent.getContainer(FullContainerType.PLAYER_INVENTORY).getItemInHand().toNetworkItemData());
         return addPlayerPacket;
     }
diff --git a/Allay-Server/src/main/java/org/allaymc/server/item/component/common/ItemBaseComponentImpl.java b/Allay-Server/src/main/java/org/allaymc/server/item/component/common/ItemBaseComponentImpl.java
index 4175cc049..f2eed0fd4 100644
--- a/Allay-Server/src/main/java/org/allaymc/server/item/component/common/ItemBaseComponentImpl.java
+++ b/Allay-Server/src/main/java/org/allaymc/server/item/component/common/ItemBaseComponentImpl.java
@@ -352,7 +352,7 @@ public boolean hasEnchantment(EnchantmentType enchantmentType) {
     }
 
     @Override
-    public short getEnchantmentLevel(EnchantmentType enchantmentType) {
+    public int getEnchantmentLevel(EnchantmentType enchantmentType) {
         var instance =  enchantments.get(enchantmentType);
         return instance == null ? 0 : instance.getLevel();
     }
diff --git a/Allay-Server/src/main/java/org/allaymc/server/item/enchantment/AllayEnchantmentRegistry.java b/Allay-Server/src/main/java/org/allaymc/server/item/enchantment/AllayEnchantmentRegistry.java
index c967a1287..648e1c687 100644
--- a/Allay-Server/src/main/java/org/allaymc/server/item/enchantment/AllayEnchantmentRegistry.java
+++ b/Allay-Server/src/main/java/org/allaymc/server/item/enchantment/AllayEnchantmentRegistry.java
@@ -4,11 +4,11 @@
 import lombok.extern.slf4j.Slf4j;
 import me.tongfei.progressbar.ConsoleProgressBarConsumer;
 import me.tongfei.progressbar.ProgressBar;
-import org.allaymc.api.utils.Identifier;
 import org.allaymc.api.i18n.I18n;
 import org.allaymc.api.item.enchantment.EnchantmentRegistry;
 import org.allaymc.api.item.enchantment.EnchantmentType;
 import org.allaymc.api.registry.SimpleDoubleKeyMappedRegistry;
+import org.allaymc.api.utils.Identifier;
 import org.allaymc.api.utils.ReflectionUtils;
 
 import java.util.concurrent.ConcurrentHashMap;
@@ -19,7 +19,7 @@
  * @author daoge_cmd
  */
 @Slf4j
-public class AllayEnchantmentRegistry extends SimpleDoubleKeyMappedRegistry<Short, Identifier, EnchantmentType> implements EnchantmentRegistry {
+public class AllayEnchantmentRegistry extends SimpleDoubleKeyMappedRegistry<Integer, Identifier, EnchantmentType> implements EnchantmentRegistry {
     public AllayEnchantmentRegistry() {
         super(null, input -> new MapPair<>(new ConcurrentHashMap<>(), new ConcurrentHashMap<>()));
     }