feat: add new DTOs for versions from 1.19

Author: boybook

.claude/settings.local.json

@@ -20,7 +20,9 @@
       "Bash(npm run:*)",
       "Bash(xargs -I {} sh -c 'echo \"\"\"\"=== {} ===\"\"\"\" && head -30 {}')",
       "Bash(jar -tf:*)",
-      "Bash(javap:*)"
+      "Bash(javap:*)",
+      "Bash(git log:*)",
+      "Bash(git checkout tags/v1.20.0-0)"
     ],
     "deny": [],
     "ask": []

adapter-easecation/src/main/java/net/easecation/bridge/adapter/easecation/EasecationRegistry.java

@@ -383,7 +383,7 @@ private CompoundTag buildBlockNBT(BlockDef blockDef, int runtimeId) {
                 CompoundTag menuCategory = new CompoundTag();
                 var mc = blockDef.description().menuCategory();
 
-                menuCategory.putString("category", mc.category() != null ? mc.category().toString() : "none");
+                menuCategory.putString("category", mc.category() != null ? mc.category() : "none");
                 if (mc.group() != null) {
                     menuCategory.putString("group", mc.group());
                 }

adapter-easecation/src/main/java/net/easecation/bridge/adapter/easecation/block/BlockComponentsNBT.java

@@ -3,7 +3,7 @@
 import cn.nukkit.nbt.tag.CompoundTag;
 import cn.nukkit.nbt.tag.ListTag;
 import cn.nukkit.nbt.tag.StringTag;
-import net.easecation.bridge.core.dto.v1_21_60.behavior.blocks.*;
+import net.easecation.bridge.core.dto.block.v1_21_60.*;
 
 import java.util.List;
 import java.util.Map;
@@ -150,15 +150,15 @@ public static CompoundTag toNBT(Component component, boolean override) {
         }
 
         // Destruction Particles
-        if (component.minecraft_destructionParticles() != null) {
-            tag.putCompound("minecraft:destruction_particles",
-                convertDestructionParticles(component.minecraft_destructionParticles()));
-        }
+        // Note: minecraft:destruction_particles not in v1_21_60 schema
+        // if (component.minecraft_destructionParticles() != null) {
+        //     tag.putCompound("minecraft:destruction_particles",
+        //         convertDestructionParticles(component.minecraft_destructionParticles()));
+        // }
 
         // Replaceable
-        if (component.minecraft_replaceable() != null) {
-            tag.putCompound("minecraft:replaceable", new CompoundTag());
-        }
+        // Note: minecraft:replaceable component was removed from v1_21_60 schema
+        // This component is no longer supported in the latest version
 
         // Item Visual
         if (component.minecraft_itemVisual() != null) {
@@ -480,15 +480,11 @@ private static CompoundTag convertMaterialInstances(Map<String, MaterialInstance
                     // Texture: default empty string
                     material.putString("texture", variant1.texture() != null ? variant1.texture() : "");
 
-                    // Tint Method: convert enum to string, default "none"
-                    if (variant1.tintMethod() != null) {
-                        material.putString("tint_method", variant1.tintMethod().toString());
-                    } else {
-                        material.putString("tint_method", "none");
-                    }
+                    // Tint Method: 使用默认值（behavior schema 中不包含此字段）
+                    material.putString("tint_method", "none");
 
-                    // Isotropic: default false
-                    material.putBoolean("isotropic", variant1.isotropic() != null ? variant1.isotropic() : false);
+                    // Isotropic: 使用默认值（behavior schema 中不包含此字段）
+                    material.putBoolean("isotropic", false);
                 }
 
                 materials.put(faceName, material);
@@ -746,18 +742,19 @@ private static CompoundTag convertLiquidDetection(LiquidDetection detection) {
         return result;
     }
 
-    private static CompoundTag convertDestructionParticles(DestructionParticles particles) {
-        CompoundTag result = new CompoundTag();
-        if (particles.texture() != null) {
-            result.putString("texture", particles.texture());
-        }
-        if (particles.tintMethod() != null) {
-            result.putString("tint_method", particles.tintMethod().toString());
-        }
-        // Note: particle_count is not in the v1_21_60 schema, using default
-        result.putInt("particle_count", 100);
-        return result;
-    }
+    // Note: DestructionParticles class not in v1_21_60 schema
+    // private static CompoundTag convertDestructionParticles(DestructionParticles particles) {
+    //     CompoundTag result = new CompoundTag();
+    //     if (particles.texture() != null) {
+    //         result.putString("texture", particles.texture());
+    //     }
+    //     if (particles.tintMethod() != null) {
+    //         result.putString("tint_method", particles.tintMethod().toString());
+    //     }
+    //     // Note: particle_count is not in the v1_21_60 schema, using default
+    //     result.putInt("particle_count", 100);
+    //     return result;
+    // }
 
     /**
      * Convert ItemVisual to NBT.

adapter-easecation/src/main/java/net/easecation/bridge/adapter/easecation/block/BlockDataDriven.java

@@ -6,10 +6,10 @@
 import cn.nukkit.math.AxisAlignedBB;
 import cn.nukkit.math.SimpleAxisAlignedBB;
 import net.easecation.bridge.core.BlockDef;
-import net.easecation.bridge.core.dto.v1_21_60.behavior.blocks.Component;
-import net.easecation.bridge.core.dto.v1_21_60.behavior.blocks.Geometry;
-import net.easecation.bridge.core.dto.v1_21_60.behavior.blocks.CollisionBox;
-import net.easecation.bridge.core.dto.v1_21_60.behavior.blocks.StatesValue;
+import net.easecation.bridge.core.dto.block.v1_21_60.Component;
+import net.easecation.bridge.core.dto.block.v1_21_60.Geometry;
+import net.easecation.bridge.core.dto.block.v1_21_60.CollisionBox;
+import net.easecation.bridge.core.dto.block.v1_21_60.StatesValue;
 
 import java.util.List;
 import java.util.Map;
@@ -213,10 +213,10 @@ private SimpleAxisAlignedBB extractCollisionBox(Component comp) {
         var collisionBox = comp.minecraft_collisionBox();
 
         // CollisionBox is a sealed interface with variants
-        if (collisionBox instanceof net.easecation.bridge.core.dto.v1_21_60.behavior.blocks.CollisionBox.CollisionBox_Variant0 variant0) {
+        if (collisionBox instanceof net.easecation.bridge.core.dto.block.v1_21_60.CollisionBox.CollisionBox_Variant0 variant0) {
             // Boolean value: true = default cube, false = no collision
             return variant0.value() ? CUBE : null;
-        } else if (collisionBox instanceof net.easecation.bridge.core.dto.v1_21_60.behavior.blocks.CollisionBox.CollisionBox_Variant1 variant1) {
+        } else if (collisionBox instanceof net.easecation.bridge.core.dto.block.v1_21_60.CollisionBox.CollisionBox_Variant1 variant1) {
             // Detailed config with origin and size
             // Origin is specified as [x, y, z] in range (-8, 0, -8) to (8, 16, 8)
             // Size is specified as [x, y, z]
@@ -264,10 +264,10 @@ private float extractHardness(Component comp) {
         if (comp.minecraft_destructibleByMining() != null) {
             var destructible = comp.minecraft_destructibleByMining();
             // DestructibleByMining is a sealed interface with variants
-            if (destructible instanceof net.easecation.bridge.core.dto.v1_21_60.behavior.blocks.DestructibleByMining.DestructibleByMining_Variant0 variant0) {
+            if (destructible instanceof net.easecation.bridge.core.dto.block.v1_21_60.DestructibleByMining.DestructibleByMining_Variant0 variant0) {
                 // Boolean value: true = default hardness, false = unbreakable
                 return variant0.value() ? 1.0f : -1.0f;
-            } else if (destructible instanceof net.easecation.bridge.core.dto.v1_21_60.behavior.blocks.DestructibleByMining.DestructibleByMining_Variant1 variant1) {
+            } else if (destructible instanceof net.easecation.bridge.core.dto.block.v1_21_60.DestructibleByMining.DestructibleByMining_Variant1 variant1) {
                 // Detailed config with seconds_to_destroy
                 if (variant1.secondsToDestroy() != null) {
                     return variant1.secondsToDestroy().floatValue();
@@ -281,10 +281,10 @@ private float extractResistance(Component comp, float hardness) {
         if (comp.minecraft_destructibleByExplosion() != null) {
             var explosion = comp.minecraft_destructibleByExplosion();
             // DestructibleByExplosion is a sealed interface with variants
-            if (explosion instanceof net.easecation.bridge.core.dto.v1_21_60.behavior.blocks.DestructibleByExplosion.DestructibleByExplosion_Variant0 variant0) {
+            if (explosion instanceof net.easecation.bridge.core.dto.block.v1_21_60.DestructibleByExplosion.DestructibleByExplosion_Variant0 variant0) {
                 // Boolean value: true = default resistance, false = immune
                 return variant0.value() ? hardness * 5.0f : Float.MAX_VALUE;
-            } else if (explosion instanceof net.easecation.bridge.core.dto.v1_21_60.behavior.blocks.DestructibleByExplosion.DestructibleByExplosion_Variant1 variant1) {
+            } else if (explosion instanceof net.easecation.bridge.core.dto.block.v1_21_60.DestructibleByExplosion.DestructibleByExplosion_Variant1 variant1) {
                 // Detailed config with explosion_resistance
                 if (variant1.explosionResistance() != null) {
                     return variant1.explosionResistance().floatValue();
@@ -328,9 +328,9 @@ private SimpleAxisAlignedBB extractSelectionBox(Component comp, SimpleAxisAligne
         }
 
         var selectionBox = comp.minecraft_selectionBox();
-        if (selectionBox instanceof net.easecation.bridge.core.dto.v1_21_60.behavior.blocks.SelectionBox.SelectionBox_Variant0 variant0) {
+        if (selectionBox instanceof net.easecation.bridge.core.dto.block.v1_21_60.SelectionBox.SelectionBox_Variant0 variant0) {
             return variant0.value() ? CUBE : null;
-        } else if (selectionBox instanceof net.easecation.bridge.core.dto.v1_21_60.behavior.blocks.SelectionBox.SelectionBox_Variant1 variant1) {
+        } else if (selectionBox instanceof net.easecation.bridge.core.dto.block.v1_21_60.SelectionBox.SelectionBox_Variant1 variant1) {
             float[] origin = new float[]{-8, 0, -8};
             float[] size = new float[]{16, 16, 16};
 
@@ -375,18 +375,20 @@ private boolean extractSolid(Component comp) {
     }
 
     private boolean extractReplaceable(Component comp) {
-        return comp.minecraft_replaceable() != null;
+        // Note: minecraft:replaceable component was removed from v1_21_60 schema
+        // Replaceable blocks should be identified through other means
+        return false;
     }
 
     private int extractFlameOdds(Component comp) {
         if (comp.minecraft_flammable() != null) {
             var flammable = comp.minecraft_flammable();
-            if (flammable instanceof net.easecation.bridge.core.dto.v1_21_60.behavior.blocks.Flammable.Flammable_Variant1 variant1) {
+            if (flammable instanceof net.easecation.bridge.core.dto.block.v1_21_60.Flammable.Flammable_Variant1 variant1) {
                 if (variant1.catchChanceModifier() != null) {
                     return variant1.catchChanceModifier().intValue();
                 }
                 return 5; // Default catch chance
-            } else if (flammable instanceof net.easecation.bridge.core.dto.v1_21_60.behavior.blocks.Flammable.Flammable_Variant0 variant0) {
+            } else if (flammable instanceof net.easecation.bridge.core.dto.block.v1_21_60.Flammable.Flammable_Variant0 variant0) {
                 return variant0.value() ? 5 : 0;
             }
         }
@@ -396,12 +398,12 @@ private int extractFlameOdds(Component comp) {
     private int extractBurnOdds(Component comp) {
         if (comp.minecraft_flammable() != null) {
             var flammable = comp.minecraft_flammable();
-            if (flammable instanceof net.easecation.bridge.core.dto.v1_21_60.behavior.blocks.Flammable.Flammable_Variant1 variant1) {
+            if (flammable instanceof net.easecation.bridge.core.dto.block.v1_21_60.Flammable.Flammable_Variant1 variant1) {
                 if (variant1.destroyChanceModifier() != null) {
                     return variant1.destroyChanceModifier().intValue();
                 }
                 return 20; // Default destroy chance
-            } else if (flammable instanceof net.easecation.bridge.core.dto.v1_21_60.behavior.blocks.Flammable.Flammable_Variant0 variant0) {
+            } else if (flammable instanceof net.easecation.bridge.core.dto.block.v1_21_60.Flammable.Flammable_Variant0 variant0) {
                 return variant0.value() ? 20 : 0;
             }
         }
@@ -429,7 +431,7 @@ private int extractAllowedPlacementFaces(Component comp) {
         return 0b111111; // Default: all faces
     }
 
-    private boolean[] extractTraitStates(net.easecation.bridge.core.dto.v1_21_60.behavior.blocks.Traits traits) {
+    private boolean[] extractTraitStates(net.easecation.bridge.core.dto.block.v1_21_60.Traits traits) {
         // Returns: [cardinalDirection, facingDirection, blockFace, verticalHalf, cardinalConnections]
         boolean[] states = new boolean[5];
         if (traits == null) {

adapter-easecation/src/main/java/net/easecation/bridge/adapter/easecation/block/BlockPermutationNBT.java

@@ -4,7 +4,7 @@
 import cn.nukkit.nbt.tag.ListTag;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import net.easecation.bridge.core.dto.v1_21_60.behavior.blocks.Component;
+import net.easecation.bridge.core.dto.block.v1_21_60.Component;
 
 import java.util.List;
 import java.util.Map;

adapter-easecation/src/main/java/net/easecation/bridge/adapter/easecation/block/BlockStatesNBT.java

@@ -4,7 +4,7 @@
 import cn.nukkit.nbt.tag.IntTag;
 import cn.nukkit.nbt.tag.ListTag;
 import cn.nukkit.nbt.tag.StringTag;
-import net.easecation.bridge.core.dto.v1_21_60.behavior.blocks.StatesValue;
+import net.easecation.bridge.core.dto.block.v1_21_60.StatesValue;
 
 import java.util.ArrayList;
 import java.util.List;

adapter-easecation/src/main/java/net/easecation/bridge/adapter/easecation/block/BlockTraitsNBT.java

@@ -2,10 +2,9 @@
 
 import cn.nukkit.nbt.tag.CompoundTag;
 import cn.nukkit.nbt.tag.ListTag;
-import net.easecation.bridge.core.dto.v1_21_60.behavior.blocks.Connection;
-import net.easecation.bridge.core.dto.v1_21_60.behavior.blocks.PlacementDirection;
-import net.easecation.bridge.core.dto.v1_21_60.behavior.blocks.PlacementPosition;
-import net.easecation.bridge.core.dto.v1_21_60.behavior.blocks.Traits;
+import net.easecation.bridge.core.dto.block.v1_21_60.PlacementDirection;
+import net.easecation.bridge.core.dto.block.v1_21_60.PlacementPosition;
+import net.easecation.bridge.core.dto.block.v1_21_60.Traits;
 
 /**
  * Utility class for converting Traits DTO to NBT format.

adapter-easecation/src/main/java/net/easecation/bridge/adapter/easecation/entity/EntityDataDriven.java

@@ -9,17 +9,16 @@
 import cn.nukkit.level.format.FullChunk;
 import cn.nukkit.nbt.tag.CompoundTag;
 import cn.nukkit.network.protocol.AddEntityPacket;
-import cn.nukkit.network.protocol.ProtocolInfo;
 import cn.nukkit.network.protocol.UpdateAttributesPacket;
-import net.easecation.bridge.core.dto.v1_21_60.behavior.entities.Components;
-import net.easecation.bridge.core.dto.v1_21_60.behavior.entities.Range_a_B_;
+import net.easecation.bridge.core.dto.entity.v1_21_60.Components;
+import net.easecation.bridge.core.dto.entity.v1_21_60.Range_a_B;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Data-driven custom entity implementation for EaseCation Nukkit.
- * Based on ECProEntity's EntityDataDriven implementation.
+ * Uses the LATEST version (v1_21_60) - old versions will be auto-upgraded before registration.
  */
 public class EntityDataDriven extends EntityCreature {
 
@@ -196,16 +195,16 @@ private void initComponents() {
     }
 
     /**
-     * Extract a numeric value from Range_a_B_ sealed interface.
+     * Extract a numeric value from Range_a_B sealed interface.
      */
-    private Double extractRangeValue(Range_a_B_ range) {
+    private Double extractRangeValue(Range_a_B range) {
         if (range == null) {
             return null;
         }
 
-        if (range instanceof Range_a_B_.Range_a_B__Variant0 variant0) {
+        if (range instanceof Range_a_B.Range_a_BVariant0 variant0) {
             return variant0.value();
-        } else if (range instanceof Range_a_B_.Range_a_B__Variant2 variant2) {
+        } else if (range instanceof Range_a_B.Range_a_BVariant2 variant2) {
             // For range, use min value
             if (variant2.rangeMin() != null) {
                 return variant2.rangeMin();