По умолчанию отключена отладка успешных хуков
This commit is contained in:
@@ -64,7 +64,7 @@ public class Main {
|
|||||||
// bug fix
|
// bug fix
|
||||||
loader.registerHooksInitializationForClass(DimensionsFix.class);
|
loader.registerHooksInitializationForClass(DimensionsFix.class);
|
||||||
|
|
||||||
loader.init();
|
loader.init(Arrays.stream(args).anyMatch("--debug-hooks"::equals));
|
||||||
loader.run("cn.nukkit.Nukkit", args);
|
loader.run("cn.nukkit.Nukkit", args);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -98,11 +98,12 @@ public class JarEditor {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void init() {
|
public void init(boolean debug) {
|
||||||
ALL_HOOKS.forEach((key, list) -> {
|
ALL_HOOKS.forEach((key, list) -> {
|
||||||
|
if(debug)
|
||||||
System.out.println("===== " + key + " =====");
|
System.out.println("===== " + key + " =====");
|
||||||
list.forEach(data -> addHook(data.className, data.method, data.signature, data.handler, data.typeHook,
|
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,
|
private void addHook(String className, String method, String signature, Method replaced, TypeHook typeHook,
|
||||||
boolean controller, ArgumentTypes argumentMap) {
|
boolean controller, ArgumentTypes argumentMap, boolean debug) {
|
||||||
try {
|
try {
|
||||||
// String[] argumentTypes = Arguments.parseSignature(sig);
|
// String[] argumentTypes = Arguments.parseSignature(sig);
|
||||||
|
|
||||||
@@ -316,6 +317,7 @@ public class JarEditor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ctmBuffer.getMethodInfo().rebuildStackMap(ClassPool.getDefault());
|
ctmBuffer.getMethodInfo().rebuildStackMap(ClassPool.getDefault());
|
||||||
|
if(debug)
|
||||||
System.out.println("Success register hook for " + method + signature + " " + typeHook.name());
|
System.out.println("Success register hook for " + method + signature + " " + typeHook.name());
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
@@ -362,6 +364,7 @@ public class JarEditor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ctmBuffer.getMethodInfo().rebuildStackMap(ClassPool.getDefault());
|
ctmBuffer.getMethodInfo().rebuildStackMap(ClassPool.getDefault());
|
||||||
|
if(debug)
|
||||||
System.out.println("Success register hook for " + ctmBuffer.getName()
|
System.out.println("Success register hook for " + ctmBuffer.getName()
|
||||||
+ ctmBuffer.getSignature() + " " + typeHook.name());
|
+ ctmBuffer.getSignature() + " " + typeHook.name());
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import cn.nukkit.network.protocol.DataPacket;
|
|||||||
import com.reider745.InnerCoreServer;
|
import com.reider745.InnerCoreServer;
|
||||||
import com.reider745.api.ClientOnly;
|
import com.reider745.api.ClientOnly;
|
||||||
import com.zhekasmirnov.apparatus.mcpe.NativeNetworking;
|
import com.zhekasmirnov.apparatus.mcpe.NativeNetworking;
|
||||||
import com.zhekasmirnov.horizon.runtime.logger.Logger;
|
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
|
|||||||
@@ -58,4 +58,4 @@ pack-version-code: 158
|
|||||||
|
|
||||||
# Additional information in the log
|
# Additional information in the log
|
||||||
# debug-logger: on
|
# debug-logger: on
|
||||||
# info-logger: on
|
info-logger: on
|
||||||
Reference in New Issue
Block a user