wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace isLessSpecificThan with helper function (for 1.7.10)

Browse Source
This commit is contained in:
Fabian Maurer
2025-09-19 13:30:46 +02:00
parent a565e7d906
commit 361d251aa2
3 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/logging/ConfigBasedLogger.java
+8 -3
View File
@@ -62,6 +62,11 @@ public class ConfigBasedLogger
loggers.add(new WeakReference<>(this));
}
private static boolean isLessSpecificThan(Level _this, Level other)
{
return _this.intLevel() >= other.intLevel();
}
private String _throwableToDetailString(Throwable t)
{
StringBuilder sb = new StringBuilder();
@@ -95,16 +100,16 @@ public class ConfigBasedLogger
: this.logger.getMessageFactory().newMessage("{}", str);
String msgStr = msg.getFormattedMessage();
if (mode.levelForFile.isLessSpecificThan(level))
if (isLessSpecificThan(mode.levelForFile, level))
{
Level logLevel = level.isLessSpecificThan(Level.INFO) ? Level.INFO : level;
Level logLevel = isLessSpecificThan(level, Level.INFO) ? Level.INFO : level;
if (param.length > 0 && param[param.length - 1] instanceof Throwable)
logger.log(logLevel, msgStr, (Throwable) param[param.length - 1]);
else
logger.log(logLevel, msgStr);
}
if (MC != null && mode.levelForChat.isLessSpecificThan(level))
if (MC != null && isLessSpecificThan(mode.levelForChat, level))
{
if (param.length > 0 && param[param.length - 1] instanceof Throwable)
MC.logToChat(level, msgStr + "\n" +
core/src/main/java/com/seibel/distanthorizons/core/logging/ConfigBasedSpamLogger.java
+11 -6
View File
@@ -67,6 +67,11 @@ public class ConfigBasedSpamLogger
loggers.add(new WeakReference<>(this));
}
private static boolean isLessSpecificThan(Level _this, Level other)
{
return _this.intLevel() >= other.intLevel();
}
public void reset()
{
logTries.set(0);
@@ -105,15 +110,15 @@ public class ConfigBasedSpamLogger
Message msg = logger.getMessageFactory().newMessage(str, param);
String msgStr = msg.getFormattedMessage();
if (mode.levelForFile.isLessSpecificThan(level))
if (isLessSpecificThan(mode.levelForFile, level))
{
Level logLevel = level.isLessSpecificThan(Level.INFO) ? Level.INFO : level;
Level logLevel = isLessSpecificThan(level, Level.INFO) ? Level.INFO : level;
if (param.length > 0 && param[param.length - 1] instanceof Throwable)
logger.log(logLevel, msgStr, (Throwable) param[param.length - 1]);
else
logger.log(logLevel, msgStr);
}
if (mode.levelForChat.isLessSpecificThan(level))
if (isLessSpecificThan(mode.levelForChat, level))
{
if (param.length > 0 && param[param.length - 1] instanceof Throwable)
MC.logToChat(level, msgStr + "\n" +
@@ -160,15 +165,15 @@ public class ConfigBasedSpamLogger
Message msg = logger.getMessageFactory().newMessage(str, param);
String msgStr = msg.getFormattedMessage();
if (mode.levelForFile.isLessSpecificThan(level))
if (isLessSpecificThan(mode.levelForFile, level))
{
Level logLevel = level.isLessSpecificThan(Level.INFO) ? Level.INFO : level;
Level logLevel = isLessSpecificThan(level, Level.INFO) ? Level.INFO : level;
if (param.length > 0 && param[param.length - 1] instanceof Throwable)
logger.log(logLevel, msgStr, (Throwable) param[param.length - 1]);
else
logger.log(logLevel, msgStr);
}
if (mode.levelForChat.isLessSpecificThan(level))
if (isLessSpecificThan(mode.levelForChat, level))
{
if (param.length > 0 && param[param.length - 1] instanceof Throwable)
MC.logToChat(level, msgStr + "\n" +
core/src/main/java/com/seibel/distanthorizons/core/logging/SpamReducedLogger.java
+7 -2
View File
@@ -56,6 +56,11 @@ public class SpamReducedLogger
loggers.add(new WeakReference<SpamReducedLogger>(this));
}
private static boolean isLessSpecificThan(Level _this, Level other)
{
return _this.intLevel() >= other.intLevel();
}
public void reset()
{
logTries.set(0);
@@ -70,7 +75,7 @@ public class SpamReducedLogger
{
if (logTries.get() >= maxLogCount)
return;
LOGGER.log(level.isLessSpecificThan(Level.INFO) ? Level.INFO : level, str, param);
LOGGER.log(isLessSpecificThan(level, Level.INFO) ? Level.INFO : level, str, param);
}
public void error(String str, Object... param)
@@ -107,7 +112,7 @@ public class SpamReducedLogger
{
if (logTries.getAndIncrement() >= maxLogCount)
return;
LOGGER.log(level.isLessSpecificThan(Level.INFO) ? Level.INFO : level, str, param);
LOGGER.log(isLessSpecificThan(level, Level.INFO) ? Level.INFO : level, str, param);
}
public void errorInc(String str, Object... param)