diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java
index 704a1926..f13cb50c 100644
--- a/src/main/java/carpet/script/CarpetExpression.java
+++ b/src/main/java/carpet/script/CarpetExpression.java
@@ -3357,6 +3357,7 @@ public class CarpetExpression
             //CarpetSettings.LOG.error("Custom:");
             //CarpetSettings.LOG.error(FeatureGenerator.featureMap.keySet().stream().map(i -> "`'"+i+"'`").sorted().collect(Collectors.joining(", ")));
 
+            //CarpetSettings.LOG.error(Registry.ENTITY_TYPE.getIds().stream().sorted().map(ValueConversions::simplify).collect(Collectors.joining("`, `")));
             Value res = lv.get(0).evalValue(c);
             CarpetSettings.LOG.error(res.getString());
             return (_c, _t) -> res; // pass through for variables
diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java
index 9ca0f16a..46bc72a6 100644
--- a/src/main/java/carpet/script/value/EntityValue.java
+++ b/src/main/java/carpet/script/value/EntityValue.java
@@ -17,13 +17,13 @@ import carpet.script.exception.InternalExpressionException;
 import com.google.common.collect.ImmutableMap;
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import net.minecraft.entity.SpawnGroup;
 import net.minecraft.entity.ai.brain.Brain;
 import net.minecraft.entity.ai.brain.Memory;
-import net.minecraft.entity.EntityCategory;
 import net.minecraft.entity.EntityGroup;
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.ai.pathing.Path;
-import net.minecraft.entity.projectile.Projectile;
+import net.minecraft.entity.projectile.ProjectileEntity;
 import net.minecraft.nbt.StringTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.packet.s2c.play.EntityPassengersSetS2CPacket;
@@ -218,8 +218,8 @@ public class EntityValue extends Value
         put("living", Pair.of(null, (e) -> e instanceof LivingEntity && e.isAlive()));
         put("!living", Pair.of(null, (e) -> !(e instanceof LivingEntity) && e.isAlive()));
 
-        put("projectile", Pair.of(null, (e) -> e instanceof Projectile && e.isAlive()));
-        put("!projectile", Pair.of(null, (e) -> !(e instanceof Projectile) && e.isAlive()));
+        put("projectile", Pair.of(null, (e) -> e instanceof ProjectileEntity && e.isAlive()));
+        put("!projectile", Pair.of(null, (e) -> !(e instanceof ProjectileEntity) && e.isAlive()));
 
         for (String groupStr : entityGroupMap.keySet())
         {
@@ -234,11 +234,11 @@ public class EntityValue extends Value
             put(    mobType, Pair.of(type, EntityPredicates.VALID_ENTITY));
             put("!"+mobType, Pair.of(null, (e) -> e.getType() != type  && e.isAlive()));
         }
-        for (EntityCategory catId : EntityCategory.values())
+        for (SpawnGroup catId : SpawnGroup.values())
         {
             String catStr = catId.getName();
-            put(    catStr, Pair.of(null, e -> (e.getType().getCategory() == catId) && e.isAlive()));
-            put("!"+catStr, Pair.of(null, e -> (e.getType().getCategory() != catId) && e.isAlive()));
+            put(    catStr, Pair.of(null, e -> (e.getType().getSpawnGroup() == catId) && e.isAlive()));
+            put("!"+catStr, Pair.of(null, e -> (e.getType().getSpawnGroup() != catId) && e.isAlive()));
         }
     }};
     public Value get(String what, Value arg)