Implement more entity data

AlexProgrammerDE · Nov 26, 2024 · ff418b9 · ff418b9
1 parent 98a1b7f
commit ff418b9
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 1 deletion.
diff --git a/data-generator/src/main/java/com/soulfiremc/generator/generators/EntitiesJsonGenerator.java b/data-generator/src/main/java/com/soulfiremc/generator/generators/EntitiesJsonGenerator.java
@@ -70,6 +70,10 @@ public static JsonObject generateEntity(EntityType<?> entityType) {
       entityDesc.addProperty("summonable", true);
     }
 
+    if (entityType.fireImmune()) {
+      entityDesc.addProperty("fireImmune", true);
+    }
+
     var defaultEntity = MCHelper.createEntity(entityType);
     if (defaultEntity.isAttackable()) {
       entityDesc.addProperty("attackable", true);

diff --git a/data-generator/src/main/resources/templates/EntityType.java b/data-generator/src/main/resources/templates/EntityType.java
@@ -31,6 +31,7 @@ public record EntityType(
   String category,
   boolean friendly,
   boolean summonable,
+  boolean fireImmune,
   boolean attackable,
   boolean boatEntity,
   boolean minecartEntity,

diff --git a/server/src/main/java/com/soulfiremc/server/data/EntityType.java b/server/src/main/java/com/soulfiremc/server/data/EntityType.java
@@ -31,6 +31,7 @@ public record EntityType(
   String category,
   boolean friendly,
   boolean summonable,
+  boolean fireImmune,
   boolean attackable,
   boolean boatEntity,
   boolean minecartEntity,

diff --git a/server/src/main/java/com/soulfiremc/server/protocol/bot/state/entity/Entity.java b/server/src/main/java/com/soulfiremc/server/protocol/bot/state/entity/Entity.java
@@ -70,7 +70,6 @@ public abstract class Entity {
   private static final int FLAG_INVISIBLE = 5;
   protected static final int FLAG_GLOWING = 6;
   protected static final int FLAG_FALL_FLYING = 7;
-  public static final float BREATHING_DISTANCE_BELOW_EYES = 0.11111111F;
   private static final AABB INITIAL_AABB = new AABB(0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
   protected final EntityAttributeState attributeState = new EntityAttributeState();
   protected final EntityEffectState effectState = new EntityEffectState();
@@ -270,6 +269,18 @@ protected void checkSupportingBlock(boolean onGround, @Nullable Vector3d movemen
     }
   }
 
+  public boolean fireImmune() {
+    return this.entityType.fireImmune();
+  }
+
+  public boolean isCurrentlyGlowing() {
+    return this.getSharedFlag(FLAG_GLOWING);
+  }
+
+  public boolean isInvisible() {
+    return this.getSharedFlag(FLAG_INVISIBLE);
+  }
+
   public boolean onGround() {
     return this.onGround;
   }

diff --git a/server/src/main/resources/minecraft/entities.json b/server/src/main/resources/minecraft/entities.json
@@ -82,6 +82,7 @@
     "category": "misc",
     "friendly": true,
     "summonable": true,
+    "fireImmune": true,
     "attackable": true,
     "inheritedClasses": [
       "area_effect_cloud",
@@ -335,6 +336,7 @@
     "clientTrackingRange": 8,
     "category": "monster",
     "summonable": true,
+    "fireImmune": true,
     "attackable": true,
     "inheritedClasses": [
       "blaze",
@@ -696,6 +698,7 @@
     "clientTrackingRange": 8,
     "category": "monster",
     "summonable": true,
+    "fireImmune": true,
     "attackable": true,
     "inheritedClasses": [
       "creaking",
@@ -718,6 +721,7 @@
     "updateInterval": 3,
     "clientTrackingRange": 8,
     "category": "monster",
+    "fireImmune": true,
     "attackable": true,
     "inheritedClasses": [
       "creaking_transient",
@@ -1003,6 +1007,7 @@
     "clientTrackingRange": 10,
     "category": "monster",
     "summonable": true,
+    "fireImmune": true,
     "attackable": true,
     "inheritedClasses": [
       "ender_dragon",
@@ -1048,6 +1053,7 @@
     "category": "misc",
     "friendly": true,
     "summonable": true,
+    "fireImmune": true,
     "attackable": true,
     "inheritedClasses": [
       "end_crystal",
@@ -1310,6 +1316,7 @@
     "clientTrackingRange": 10,
     "category": "monster",
     "summonable": true,
+    "fireImmune": true,
     "attackable": true,
     "inheritedClasses": [
       "ghast",
@@ -1819,6 +1826,7 @@
     "clientTrackingRange": 8,
     "category": "monster",
     "summonable": true,
+    "fireImmune": true,
     "attackable": true,
     "inheritedClasses": [
       "magma_cube",
@@ -2492,6 +2500,7 @@
     "clientTrackingRange": 10,
     "category": "monster",
     "summonable": true,
+    "fireImmune": true,
     "attackable": true,
     "inheritedClasses": [
       "shulker",
@@ -2889,6 +2898,7 @@
     "category": "creature",
     "friendly": true,
     "summonable": true,
+    "fireImmune": true,
     "attackable": true,
     "inheritedClasses": [
       "strider",
@@ -2960,6 +2970,7 @@
     "category": "misc",
     "friendly": true,
     "summonable": true,
+    "fireImmune": true,
     "attackable": true,
     "inheritedClasses": [
       "primed_tnt",
@@ -3102,6 +3113,7 @@
     "clientTrackingRange": 8,
     "category": "monster",
     "summonable": true,
+    "fireImmune": true,
     "attackable": true,
     "inheritedClasses": [
       "vex",
@@ -3201,6 +3213,7 @@
     "clientTrackingRange": 16,
     "category": "monster",
     "summonable": true,
+    "fireImmune": true,
     "attackable": true,
     "inheritedClasses": [
       "warden",
@@ -3273,6 +3286,7 @@
     "clientTrackingRange": 10,
     "category": "monster",
     "summonable": true,
+    "fireImmune": true,
     "attackable": true,
     "inheritedClasses": [
       "wither_boss",
@@ -3296,6 +3310,7 @@
     "clientTrackingRange": 8,
     "category": "monster",
     "summonable": true,
+    "fireImmune": true,
     "attackable": true,
     "inheritedClasses": [
       "wither_skeleton",
@@ -3368,6 +3383,7 @@
     "clientTrackingRange": 8,
     "category": "monster",
     "summonable": true,
+    "fireImmune": true,
     "attackable": true,
     "inheritedClasses": [
       "zoglin",
@@ -3464,6 +3480,7 @@
     "clientTrackingRange": 8,
     "category": "monster",
     "summonable": true,
+    "fireImmune": true,
     "attackable": true,
     "inheritedClasses": [
       "zombified_piglin",