lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Logging for plugin gathering

Browse source 
Moved spammy API stuff to a separate logger
This commit is contained in:
Nicholas Ignoffo 2018-02-17 09:48:17 -08:00
parent f49e661eb6
commit f89b5a005a
7 changed files with 50 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/WayofTime/bloodmagic/util/BMLog.java
View file

@ -26,6 +26,12 @@ public enum BMLog {
return ConfigHandler.general.enableAPILogging;
}
},
API_VERBOSE() {
@Override
boolean enabled() {
return ConfigHandler.general.enableVerboseAPILogging;
}
},
;
private final Logger logger;

31
src/main/java/WayofTime/bloodmagic/util/PluginUtil.java
View file

@ -2,7 +2,9 @@ package WayofTime.bloodmagic.util;
import WayofTime.bloodmagic.api.BloodMagicPlugin;
import WayofTime.bloodmagic.api.IBloodMagicPlugin;
import WayofTime.bloodmagic.api.impl.BloodMagicAPI;
import WayofTime.bloodmagic.api.impl.BloodMagicCorePlugin;
import com.google.common.base.Stopwatch;
import com.google.common.collect.Lists;
import net.minecraftforge.fml.common.discovery.ASMDataTable;
import org.apache.commons.lang3.tuple.Pair;
@ -15,7 +17,8 @@ public class PluginUtil {
@SuppressWarnings("unchecked")
@Nonnull
public static List<Pair<IBloodMagicPlugin, BloodMagicPlugin>> getPlugins(ASMDataTable dataTable) {
public static List<Pair<IBloodMagicPlugin, BloodMagicPlugin>> gatherPlugins(ASMDataTable dataTable) {
Stopwatch stopwatch = Stopwatch.createStarted();
List<Pair<IBloodMagicPlugin, BloodMagicPlugin>> discoveredAnnotations = Lists.newArrayList();
Set<ASMDataTable.ASMData> discoveredPlugins = dataTable.getAll(BloodMagicPlugin.class.getCanonicalName());
@ -26,6 +29,7 @@ public class PluginUtil {
IBloodMagicPlugin instance = pluginClass.newInstance();
BMLog.API.info("Discovered plugin at {}", data.getClassName());
discoveredAnnotations.add(Pair.of(instance, pluginClass.getAnnotation(BloodMagicPlugin.class)));
} catch (Exception e) {
e.printStackTrace();
@ -33,7 +37,30 @@ public class PluginUtil {
}
// Bring core plugin up to top
discoveredAnnotations.sort((o1, o2) -> o1.getLeft().getClass() == BloodMagicCorePlugin.class ? 1 : 0);
discoveredAnnotations.sort((o1, o2) -> {
if (o1.getLeft().getClass() == BloodMagicCorePlugin.class)
return -1;
return o1.getClass().getCanonicalName().compareToIgnoreCase(o2.getClass().getCanonicalName());
});
BMLog.API.info("Discovered {} potential plugin(s) in {}", discoveredAnnotations.size(), stopwatch.stop());
return discoveredAnnotations;
}
public static void registerPlugins(List<Pair<IBloodMagicPlugin, BloodMagicPlugin>> plugins) {
Stopwatch total = Stopwatch.createStarted();
int errors = 0;
for (Pair<IBloodMagicPlugin, BloodMagicPlugin> plugin : plugins) {
Stopwatch per = Stopwatch.createStarted();
try {
plugin.getLeft().register(BloodMagicAPI.INSTANCE);
} catch (Exception e) {
errors++;
BMLog.DEFAULT.error("Error loading plugin at {}: {}: {}", plugin.getLeft().getClass(), e.getClass().getSimpleName(), e.getMessage());
}
BMLog.API.info("Registered plugin at {} in {}", plugin.getLeft().getClass(), per.stop());
}
BMLog.API.info("Registered {} plugins with {} errors in {}", plugins.size() - errors, errors, total.stop());
}
}