Add toggle mod keybinding

Author: Discusser

common/src/main/java/io/github/discusser/toomanyentities/TooManyEntities.java

@@ -1,11 +1,17 @@
 package io.github.discusser.toomanyentities;
 
+import com.mojang.blaze3d.systems.VertexSorter;
+import dev.architectury.event.events.client.ClientTickEvent;
 import dev.architectury.injectables.annotations.ExpectPlatform;
+import dev.architectury.registry.client.keymappings.KeyMappingRegistry;
 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.minecraft.client.option.KeyBinding;
+import net.minecraft.client.util.InputUtil;
+import net.minecraft.text.Text;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -16,10 +22,31 @@ public final class TooManyEntities {
     public static final Logger LOGGER = LoggerFactory.getLogger("too_many_entities");
     public static final String MODID = "too_many_entities";
     public static final HashMap<String, Integer> entityCounts = new HashMap<>();
+    public static boolean modEnabled = true;
+
 
     public static void init() {
     }
 
+    public static void registerKeyBindings() {
+        KeyBinding KEY_TOGGLE_MOD = new KeyBinding(
+                "key.too_many_entities.toggle_mod",
+                InputUtil.Type.KEYSYM,
+                InputUtil.GLFW_KEY_O,
+                "category.too_many_entities.too_many_entities"
+        );
+        KeyMappingRegistry.register(KEY_TOGGLE_MOD);
+        ClientTickEvent.CLIENT_POST.register(minecraft -> {
+            while (KEY_TOGGLE_MOD.wasPressed()) {
+                modEnabled = !modEnabled;
+                if (minecraft.player != null) {
+                    String key = "text.too_many_entities.mod_" + (modEnabled ? "enabled" : "disabled");
+                    minecraft.player.sendMessage(Text.translatable(key));
+                }
+            }
+        });
+    }
+
     public static void initClient() {
         AutoConfig.register(TooManyEntitiesConfig.class, GsonConfigSerializer::new);
         GuiRegistry registry = AutoConfig.getGuiRegistry(TooManyEntitiesConfig.class);

…xin/client/CommonWorldRendererMixin.java …xin/client/CommonWorldRendererMixin.javaforge/src/main/java/io/github/discusser/toomanyentities/forge/mixin/client/CommonWorldRendererMixin.java renamed to common/src/main/java/io/github/discusser/toomanyentities/mixin/client/CommonWorldRendererMixin.java forge/src/main/java/io/github/discusser/toomanyentities/forge/mixin/client/CommonWorldRendererMixin.java renamed to common/src/main/java/io/github/discusser/toomanyentities/mixin/client/CommonWorldRendererMixin.java

@@ -1,4 +1,4 @@
-package io.github.discusser.toomanyentities.forge.mixin.client;
+package io.github.discusser.toomanyentities.mixin.client;
 
 import com.llamalad7.mixinextras.sugar.Local;
 import io.github.discusser.toomanyentities.TooManyEntities;
@@ -15,10 +15,8 @@ public class CommonWorldRendererMixin {
     @Inject(method = "renderEntity", at = @At(value = "HEAD"), cancellable = true)
     private void beforeEntityRender(CallbackInfo info, @Local(argsOnly = true) Entity entity) {
         String key = entity.getType().getTranslationKey();
-        int maxEntityCount = TooManyEntitiesConfig.instance.applyMaxEntityCountGlobally
-                ? TooManyEntitiesConfig.instance.maxEntityCount
-                : TooManyEntitiesConfig.instance.entityMaxCounts.get(key);
-        if (maxEntityCount > 0 && TooManyEntities.entityCounts.getOrDefault(key, 0) > maxEntityCount) {
+        int maxEntityCount = TooManyEntitiesConfig.instance.applyMaxEntityCountGlobally ? TooManyEntitiesConfig.instance.maxEntityCount : TooManyEntitiesConfig.instance.entityMaxCounts.get(key);
+        if (TooManyEntities.modEnabled && maxEntityCount > 0 && TooManyEntities.entityCounts.getOrDefault(key, 0) > maxEntityCount) {
             info.cancel();
         }
     }

common/src/main/resources/assets/too_many_entities/lang/en_us.json

@@ -9,5 +9,9 @@
   "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.useEntityCulling": "Use Entity Culling",
-  "text.autoconfig.too_many_entities.option.useEntityCulling.@Tooltip": "If this option is enabled, and the mod Entity Culling is installed, the number of entities rendered will be taken from the entity culling mod. This allows you to have more visible entities without necessarily reducing performance. There can be flickering when using this option, so only enable it if you want to."
+  "text.autoconfig.too_many_entities.option.useEntityCulling.@Tooltip": "If this option is enabled, and the mod Entity Culling is installed, the number of entities rendered will be taken from the entity culling mod. This allows you to have more visible entities without necessarily reducing performance. There can be flickering when using this option, so only enable it if you want to.",
+  "key.too_many_entities.toggle_mod": "Toggle Mod",
+  "category.too_many_entities.too_many_entities": "Too Many Entities",
+  "text.too_many_entities.mod_enabled": "Too Many Entities enabled!",
+  "text.too_many_entities.mod_disabled": "Too Many Entities disabled!"
 }

common/src/main/resources/too_many_entities.mixins.json

@@ -5,6 +5,7 @@
   "minVersion": "0.8",
   "plugin": "io.github.discusser.toomanyentities.mixin.TooManyEntitiesMixinPlugin",
   "client": [
+    "client.CommonWorldRendererMixin",
     "client.DebugHudMixin",
     "client.WorldRendererMixin"
   ],

fabric/src/main/java/io/github/discusser/toomanyentities/fabric/TooManyEntitiesClientFabric.java

@@ -7,5 +7,6 @@ public final class TooManyEntitiesClientFabric implements ClientModInitializer {
     @Override
     public void onInitializeClient() {
         TooManyEntities.initClient();
+        TooManyEntities.registerKeyBindings();
     }
 }

fabric/src/main/java/io/github/discusser/toomanyentities/fabric/mixin/client/CommonWorldRendererMixin.java

@@ -31,7 +31,8 @@
     "java": ">=17",
     "architectury": ">=9.2.14",
     "fabric-api": "*",
-    "cloth-config": ">=11.1.118"
+    "cloth-config": ">=11.1.118",
+    "fabric-key-binding-api-v1": "*"
   },
   "recommends": {
     "entityculling": ">=1.6.6",

fabric/src/main/resources/fabric.mod.json

@@ -5,7 +5,6 @@
   "minVersion": "0.8",
   "plugin": "io.github.discusser.toomanyentities.mixin.TooManyEntitiesMixinPlugin",
   "client": [
-    "client.CommonWorldRendererMixin",
     "client.EntityCullingWorldRendererMixin"
   ],
   "injectors": {

fabric/src/main/resources/too_many_entities-fabric.mixins.json

@@ -4,17 +4,23 @@
 import io.github.discusser.toomanyentities.TooManyEntities;
 import io.github.discusser.toomanyentities.config.TooManyEntitiesConfig;
 import me.shedaniel.autoconfig.AutoConfig;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.eventbus.api.EventPriority;
 import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 
 @Mod(TooManyEntities.MODID)
+@Mod.EventBusSubscriber(modid = TooManyEntities.MODID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
 public final class TooManyEntitiesForge {
     public TooManyEntitiesForge() {
         IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
         modEventBus.addListener(this::clientSetup);
+
         EventBuses.registerModEventBus(TooManyEntities.MODID, modEventBus);
 
         TooManyEntities.init();
@@ -25,4 +31,9 @@ private void clientSetup(FMLClientSetupEvent ignoredEvent) {
 
         TooManyEntities.initClient();
     }
+
+    @SubscribeEvent(priority = EventPriority.HIGHEST)
+    public static void registerBindings(RegisterKeyMappingsEvent event) {
+        TooManyEntities.registerKeyBindings();
+    }
 }

forge/src/main/java/io/github/discusser/toomanyentities/forge/TooManyEntitiesForge.java

@@ -5,7 +5,6 @@
   "minVersion": "0.8",
   "plugin": "io.github.discusser.toomanyentities.mixin.TooManyEntitiesMixinPlugin",
   "client": [
-    "client.CommonWorldRendererMixin",
     "client.EntityCullingWorldRendererMixin"
   ],
   "injectors": {