diff options
Diffstat (limited to 'src/Java/gtPlusPlus/api')
4 files changed, 143 insertions, 10 deletions
diff --git a/src/Java/gtPlusPlus/api/analytics/AnalyticsLoggingPlugin.java b/src/Java/gtPlusPlus/api/analytics/AnalyticsLoggingPlugin.java index ff7d050a9e..2423eaa65c 100644 --- a/src/Java/gtPlusPlus/api/analytics/AnalyticsLoggingPlugin.java +++ b/src/Java/gtPlusPlus/api/analytics/AnalyticsLoggingPlugin.java @@ -6,7 +6,7 @@ import com.segment.analytics.Log; import com.segment.analytics.Plugin; import com.segment.analytics.messages.Message; -import gtPlusPlus.core.util.Utils; +import gtPlusPlus.api.objects.Logger; /** * A {@link Plugin} implementation that redirects client logs to standard output and logs callback @@ -16,22 +16,22 @@ public class AnalyticsLoggingPlugin implements Plugin { @Override public void configure(Analytics.Builder builder) { builder.log(new Log() { @Override public void print(Level level, String format, Object... args) { - Utils.LOG_WARNING(level + ":\t" + String.format(format, args)); + Logger.WARNING(level + ":\t" + String.format(format, args)); } @Override public void print(Level level, Throwable error, String format, Object... args) { - Utils.LOG_WARNING(level + ":\t" + String.format(format, args)); + Logger.WARNING(level + ":\t" + String.format(format, args)); //Utils.LOG_WARNING(error); } }); builder.callback(new Callback() { @Override public void success(Message message) { - Utils.LOG_WARNING("Uploaded " + message); + Logger.WARNING("Uploaded " + message); } @Override public void failure(Message message, Throwable throwable) { - Utils.LOG_WARNING("Could not upload " + message); + Logger.WARNING("Could not upload " + message); //Utils.LOG_WARNING(throwable); } }); diff --git a/src/Java/gtPlusPlus/api/analytics/SegmentAnalytics.java b/src/Java/gtPlusPlus/api/analytics/SegmentAnalytics.java index cdd38fd374..c4ef82b9ef 100644 --- a/src/Java/gtPlusPlus/api/analytics/SegmentAnalytics.java +++ b/src/Java/gtPlusPlus/api/analytics/SegmentAnalytics.java @@ -10,6 +10,8 @@ import java.util.concurrent.Phaser; import com.mojang.authlib.GameProfile; import com.segment.analytics.Analytics; + +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.Utils; @@ -212,7 +214,7 @@ public class SegmentAnalytics { // Non-Dev Comments public static void LOG(final String s) { if (CORE.DEBUG){ - Utils.getLogger().info("[Analytics] "+s); + Logger.getLogger().info("[Analytics] "+s); } } diff --git a/src/Java/gtPlusPlus/api/objects/CSPRNG.java b/src/Java/gtPlusPlus/api/objects/CSPRNG.java index 6b78eaccfc..e55a650b67 100644 --- a/src/Java/gtPlusPlus/api/objects/CSPRNG.java +++ b/src/Java/gtPlusPlus/api/objects/CSPRNG.java @@ -34,14 +34,13 @@ */ package gtPlusPlus.api.objects; +import java.math.BigInteger; +import java.security.SecureRandom; import java.util.Random; import gtPlusPlus.api.interfaces.IRandomGenerator; import gtPlusPlus.core.util.Utils; -import java.security.SecureRandom; -import java.math.BigInteger; - /** * The Blum-Blum-Shub random number generator. * @@ -205,7 +204,8 @@ public class CSPRNG extends Random implements IRandomGenerator { * * @return int */ - public int next(int numBits) { + @Override + public int next(int numBits) { // TODO: find out how many LSB one can extract per cycle. // it is more than one. int result = 0; diff --git a/src/Java/gtPlusPlus/api/objects/Logger.java b/src/Java/gtPlusPlus/api/objects/Logger.java new file mode 100644 index 0000000000..44657d337a --- /dev/null +++ b/src/Java/gtPlusPlus/api/objects/Logger.java @@ -0,0 +1,131 @@ +package gtPlusPlus.api.objects; + +import org.apache.logging.log4j.LogManager; + +import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.relauncher.FMLRelaunchLog; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.proxy.ClientProxy; + +public class Logger { + + // Logging Functions + public static final org.apache.logging.log4j.Logger modLogger = Logger.makeLogger(); + + // Generate GT++ Logger + public static org.apache.logging.log4j.Logger makeLogger() { + final org.apache.logging.log4j.Logger gtPlusPlusLogger = LogManager.getLogger("GT++"); + return gtPlusPlusLogger; + } + + public static final org.apache.logging.log4j.Logger getLogger(){ + return modLogger; + } + + // Non-Dev Comments + public static void INFO(final String s) { + modLogger.info(s); + } + + // Non-Dev Comments + public static void MACHINE_INFO(final String s) { + + boolean localPlayer = false; + try { + if (ClientProxy.playerName != null){ + if (ClientProxy.playerName.toLowerCase().contains("draknyte1")){ + localPlayer = true; + } + } + } + catch (final Throwable t){ + + } + + if (CORE.ConfigSwitches.MACHINE_INFO || localPlayer) { + final String name1 = gtPlusPlus.core.util.reflect.ReflectionUtils.getMethodName(2); + modLogger.info("Machine Info: " + s + " | " + name1); + } + } + + // Developer Comments + public static void WARNING(final String s) { + if (CORE.DEBUG) { + modLogger.warn(s); + } + } + + // Errors + public static void ERROR(final String s) { + if (CORE.DEBUG) { + modLogger.fatal(s); + } + } + + // Developer Logger + public static void SPECIFIC_WARNING(final String whatToLog, final String msg, final int line) { + // if (!CORE.DEBUG){ + FMLLog.warning("GT++ |" + line + "| " + whatToLog + " | " + msg); + // } + } + + // ASM Comments + public static void LOG_ASM(final String s) { + FMLRelaunchLog.info("", s); + } + + + + + + + + + + + /** + * Special Loggers + */ + + /** + * Special Logger for Bee related content + */ + public static void BEES(final String s) { + modLogger.info("[Bees] "+s); + } + /** + * Special Logger for Debugging Bee related content + */ + public static void DEBUG_BEES(final String s) { + if (CORE.DEVENV || CORE.DEBUG) + modLogger.info("[Debug][Bees] "+s); + } + + + + /** + * Special Logger for Materials related content + */ + public static void MATERIALS(final String s) { + modLogger.info("[Materials] "+s); + } + /** + * Special Logger for Debugging Materials related content + */ + public static void DEBUG_MATERIALS(final String s) { + if (CORE.DEVENV || CORE.DEBUG) + modLogger.info("[Debug][Materials] "+s); + } + + /** + * Special Logger for Bee related content + */ + public static void REFLECTION(final String s) { + if (CORE.DEVENV || CORE.DEBUG) + modLogger.info("[Reflection] "+s); + } + + + + +} |