feat: add baby component support to zombies and implement zombie death items & xp

Author: smartcmd

api/src/main/java/org/allaymc/api/entity/interfaces/EntityZombie.java

@@ -1,8 +1,9 @@
 package org.allaymc.api.entity.interfaces;
 
+import org.allaymc.api.entity.component.EntityBabyComponent;
 import org.allaymc.api.entity.component.EntityContainerHolderComponent;
 import org.allaymc.api.entity.component.EntityHeadYawComponent;
 import org.allaymc.api.entity.component.EntityUndeadComponent;
 
-public interface EntityZombie extends EntityIntelligent, EntityHeadYawComponent, EntityUndeadComponent, EntityContainerHolderComponent {
+public interface EntityZombie extends EntityIntelligent, EntityHeadYawComponent, EntityUndeadComponent, EntityContainerHolderComponent, EntityBabyComponent {
 }

server/src/main/java/org/allaymc/server/entity/component/EntityLivingComponentImpl.java

@@ -26,8 +26,8 @@
 import org.allaymc.api.entity.interfaces.EntityPlayer;
 import org.allaymc.api.eventbus.EventHandler;
 import org.allaymc.api.eventbus.event.entity.*;
-import org.allaymc.api.item.enchantment.EnchantmentTypes;
 import org.allaymc.api.item.ItemStack;
+import org.allaymc.api.item.enchantment.EnchantmentTypes;
 import org.allaymc.api.item.interfaces.ItemAirStack;
 import org.allaymc.api.math.MathUtils;
 import org.allaymc.api.utils.identifier.Identifier;
@@ -47,7 +47,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ThreadLocalRandom;
 
 import static java.lang.Math.max;
 import static java.lang.Math.min;
@@ -734,13 +733,15 @@ protected void onDie() {
         }
 
         // Drop loot items
-        var drops = getDrops(lootingLevel);
-        if (!drops.isEmpty()) {
-            var dimension = baseComponent.getDimension();
-            var dropPos = dieEvent.getDropPosition();
-            var motionFactory = dieEvent.getDropMotionFactory();
-            for (var drop : drops) {
-                dimension.dropItem(drop, dropPos, motionFactory.get(), 40);
+        if (thisEntity.getWorld().getWorldData().<Boolean>getGameRuleValue(GameRule.DO_MOB_LOOT)) {
+            var drops = getDrops(lootingLevel);
+            if (!drops.isEmpty()) {
+                var dimension = baseComponent.getDimension();
+                var dropPos = dieEvent.getDropPosition();
+                var motionFactory = dieEvent.getDropMotionFactory();
+                for (var drop : drops) {
+                    dimension.dropItem(drop, dropPos, motionFactory.get(), 40);
+                }
             }
         }
 

server/src/main/java/org/allaymc/server/entity/component/EntityZombieLivingComponentImpl.java

@@ -3,18 +3,27 @@
 import org.allaymc.api.entity.Entity;
 import org.allaymc.api.entity.ai.memory.MemoryTypes;
 import org.allaymc.api.entity.component.EntityAIComponent;
+import org.allaymc.api.entity.component.EntityBabyComponent;
 import org.allaymc.api.entity.component.EntityLivingComponent;
 import org.allaymc.api.entity.damage.DamageContainer;
 import org.allaymc.api.entity.interfaces.EntityProjectile;
+import org.allaymc.api.item.ItemStack;
+import org.allaymc.api.item.type.ItemTypes;
 import org.allaymc.server.component.annotation.Dependency;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
+
 /**
  * Living component implementation for zombies.
  */
 public class EntityZombieLivingComponentImpl extends EntityLivingComponentImpl {
 
     @Dependency
     protected EntityAIComponent aiComponent;
+    @Dependency
+    protected EntityBabyComponent babyComponent;
 
     public EntityZombieLivingComponentImpl() {
         setMaxHealth(20);
@@ -42,4 +51,32 @@ protected Entity resolveAttacker(Object attacker) {
 
         return attacker instanceof Entity entity ? entity : null;
     }
+
+    @Override
+    public List<ItemStack> getDrops(int lootingLevel) {
+        var drops = new ArrayList<ItemStack>();
+        var rand = ThreadLocalRandom.current();
+        int fleshCount = rand.nextInt(4 + lootingLevel);
+        if (fleshCount > 0) {
+            drops.add(ItemTypes.ROTTEN_FLESH.createItemStack(fleshCount));
+        }
+
+        float rareChance = (1f / 120f) + ((1f / 300f) * lootingLevel);
+        if (rand.nextFloat() < rareChance) {
+            switch (rand.nextInt(4)) {
+                case 0 -> drops.add(ItemTypes.IRON_INGOT.createItemStack());
+                case 1 -> drops.add(ItemTypes.CARROT.createItemStack());
+                case 2 -> drops.add(ItemTypes.POTATO.createItemStack());
+                default -> {
+                }
+            }
+        }
+
+        return drops;
+    }
+
+    @Override
+    public int getDropXpAmount() {
+        return babyComponent.isBaby() ? 12 : 5;
+    }
 }

server/src/main/java/org/allaymc/server/entity/component/animal/EntityAnimalBaseComponentImpl.java

@@ -9,7 +9,6 @@
 import org.allaymc.api.entity.interfaces.EntityPlayer;
 import org.allaymc.api.eventbus.EventHandler;
 import org.allaymc.api.item.ItemStack;
-import org.allaymc.api.world.gamerule.GameRule;
 import org.allaymc.server.component.annotation.Dependency;
 import org.allaymc.server.entity.component.EntityBaseComponentImpl;
 import org.allaymc.server.entity.component.event.CEntityGetDropXpEvent;
@@ -46,10 +45,6 @@ public boolean onInteract(EntityPlayer player, ItemStack itemStack) {
         return true;
     }
 
-    protected boolean canDrop() {
-        return thisEntity.getWorld().getWorldData().<Boolean>getGameRuleValue(GameRule.DO_MOB_LOOT) && !babyComponent.isBaby();
-    }
-
     @EventHandler
     protected void onGetDropXp(CEntityGetDropXpEvent event) {
         if (babyComponent.isBaby()) return;

server/src/main/java/org/allaymc/server/entity/component/animal/EntityChickenBaseComponentImpl.java

@@ -25,7 +25,7 @@ public AABBdc getBaseAABB() {
 
     @EventHandler
     protected void onGetDrop(CEntityGetDropEvent event) {
-        if (!canDrop()) {
+        if (babyComponent.isBaby()) {
             return;
         }
 

server/src/main/java/org/allaymc/server/entity/component/animal/EntityCowBaseComponentImpl.java

@@ -44,7 +44,7 @@ public boolean onInteract(EntityPlayer player, ItemStack itemStack) {
 
     @EventHandler
     protected void onGetDrop(CEntityGetDropEvent event) {
-        if (!canDrop()) {
+        if (babyComponent.isBaby()) {
             return;
         }
 

server/src/main/java/org/allaymc/server/entity/component/animal/EntityPigBaseComponentImpl.java

@@ -25,7 +25,7 @@ public AABBdc getBaseAABB() {
 
     @EventHandler
     protected void onGetDrop(CEntityGetDropEvent event) {
-        if (!canDrop()) {
+        if (babyComponent.isBaby()) {
             return;
         }
 

server/src/main/java/org/allaymc/server/entity/impl/EntityZombieImpl.java

@@ -22,6 +22,8 @@ public class EntityZombieImpl extends EntityImpl implements EntityZombie, Entity
     @Delegate
     private EntityParallelTickComponent parallelTickComponent;
     @Delegate
+    private EntityBabyComponent babyComponent;
+    @Delegate
     private EntityHeadYawComponent headYawComponent;
 
     public EntityZombieImpl(EntityInitInfo initInfo,

server/src/main/java/org/allaymc/server/entity/type/EntityTypeInitializer.java

@@ -180,6 +180,7 @@ public static void initZombie() {
                 .vanillaEntity(EntityId.ZOMBIE)
                 .addComponent(EntityHumanLikeBaseComponentImpl::new, EntityHumanLikeBaseComponentImpl.class)
                 .addComponent(EntityHumanLikeContainerHolderComponentImpl::new, EntityHumanLikeContainerHolderComponentImpl.class)
+                .addComponent(EntityBabyComponentImpl::new, EntityBabyComponentImpl.class)
                 .addComponent(EntityUndeadComponentImpl::new, EntityUndeadComponentImpl.class)
                 .addComponent(EntityZombieLivingComponentImpl::new, EntityZombieLivingComponentImpl.class)
                 .addComponent(EntityHumanPhysicsComponentImpl::new, EntityHumanPhysicsComponentImpl.class)