feat: 自由落体运动测试通过！

AllayMC · Aug 8, 2023 · 89832e2 · 89832e2
1 parent a715c70
commit 89832e2
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 4 deletions.
diff --git a/Allay-API/src/main/java/cn/allay/api/block/component/impl/attribute/BlockAttributes.java b/Allay-API/src/main/java/cn/allay/api/block/component/impl/attribute/BlockAttributes.java
@@ -122,6 +122,7 @@ public static BlockAttributes fromNBT(NbtMap nbt) {
         return BlockAttributes
                 .builder()
                 .aabbCollision(parseAABBStr(nbt.getString("aabbCollision")))
+                .hasCollision(nbt.getBoolean("hasCollision"))
                 .blocksPrecipitation(nbt.getBoolean("blocksPrecipitation"))
                 .canBeMovingBlock(nbt.getBoolean("canBeMovingBlock"))
                 .breaksFallingBlocks(nbt.getBoolean("breaksFallingBlocks"))

diff --git a/Allay-API/src/main/java/cn/allay/api/data/VanillaEntityTypes.java b/Allay-API/src/main/java/cn/allay/api/data/VanillaEntityTypes.java
@@ -1,6 +1,10 @@
 package cn.allay.api.data;
 
+import cn.allay.api.component.annotation.AutoRegister;
+import cn.allay.api.component.interfaces.ComponentProvider;
+import cn.allay.api.entity.component.impl.base.EntityBaseComponentImpl;
 import cn.allay.api.entity.impl.*;
+import cn.allay.api.entity.type.EntityInitInfo;
 import cn.allay.api.entity.type.EntityType;
 import cn.allay.api.entity.type.EntityTypeBuilder;
 import org.joml.primitives.AABBd;
@@ -631,12 +635,28 @@ public interface VanillaEntityTypes {
   EntityType<EntityVillager> VILLAGER_TYPE = EntityTypeBuilder
           .builder(EntityVillager.class)
           .vanillaEntity(VanillaEntityId.VILLAGER)
+          .addComponent(
+                  ComponentProvider.of(
+                          info -> new EntityBaseComponentImpl<>(
+                                  (EntityInitInfo<EntityVillager>) info,
+                                  //TODO: 小村民
+                                  e -> new AABBd(-0.3, 0, -0.3, 0.3, 1.8, 0.3)
+                          ), EntityBaseComponentImpl.class
+                  ))
           .addBasicComponents()
           .build();
 
   EntityType<EntityVillagerV2> VILLAGER_V2_TYPE = EntityTypeBuilder
           .builder(EntityVillagerV2.class)
           .vanillaEntity(VanillaEntityId.VILLAGER_V2)
+          .addComponent(
+                  ComponentProvider.of(
+                          info -> new EntityBaseComponentImpl<>(
+                                  (EntityInitInfo<EntityVillagerV2>) info,
+                                  //TODO: 小村民
+                                  e -> new AABBd(-0.3, 0, -0.3, 0.3, 1.8, 0.3)
+                          ), EntityBaseComponentImpl.class
+                  ))
           .addBasicComponents()
           .build();
 

diff --git a/Allay-API/src/main/java/cn/allay/api/entity/component/impl/base/EntityBaseComponent.java b/Allay-API/src/main/java/cn/allay/api/entity/component/impl/base/EntityBaseComponent.java
@@ -114,4 +114,17 @@ default double getStepHeight() {
     default double getGravity() {
         return 0.08;
     }
+
+    double SPRINTING_MOVEMENT_FACTOR = 1.3;
+    double WALKING_MOVEMENT_FACTOR = 1;
+    double SNEAKING_MOVEMENT_FACTOR = 0.3;
+    double STOP_MOVEMENT_FACTOR = 0;
+
+    /**
+     * 给定yaw，若移动乘数不为0实体将往yaw指定的方向前进 <p>
+     * 参见：<a href="https://www.mcpk.wiki/wiki/Horizontal_Movement_Formulas/zh">...</a>
+     */
+    default double getMovementFactor() {
+        return STOP_MOVEMENT_FACTOR;
+    }
 }
diff --git a/Allay-Server/src/main/java/cn/allay/server/world/entity/AllayEntityPhysicsService.java b/Allay-Server/src/main/java/cn/allay/server/world/entity/AllayEntityPhysicsService.java
@@ -65,6 +65,7 @@ public void tick() {
     protected void updateMotion(Entity entity) {
         //TODO: 效果乘数
         var effectFactor = 1;
+        double movementFactor = entity.getMovementFactor();
         var blockUnder = world.getBlockState((int) entity.getLocation().x(), (int) (entity.getLocation().y() - 0.5), (int) entity.getLocation().z());
         double slipperyFactor = blockUnder != null ?
                 blockUnder.blockType().getBlockBehavior().getBlockAttributes(blockUnder).friction() :
@@ -79,11 +80,11 @@ protected void updateMotion(Entity entity) {
         var approachMz = mz * slipperyFactor * 0.91;
         double yaw = entity.getLocation().yaw();
         if (entity.isOnGround()) {
-            newMx = approachMx + 0.1 * effectFactor * Math.pow(0.6 / slipperyFactor, 3) * Math.sin(yaw);
-            newMz = approachMz + 0.1 * effectFactor * Math.pow(0.6 / slipperyFactor, 3) * Math.cos(yaw);
+            newMx = approachMx + 0.1 * movementFactor * effectFactor * Math.pow(0.6 / slipperyFactor, 3) * Math.sin(yaw);
+            newMz = approachMz + 0.1 * movementFactor * effectFactor * Math.pow(0.6 / slipperyFactor, 3) * Math.cos(yaw);
         } else {
-            newMx = approachMx + 0.02 * Math.sin(yaw);
-            newMz = approachMz + 0.02 * Math.cos(yaw);
+            newMx = approachMx + 0.02 * movementFactor * Math.sin(yaw);
+            newMz = approachMz + 0.02 * movementFactor * Math.cos(yaw);
         }
         double newMy = (my - entity.getGravity()) * 0.98;
         if (Math.abs(newMx) < MOTION_THRESHOLD) newMx = 0;

diff --git a/Data/block_attributes.nbt b/Data/block_attributes.nbt