Add mob spawn category overrides

Author: Malfrador

papyrus-server/minecraft-patches/sources/net/minecraft/server/level/ChunkMap.java.patch

@@ -0,0 +1,20 @@
+--- a/net/minecraft/server/level/ChunkMap.java
++++ b/net/minecraft/server/level/ChunkMap.java
+@@ -249,7 +_,16 @@
+             return;
+         }
+ 
+-        final int index = entity.getType().getCategory().ordinal();
++        // Papyrus start
++        net.minecraft.world.entity.MobCategory category = entity.getType().getCategory();
++        if (entity instanceof de.erethon.papyrus.entities.MobSpawnCategoryOverrideProvider custom) {
++            category = custom.getEffectiveMobCategory();
++        }
++        if (category == net.minecraft.world.entity.MobCategory.MISC) {
++            return;
++        }
++        final int index = category.ordinal();
++        // Papyrus end
+         final ca.spottedleaf.moonrise.common.list.ReferenceList<ServerPlayer> inRange =
+             this.level.moonrise$getNearbyPlayers().getPlayers(entity.chunkPosition(), ca.spottedleaf.moonrise.common.misc.NearbyPlayers.NearbyMapType.TICK_VIEW_DISTANCE);
+         if (inRange == null) {

papyrus-server/minecraft-patches/sources/net/minecraft/world/level/NaturalSpawner.java.patch

@@ -10,6 +10,19 @@
  import it.unimi.dsi.fastutil.objects.Object2IntMap;
  import it.unimi.dsi.fastutil.objects.Object2IntMaps;
  import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
+@@ -79,7 +_,11 @@
+ 
+         for (Entity entity : entities) {
+             if (!(entity instanceof Mob mob && (mob.isPersistenceRequired() || mob.requiresCustomPersistence()))) {
+-                MobCategory category = entity.getType().getCategory();
++                // Papyrus start
++                final MobCategory category = (entity instanceof de.erethon.papyrus.entities.MobSpawnCategoryOverrideProvider custom)
++                ? custom.getEffectiveMobCategory()
++                : entity.getType().getCategory();
++                // Papyrus end
+                 if (category != MobCategory.MISC) {
+                     // Paper start - Only count natural spawns
+                     if (!entity.level().paperConfig().entities.spawning.countAllMobsForSpawning &&
 @@ -235,9 +_,21 @@
          spawnCategoryForPosition(category, level, chunk, pos, filter, callback, Integer.MAX_VALUE, null);
      }
@@ -64,3 +77,16 @@
      }
 
      public static boolean isInNetherFortressBounds(BlockPos pos, ServerLevel level, MobCategory category, StructureManager structureManager) {
+@@ -626,7 +_,11 @@
+             }
+ 
+             this.spawnPotential.addCharge(blockPos, d);
+-            MobCategory category = type.getCategory();
++            // Papyrus start
++            final MobCategory category = (mob instanceof de.erethon.papyrus.entities.MobSpawnCategoryOverrideProvider custom)
++                    ? custom.getEffectiveMobCategory()
++                    : mob.getType().getCategory();
++            // Papyrus end
+             this.mobCategoryCounts.addTo(category, 1);
+             if (this.localMobCapCalculator != null) this.localMobCapCalculator.addMob(new ChunkPos(blockPos), category); // Paper - Optional per player mob spawns
+         }

papyrus-server/src/main/java/de/erethon/papyrus/entities/MobSpawnCategoryOverrideProvider.java

@@ -0,0 +1,11 @@
+package de.erethon.papyrus.entities;
+
+import net.minecraft.world.entity.MobCategory;
+
+public interface MobSpawnCategoryOverrideProvider {
+
+    /**
+     * @return The MobCategory this entity should count towards for mob caps.
+     */
+    MobCategory getEffectiveMobCategory();
+}