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

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
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/WayofTime/bloodmagic/BloodMagic.java
View file

@ -2,7 +2,6 @@ package WayofTime.bloodmagic;
import WayofTime.bloodmagic.api.BloodMagicPlugin;
import WayofTime.bloodmagic.api.IBloodMagicPlugin;
import WayofTime.bloodmagic.api.impl.BloodMagicAPI;
import WayofTime.bloodmagic.core.registry.OrbRegistry;
import WayofTime.bloodmagic.core.registry.RitualRegistry;
import WayofTime.bloodmagic.util.helper.LogHelper;
@ -73,7 +72,7 @@ public class BloodMagic {
public void preInit(FMLPreInitializationEvent event) {
configDir = new File(event.getModConfigurationDirectory(), "bloodmagic");
PLUGINS.addAll(PluginUtil.getPlugins(event.getAsmData()));
PLUGINS.addAll(PluginUtil.gatherPlugins(event.getAsmData()));
ModTranquilityHandlers.init();
ModDungeons.init();
@ -84,8 +83,8 @@ public class BloodMagic {
@Mod.EventHandler
public void init(FMLInitializationEvent event) {
BloodMagicPacketHandler.init();
for (Pair<IBloodMagicPlugin, BloodMagicPlugin> plugin : PLUGINS)
plugin.getLeft().register(BloodMagicAPI.INSTANCE);
PluginUtil.registerPlugins(PLUGINS);
ModRecipes.init();
ModRituals.initRituals();

4
src/main/java/WayofTime/bloodmagic/ConfigHandler.java
View file

@ -35,8 +35,10 @@ public class ConfigHandler {
public static class ConfigGeneral {
@Config.Comment({"Enables extra information to be printed to the log.", "Warning: May drastically increase log size."})
public boolean enableDebugLogging = false;
@Config.Comment({"Enables extra information to be printed to the log.", "Warning: May drastically increase log size."})
@Config.Comment({"Enables extra information to be printed to the log."})
public boolean enableAPILogging = false;
@Config.Comment({"Enables extra information to be printed to the log.", "Warning: May drastically increase log size."})
public boolean enableVerboseAPILogging = false;
}
public static class ConfigBlacklist {

2
src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java
View file

@ -55,7 +55,7 @@ public class BloodMagicAPI implements IBloodMagicAPI {
}
if (component != null) {
BMLog.API.info("Registered {} as a {} altar component.", state, componentType);
BMLog.API_VERBOSE.info("Registered {} as a {} altar component.", state, componentType);
altarComponents.put(component, state);
} else BMLog.API.warn("Invalid Altar component type: {}.", componentType);
}

10
src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java
View file

@ -30,7 +30,7 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist {
@Override
public void addTeleposer(@Nonnull IBlockState state) {
if (!teleposer.contains(state)) {
BMLog.API.info("Blacklist: Added {} to the Teleposer blacklist.", state);
BMLog.API_VERBOSE.info("Blacklist: Added {} to the Teleposer blacklist.", state);
teleposer.add(state);
}
}
@ -43,7 +43,7 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist {
@Override
public void addTeleposer(@Nonnull ResourceLocation entityId) {
if (!teleposerEntities.contains(entityId)) {
BMLog.API.info("Blacklist: Added {} to the Teleposer blacklist.", entityId);
BMLog.API_VERBOSE.info("Blacklist: Added {} to the Teleposer blacklist.", entityId);
teleposerEntities.add(entityId);
}
}
@ -51,7 +51,7 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist {
@Override
public void addTransposition(@Nonnull IBlockState state) {
if (!transposition.contains(state)) {
BMLog.API.info("Blacklist: Added {} to the Transposition blacklist.", state);
BMLog.API_VERBOSE.info("Blacklist: Added {} to the Transposition blacklist.", state);
transposition.add(state);
}
}
@ -64,7 +64,7 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist {
@Override
public void addGreenGrove(@Nonnull IBlockState state) {
if (!greenGrove.contains(state)) {
BMLog.API.info("Blacklist: Added {} to the Green Grove blacklist.", state);
BMLog.API_VERBOSE.info("Blacklist: Added {} to the Green Grove blacklist.", state);
greenGrove.add(state);
}
}
@ -77,7 +77,7 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist {
@Override
public void addWellOfSuffering(@Nonnull ResourceLocation entityId) {
if (!sacrifice.contains(entityId)) {
BMLog.API.info("Blacklist: Added {} to the Well of Suffering blacklist.", entityId);
BMLog.API_VERBOSE.info("Blacklist: Added {} to the Well of Suffering blacklist.", entityId);
sacrifice.add(entityId);
}
}

6
src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicValueManager.java
View file

@ -25,7 +25,7 @@ public class BloodMagicValueManager implements IBloodMagicValueManager {
@Override
public void setSacrificialValue(@Nonnull ResourceLocation entityId, int value) {
BMLog.API.info("Value Manager: Set sacrificial value of {} to {}.", entityId, value);
BMLog.API_VERBOSE.info("Value Manager: Set sacrificial value of {} to {}.", entityId, value);
sacrificial.put(entityId, value);
}
@ -40,14 +40,14 @@ public class BloodMagicValueManager implements IBloodMagicValueManager {
}
if (tranquility != null) {
BMLog.API.info("Value Manager: Set tranquility value of {} to {} @ {}", state, tranquilityType, value);
BMLog.API_VERBOSE.info("Value Manager: Set tranquility value of {} to {} @ {}", state, tranquilityType, value);
this.tranquility.put(state, new TranquilityStack(tranquility, value));
} else BMLog.API.warn("Invalid tranquility type: {}.", tranquilityType);
}
public void setTranquility(Block block, TranquilityStack tranquilityStack) {
for (IBlockState state : block.getBlockState().getValidStates()) {
BMLog.API.info("Value Manager: Set tranquility value of {} to {} @ {}", state, tranquilityStack.type, tranquilityStack.value);
BMLog.API_VERBOSE.info("Value Manager: Set tranquility value of {} to {} @ {}", state, tranquilityStack.type, tranquilityStack.value);
tranquility.put(state, tranquilityStack);
}
}

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());
}
}