Implement per entity type hiding

Author: Discusser

src/client/java/io/github/discusser/toomanyentities/TooManyEntitiesClient.java

@@ -1,11 +1,13 @@
 package io.github.discusser.toomanyentities;
 
+import com.sun.jna.Native;
 import io.github.discusser.toomanyentities.config.MapGuiProvider;
 import io.github.discusser.toomanyentities.config.TooManyEntitiesConfig;
 import me.shedaniel.autoconfig.AutoConfig;
 import me.shedaniel.autoconfig.gui.registry.GuiRegistry;
 import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
 import net.fabricmc.api.ClientModInitializer;
+import net.minecraft.entity.EntityType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/client/java/io/github/discusser/toomanyentities/config/TooManyEntitiesConfig.java

@@ -17,7 +17,7 @@ public class TooManyEntitiesConfig implements ConfigData {
     public Integer maxEntityCount = 64;
     @ConfigEntry.Category(value = "general")
     @ConfigEntry.Gui.Tooltip()
-    public Boolean applyMaxEntityCountGlobally = true;
+    public Boolean applyMaxEntityCountGlobally = false;
 
     @ConfigEntry.Category(value = "entities")
     public TreeMap<String, Integer> entityMaxCounts = new TreeMap<>(Comparator.naturalOrder());

src/client/java/io/github/discusser/toomanyentities/mixin/client/WorldRendererMixin.java

@@ -1,6 +1,7 @@
 package io.github.discusser.toomanyentities.mixin.client;
 
 import com.llamalad7.mixinextras.sugar.Local;
+import io.github.discusser.toomanyentities.config.TooManyEntitiesConfig;
 import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.entity.Entity;
 import org.spongepowered.asm.mixin.Mixin;
@@ -14,20 +15,23 @@
 @Mixin(WorldRenderer.class)
 public class WorldRendererMixin {
     @Unique
-    private final HashMap<Class<?>, Integer> entityCounts = new HashMap<>();
+    private final HashMap<String, Integer> entityCounts = new HashMap<>();
 
     @Inject(method = "renderEntity", at = @At(value = "HEAD"), cancellable = true)
     private void beforeEntityRender(CallbackInfo info, @Local(argsOnly = true) Entity entity) {
-        int MAX_ENTITY_COUNT = 128;
-        if (entityCounts.getOrDefault(entity.getClass(), 0) > MAX_ENTITY_COUNT) {
+        String key = entity.getType().getTranslationKey();
+        int maxEntityCount = TooManyEntitiesConfig.instance.applyMaxEntityCountGlobally
+                ? TooManyEntitiesConfig.instance.maxEntityCount
+                : TooManyEntitiesConfig.instance.entityMaxCounts.get(key);
+        if (maxEntityCount > 0 && entityCounts.getOrDefault(key, 0) > maxEntityCount) {
             info.cancel();
         }
     }
 
     @Inject(method = "render", at = @At(value = "FIELD", target = "Lnet/minecraft/client/render/WorldRenderer;regularEntityCount:I", ordinal = 1, shift = At.Shift.AFTER))
     private void afterEntityCountIncrement(CallbackInfo info, @Local Entity entity) {
-        Class<? extends Entity> klass = entity.getClass();
-        entityCounts.put(klass, entityCounts.getOrDefault(klass, 0) + 1);
+        String key = entity.getType().getTranslationKey();
+        entityCounts.put(key, entityCounts.getOrDefault(key, 0) + 1);
     }
 
 

src/main/resources/assets/too-many-entities/lang/en_us.json

@@ -5,5 +5,5 @@
   "text.autoconfig.too-many-entities.option.maxEntityCount": "Max Entity Count",
   "text.autoconfig.too-many-entities.option.maxEntityCount.@Tooltip": "The maximum number of entities of a specific type to render. If this is set to 0, the limit is removed",
   "text.autoconfig.too-many-entities.option.applyMaxEntityCountGlobally": "Apply Max Entity Count Globally",
-  "text.autoconfig.too-many-entities.option.applyMaxEntityCountGlobally.@Tooltip": "If this option is enabled, the maximum entity count defined above will be used for every single entity type. If this option is disabled, each entity type will use its own maximum entity count",
+  "text.autoconfig.too-many-entities.option.applyMaxEntityCountGlobally.@Tooltip": "If this option is enabled, the maximum entity count defined above will be used for every single entity type. If this option is disabled, each entity type will use its own maximum entity count"
 }