diff --git a/src/main/java/com/reider745/Main.java b/src/main/java/com/reider745/Main.java index b19a18a0..9cf9c0d1 100644 --- a/src/main/java/com/reider745/Main.java +++ b/src/main/java/com/reider745/Main.java @@ -64,7 +64,7 @@ public class Main { // bug fix loader.registerHooksInitializationForClass(DimensionsFix.class); - loader.init(); + loader.init(Arrays.stream(args).anyMatch("--debug-hooks"::equals)); loader.run("cn.nukkit.Nukkit", args); } } diff --git a/src/main/java/com/reider745/api/hooks/JarEditor.java b/src/main/java/com/reider745/api/hooks/JarEditor.java index 01f9de02..d2a89e78 100644 --- a/src/main/java/com/reider745/api/hooks/JarEditor.java +++ b/src/main/java/com/reider745/api/hooks/JarEditor.java @@ -98,11 +98,12 @@ public class JarEditor { return this; } - public void init() { + public void init(boolean debug) { ALL_HOOKS.forEach((key, list) -> { - System.out.println("===== " + key + " ====="); + if(debug) + System.out.println("===== " + key + " ====="); list.forEach(data -> addHook(data.className, data.method, data.signature, data.handler, data.typeHook, - data.controller, data.argumentsMap)); + data.controller, data.argumentsMap, debug)); }); } @@ -280,7 +281,7 @@ public class JarEditor { } private void addHook(String className, String method, String signature, Method replaced, TypeHook typeHook, - boolean controller, ArgumentTypes argumentMap) { + boolean controller, ArgumentTypes argumentMap, boolean debug) { try { // String[] argumentTypes = Arguments.parseSignature(sig); @@ -316,7 +317,8 @@ public class JarEditor { } ctmBuffer.getMethodInfo().rebuildStackMap(ClassPool.getDefault()); - System.out.println("Success register hook for " + method + signature + " " + typeHook.name()); + if(debug) + System.out.println("Success register hook for " + method + signature + " " + typeHook.name()); return; } else { signatures.add("" + constructorSignature); @@ -362,7 +364,8 @@ public class JarEditor { } ctmBuffer.getMethodInfo().rebuildStackMap(ClassPool.getDefault()); - System.out.println("Success register hook for " + ctmBuffer.getName() + if(debug) + System.out.println("Success register hook for " + ctmBuffer.getName() + ctmBuffer.getSignature() + " " + typeHook.name()); return; } else { diff --git a/src/main/java/com/reider745/network/InnerCorePacket.java b/src/main/java/com/reider745/network/InnerCorePacket.java index 96cd2816..a360bdb0 100644 --- a/src/main/java/com/reider745/network/InnerCorePacket.java +++ b/src/main/java/com/reider745/network/InnerCorePacket.java @@ -6,7 +6,6 @@ import cn.nukkit.network.protocol.DataPacket; import com.reider745.InnerCoreServer; import com.reider745.api.ClientOnly; import com.zhekasmirnov.apparatus.mcpe.NativeNetworking; -import com.zhekasmirnov.horizon.runtime.logger.Logger; import java.util.*; diff --git a/src/main/resources/zotecore.yml b/src/main/resources/zotecore.yml index cd9137ca..6c046cf3 100644 --- a/src/main/resources/zotecore.yml +++ b/src/main/resources/zotecore.yml @@ -58,4 +58,4 @@ pack-version-code: 158 # Additional information in the log # debug-logger: on -# info-logger: on \ No newline at end of file +info-logger: on \ No newline at end of file