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

Fully remove old LogHelper usage

Browse source
This commit is contained in:
Nicholas Ignoffo 2018-03-17 17:18:20 -07:00
parent 924dc7b38d
commit 77e5beb9e1
11 changed files with 14 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/WayofTime/bloodmagic/util/PleaseStopUsingMe.java
View file

@ -1,6 +1,5 @@
package WayofTime.bloodmagic.util;
import WayofTime.bloodmagic.util.helper.LogHelper;
import net.minecraft.util.DamageSource;
/**
@ -13,7 +12,5 @@ import net.minecraft.util.DamageSource;
public class PleaseStopUsingMe {
public static boolean loggingEnabled;
public static LogHelper logger = new LogHelper("BloodMagic|API");
public static DamageSource damageSource = new DamageSourceBloodMagic();
}

9
src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java
View file

@ -2,6 +2,7 @@ package WayofTime.bloodmagic.util.handler.event;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.ConfigHandler;
import WayofTime.bloodmagic.util.BMLog;
import WayofTime.bloodmagic.util.Constants;
import WayofTime.bloodmagic.ritual.RitualRegistry;
import WayofTime.bloodmagic.ritual.Ritual;
@ -211,10 +212,10 @@ public class ClientHandler {
missingVariants.removeAll(missing);
if (errored.size() > 0)
BloodMagic.instance.logger.info("Suppressed {} model errors from Blood Magic.", errored.size());
BMLog.DEBUG.info("Suppressed {} model errors from Blood Magic.", errored.size());
if (missing.size() > 0)
BloodMagic.instance.logger.info("Suppressed {} variant errors from Blood Magic.", missing.size());
BloodMagic.instance.logger.debug("Suppressed discovered model/variant errors in {}", stopwatch.stop());
BMLog.DEBUG.info("Suppressed {} variant errors from Blood Magic.", missing.size());
BMLog.DEBUG.info("Suppressed discovered model/variant errors in {}", stopwatch.stop());
}
// For some reason, we need some bad textures to be listed in the Crystal and Node models. This will hide that from the end user.
@ -247,7 +248,7 @@ public class ClientHandler {
missingTextures.keySet().remove(mc);
badTextureDomains.remove(mc);
}
BloodMagic.instance.logger.debug("Suppressed required texture errors in {}", stopwatch.stop());
BMLog.DEBUG.info("Suppressed required texture errors in {}", stopwatch.stop());
}
private static void renderRitualStones(EntityPlayerSP player, float partialTicks) {

36
src/main/java/WayofTime/bloodmagic/util/helper/LogHelper.java
View file

@ -1,36 +0,0 @@
package WayofTime.bloodmagic.util.helper;
import WayofTime.bloodmagic.util.PleaseStopUsingMe;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
public class LogHelper {
private Logger logger;
public LogHelper(String logger) {
this.logger = LogManager.getLogger(logger);
}
public void info(String info, Object... format) {
if (PleaseStopUsingMe.loggingEnabled)
logger.info(info, format);
}
public void error(String error, Object... format) {
if (PleaseStopUsingMe.loggingEnabled)
logger.error(error, format);
}
public void debug(String debug, Object... format) {
if (PleaseStopUsingMe.loggingEnabled)
logger.debug(debug, format);
}
public void fatal(String fatal, Object... format) {
logger.error(fatal, format);
}
public Logger getLogger() {
return logger;
}
}