Skip to content

Commit 1aba983

Browse files
committed
Fix Logformat
1 parent c296fa1 commit 1aba983

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<modelVersion>4.0.0</modelVersion>
77
<groupId>net.sourcewriters.minecraft</groupId>
88
<artifactId>vcompat</artifactId>
9-
<version>2.1.0</version>
9+
<version>2.1.1</version>
1010
<name>vCompat</name>
1111
<distributionManagement>
1212
<repository>
@@ -245,7 +245,7 @@
245245
</excludes>
246246
</filter>
247247
</filters>
248-
<createDependencyReducedPom>false</createDependencyReducedPom>
248+
<createDependencyReducedPom>true</createDependencyReducedPom>
249249
</configuration>
250250
</plugin>
251251
<plugin>

src/main/java/net/sourcewriters/minecraft/vcompat/utils/logging/BukkitLogger.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -236,31 +236,31 @@ public BukkitLogger log(LogType type, String... messages) {
236236
}
237237

238238
public BukkitLogger log(LogType type, String message) {
239-
message = format.replace("%date%", Times.getDate(".").substring(0, 5)).replace("%time%", Times.getTime(":"))
239+
String format = this.format.replace("%date%", Times.getDate(".").substring(0, 5)).replace("%time%", Times.getTime(":"))
240240
.replace("%thread%", getThreadName()).replace("%plugin%", plugin);
241241
try {
242-
return colored ? sendColored(type, message) : sendUncolored(type, message);
242+
return colored ? sendColored(type, format, message) : sendUncolored(type, format, message);
243243
} catch (IOException e) {
244244
e.printStackTrace();
245245
}
246246
return this;
247247
}
248248

249-
private BukkitLogger sendColored(LogType type, String message) throws IOException {
249+
private BukkitLogger sendColored(LogType type, String format, String message) throws IOException {
250250
boolean colorMessage = this.colorMessage.contains(type.getId());
251251
String ansi;
252252
if (custom != null) {
253253
boolean color = (ansi = type.asColorString(false)).length() != 0;
254254
custom.accept(true,
255-
message.replace("%type%", ansi).replace("%message%", (colorMessage ? ansi : "") + LoggingColors.format(message, color))
255+
format.replace("%type%", ansi).replace("%message%", (colorMessage ? ansi : "") + LoggingColors.format(message, color))
256256
+ (color ? ANSI_RESET : ""));
257257
}
258-
return sendStream(message.replace("%type%", ansi = type.asColorString(true)).replace("%message%",
258+
return sendStream(format.replace("%type%", ansi = type.asColorString(true)).replace("%message%",
259259
(colorMessage ? ansi : "") + LoggingColors.format(message, true)) + ANSI_RESET);
260260
}
261261

262-
private BukkitLogger sendUncolored(LogType type, String message) throws IOException {
263-
message = message.replace("%type%", type.getName().toUpperCase()).replace("%message%", LoggingColors.format(message, false));
262+
private BukkitLogger sendUncolored(LogType type, String format, String message) throws IOException {
263+
message = format.replace("%type%", type.getName().toUpperCase()).replace("%message%", LoggingColors.format(message, false));
264264
if (custom != null) {
265265
custom.accept(true, message);
266266
}

0 commit comments

Comments
 (0)