Skip to content

Commit b9e250e

Browse files
committed
fix: final getLogger method in JavaPlugin in some spigot versions & bump to 1.3.16
1 parent 53c961c commit b9e250e

File tree

10 files changed

+18
-19
lines changed

10 files changed

+18
-19
lines changed

bukkit-utils/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>net.anweisen.utilities</groupId>
99
<artifactId>root</artifactId>
10-
<version>1.3.15</version>
10+
<version>1.3.16</version>
1111
</parent>
1212

1313
<artifactId>bukkit-utils</artifactId>

bukkit-utils/src/main/java/net/anweisen/utilities/bukkit/core/BukkitModule.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,17 @@ public final void onLoad() {
7676
setFirstInstance(this);
7777
}
7878

79-
ILogger.setConstantFactory(this.getLogger());
79+
ILogger.setConstantFactory(this.getILogger());
8080
trySaveDefaultConfig();
8181
if (wasShutdown) isReloaded = true;
8282
if (firstInstall = !getDataFolder().exists()) {
83-
getLogger().info("Detected first install!");
83+
getILogger().info("Detected first install!");
8484
}
8585
if (devMode = getConfigDocument().getBoolean("dev-mode") || getConfigDocument().getBoolean("dev-mode.enabled")) {
86-
getLogger().setLevel(Level.ALL);
87-
getLogger().debug("Devmode is enabled: Showing debug messages. This can be disabled in the plugin.yml ('dev-mode')");
86+
getILogger().setLevel(Level.ALL);
87+
getILogger().debug("Devmode is enabled: Showing debug messages. This can be disabled in the plugin.yml ('dev-mode')");
8888
} else {
89-
getLogger().setLevel(Level.INFO);
89+
getILogger().setLevel(Level.INFO);
9090
}
9191

9292
injectInstance();
@@ -167,8 +167,7 @@ public final boolean isFirstInstance() {
167167
}
168168

169169
@Nonnull
170-
@Override
171-
public JavaILogger getLogger() {
170+
public JavaILogger getILogger() {
172171
return logger != null ? logger : (logger = new BukkitLoggerWrapper(super.getLogger()));
173172
}
174173

@@ -255,7 +254,7 @@ public final void registerCommand(@Nonnull CommandExecutor executor, @Nonnull St
255254
private void registerCommand0(@Nonnull CommandExecutor executor, @Nonnull String name) {
256255
PluginCommand command = getCommand(name);
257256
if (command == null) {
258-
getLogger().warn("Tried to register invalid command '{}'", name);
257+
getILogger().warn("Tried to register invalid command '{}'", name);
259258
} else {
260259
command.setExecutor(executor);
261260
}
@@ -329,11 +328,11 @@ public final void checkEnabled() {
329328
}
330329

331330
private void registerAsFirstInstance() {
332-
getLogger().info(getName() + " was loaded as the first BukkitModule");
331+
getILogger().info(getName() + " was loaded as the first BukkitModule");
333332
registerListener(
334333
new MenuPositionListener()
335334
);
336-
getLogger().info("Detected server version {} -> {}", getServerVersionExact(), getServerVersion());
335+
getILogger().info("Detected server version {} -> {}", getServerVersionExact(), getServerVersion());
337336
}
338337

339338
private void trySaveDefaultConfig() {

bukkit-utils/src/main/java/net/anweisen/utilities/bukkit/core/RequirementsChecker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ private void requireVersion(@Nonnull Version required) {
9292
}
9393

9494
private void log(@Nonnull String line, @Nonnull Object... args) {
95-
module.getLogger().error(line, args);
95+
module.getILogger().error(line, args);
9696
}
9797

9898
}

bukkit-utils/src/main/java/net/anweisen/utilities/bukkit/utils/logging/Logger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ private Logger() {}
1717

1818
@Nonnull
1919
public static ILogger getInstance() {
20-
return BukkitModule.getProvidingModule(ReflectionUtils.getCaller()).getLogger();
20+
return BukkitModule.getProvidingModule(ReflectionUtils.getCaller()).getILogger();
2121
}
2222

2323
public static void error(@Nullable Object message, @Nonnull Object... args) {

common-utils/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>net.anweisen.utilities</groupId>
99
<artifactId>root</artifactId>
10-
<version>1.3.15</version>
10+
<version>1.3.16</version>
1111
</parent>
1212

1313
<artifactId>common-utils</artifactId>

database-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>net.anweisen.utilities</groupId>
99
<artifactId>root</artifactId>
10-
<version>1.3.15</version>
10+
<version>1.3.16</version>
1111
</parent>
1212

1313
<artifactId>database-api</artifactId>

database-mongodb/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>net.anweisen.utilities</groupId>
99
<artifactId>root</artifactId>
10-
<version>1.3.15</version>
10+
<version>1.3.16</version>
1111
</parent>
1212

1313
<artifactId>database-mongodb</artifactId>

database-sql/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>net.anweisen.utilities</groupId>
99
<artifactId>root</artifactId>
10-
<version>1.3.15</version>
10+
<version>1.3.16</version>
1111
</parent>
1212

1313
<artifactId>database-sql</artifactId>

jda-manager/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>net.anweisen.utilities</groupId>
99
<artifactId>root</artifactId>
10-
<version>1.3.15</version>
10+
<version>1.3.16</version>
1111
</parent>
1212

1313
<artifactId>jda-manager</artifactId>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>net.anweisen.utilities</groupId>
88
<artifactId>root</artifactId>
9-
<version>1.3.15</version>
9+
<version>1.3.16</version>
1010
<packaging>pom</packaging>
1111

1212
<modules>

0 commit comments

Comments
 (0)