Add way to toggle certain spam logs

KingRainbow44 · Aug 13, 2023 · afc5841 · afc5841
1 parent 70e6d7f
commit afc5841
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 16 deletions.
diff --git a/src/main/java/emu/grasscutter/DebugConstants.java b/src/main/java/emu/grasscutter/DebugConstants.java
@@ -0,0 +1,10 @@
+package emu.grasscutter;
+
+public final class DebugConstants {
+    public static boolean LOG_ABILITIES = false;
+    public static boolean LOG_LUA_SCRIPTS = false;
+
+    private DebugConstants() {
+        // Prevent instantiation.
+    }
+}
diff --git a/src/main/java/emu/grasscutter/game/ability/AbilityManager.java b/src/main/java/emu/grasscutter/game/ability/AbilityManager.java
@@ -1,7 +1,7 @@
 package emu.grasscutter.game.ability;
 
 import com.google.protobuf.*;
-import emu.grasscutter.Grasscutter;
+import emu.grasscutter.*;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.binout.*;
 import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
@@ -19,13 +19,13 @@
 import emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry;
 import emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction;
 import io.netty.util.concurrent.FastThreadLocalThread;
-import java.util.HashMap;
-import java.util.concurrent.*;
 import lombok.Getter;
 import org.reflections.Reflections;
 
-public final class AbilityManager extends BasePlayerManager {
+import java.util.HashMap;
+import java.util.concurrent.*;
 
+public final class AbilityManager extends BasePlayerManager {
     private static final HashMap<AbilityModifierAction.Type, AbilityActionHandler> actionHandlers =
             new HashMap<>();
     private static final HashMap<AbilityMixinData.Type, AbilityMixinHandler> mixinHandlers =
@@ -91,8 +91,11 @@ public void executeAction(
             Ability ability, AbilityModifierAction action, ByteString abilityData, GameEntity target) {
         var handler = actionHandlers.get(action.type);
         if (handler == null || ability == null) {
-            Grasscutter.getLogger()
+            if (DebugConstants.LOG_ABILITIES) {
+                Grasscutter.getLogger()
                     .debug("Could not execute ability action {} at {}", action.type, ability);
+            }
+
             return;
         }
 
@@ -148,7 +151,7 @@ public void onAbilityInvoke(AbilityInvokeEntry invoke) throws Exception {
                             invoke.getArgumentType(),
                             invoke.getArgumentTypeValue(),
                             entity.getId());
-        } else {
+        } else if (DebugConstants.LOG_ABILITIES) {
             Grasscutter.getLogger()
                     .debug(
                             "Invoke type of {} ({}) has no entity. (referring to {})",
@@ -375,7 +378,10 @@ private void handleModifierChange(AbilityInvokeEntry invoke) throws Exception {
 
         var entity = this.player.getScene().getEntityById(invoke.getEntityId());
         if (entity == null) {
-            Grasscutter.getLogger().debug("Entity not found: {}", invoke.getEntityId());
+            if (DebugConstants.LOG_ABILITIES) {
+                Grasscutter.getLogger().debug("Entity not found: {}", invoke.getEntityId());
+            }
+
             return;
         }
 

diff --git a/src/main/java/emu/grasscutter/scripts/data/controller/EntityController.java b/src/main/java/emu/grasscutter/scripts/data/controller/EntityController.java
@@ -1,14 +1,12 @@
 package emu.grasscutter.scripts.data.controller;
 
-import emu.grasscutter.Grasscutter;
+import emu.grasscutter.*;
 import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.game.props.ElementType;
-import emu.grasscutter.scripts.ScriptLib;
-import emu.grasscutter.scripts.ScriptLoader;
-import javax.script.Bindings;
-import javax.script.CompiledScript;
-import org.luaj.vm2.LuaError;
-import org.luaj.vm2.LuaValue;
+import emu.grasscutter.scripts.*;
+import org.luaj.vm2.*;
+
+import javax.script.*;
 
 public class EntityController {
     private transient CompiledScript entityController;
@@ -38,9 +36,11 @@ public void onTimer(GameEntity entity, int now) {
     }
 
     public int onClientExecuteRequest(GameEntity entity, int param1, int param2, int param3) {
-        Grasscutter.getLogger()
+        if (DebugConstants.LOG_LUA_SCRIPTS) {
+            Grasscutter.getLogger()
                 .debug(
-                        "Request on {}, {}: {}", entity.getGroupId(), param1, entity.getPosition().toString());
+                    "Request on {}, {}: {}", entity.getGroupId(), param1, entity.getPosition().toString());
+        }
         LuaValue value =
                 callControllerScriptFunc(
                         entity,