Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-10-04 17:37:55 +02:00
Code Issues Projects Releases Wiki Activity

Let's not debug log these.

Browse Source 
Perhaps later there will be extra settings and an extra log file for
registry/setup related output, while real errors would still be logged
to file/console.
This commit is contained in:
asofold 2016-06-13 11:05:28 +02:00
parent 94ff2c1c72
commit 8ae36791a9
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/compat/AttributeAccessFactory.java
View File

@ -38,7 +38,7 @@ public class AttributeAccessFactory {
"fr.neatmonster.nocheatplus.compat.cb2794.AttributeAccess" "fr.neatmonster.nocheatplus.compat.cb2794.AttributeAccess"
}, fallBackDedicated, new String[] { }, fallBackDedicated, new String[] {
"fr.neatmonster.nocheatplus.compat.cbreflect.reflect.ReflectAttributeAccess" // Legacy "fr.neatmonster.nocheatplus.compat.cbreflect.reflect.ReflectAttributeAccess" // Legacy
}, fallBackReflect, IAttributeAccess.class, config); }, fallBackReflect, IAttributeAccess.class, config, false);
} }
} }

2
NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/compat/EntityAccessFactory.java
View File

@ -44,7 +44,7 @@ public class EntityAccessFactory {
"fr.neatmonster.nocheatplus.compat.spigotcb1_9_R1.EntityAccessLastPositionAndLook", "fr.neatmonster.nocheatplus.compat.spigotcb1_9_R1.EntityAccessLastPositionAndLook",
}, new String[] { }, new String[] {
"fr.neatmonster.nocheatplus.compat.cbreflect.reflect.ReflectEntityLastPositionAndLook", "fr.neatmonster.nocheatplus.compat.cbreflect.reflect.ReflectEntityLastPositionAndLook",
}, IEntityAccessLastPositionAndLook.class, config); }, IEntityAccessLastPositionAndLook.class, config, false);
} }
} }

24
NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/compat/RegistryHelper.java
View File

@ -8,14 +8,18 @@ public class RegistryHelper {
/** /**
* Set up a generic instance, according to settings. On success it will be * Set up a generic instance, according to settings. On success it will be
* registered with the default GenericInstanceRegistry (NoCheatPlusAPI). * registered with the default GenericInstanceRegistry (NoCheatPlusAPI).
*
* @param cbDedicatedNames * @param cbDedicatedNames
* @param cbReflectNames * @param cbReflectNames
* @param registerFor * @param registerFor
* @param config * @param config
* @param logDebug
* If true, exceptions for failed instantiation attempts will be
* logged.
* @return * @return
*/ */
public static <T> T setupGenericInstance(String[] cbDedicatedNames, String[] cbReflectNames, Class<T> registerFor, MCAccessConfig config) { public static <T> T setupGenericInstance(String[] cbDedicatedNames, String[] cbReflectNames, Class<T> registerFor, MCAccessConfig config, boolean logDebug) {
return setupGenericInstance(cbDedicatedNames, cbReflectNames, null, registerFor, config); return setupGenericInstance(cbDedicatedNames, cbReflectNames, null, registerFor, config, logDebug);
} }
/** /**
@ -31,11 +35,14 @@ public class RegistryHelper {
* @param fallBackInstance * @param fallBackInstance
* Use this as a fall back, in case none of the classes could be * Use this as a fall back, in case none of the classes could be
* instantiated. * instantiated.
* @param logDebug
* If true, exceptions for failed instantiation attempts will be
* logged.
* @return * @return
*/ */
public static <T> T setupGenericInstance(String[] cbDedicatedNames, String[] cbReflectNames, public static <T> T setupGenericInstance(String[] cbDedicatedNames, String[] cbReflectNames,
T fallBackInstance, Class<T> registerFor, MCAccessConfig config) { T fallBackInstance, Class<T> registerFor, MCAccessConfig config, boolean logDebug) {
return setupGenericInstance(cbDedicatedNames, null, cbReflectNames, fallBackInstance, registerFor, config); return setupGenericInstance(cbDedicatedNames, null, cbReflectNames, fallBackInstance, registerFor, config, logDebug);
} }
/** /**
@ -56,16 +63,19 @@ public class RegistryHelper {
* modules are deactivated. * modules are deactivated.
* @param registerFor * @param registerFor
* @param config * @param config
* @param logDebug
* If true, exceptions for failed instantiation attempts will be
* logged.
* @return * @return
*/ */
public static <T> T setupGenericInstance(String[] cbDedicatedNames, T fallBackDedicatedInstance, public static <T> T setupGenericInstance(String[] cbDedicatedNames, T fallBackDedicatedInstance,
String[] cbReflectNames, T fallBackReflectInstance, String[] cbReflectNames, T fallBackReflectInstance,
Class<T> registerFor, MCAccessConfig config) { Class<T> registerFor, MCAccessConfig config, boolean logDebug) {
T res = null; T res = null;
// Reference by class name (dedicated/native access). // Reference by class name (dedicated/native access).
if (config.enableCBDedicated && cbDedicatedNames != null) { if (config.enableCBDedicated && cbDedicatedNames != null) {
res = getFirstAvailable(cbDedicatedNames, registerFor, true); res = getFirstAvailable(cbDedicatedNames, registerFor, logDebug);
} }
// Fall back (after dedicated/native). // Fall back (after dedicated/native).
@ -75,7 +85,7 @@ public class RegistryHelper {
// Reflection based. // Reflection based.
if (res == null && config.enableCBReflect && cbReflectNames != null) { if (res == null && config.enableCBReflect && cbReflectNames != null) {
res = getFirstAvailable(cbReflectNames, registerFor, true); res = getFirstAvailable(cbReflectNames, registerFor, logDebug);
} }
// Fall back (after reflection). // Fall back (after reflection).