fix: final getLogger method in JavaPlugin in some spigot versions & b…

…ump to 1.3.16
anweisen · Aug 21, 2024 · b9e250e · b9e250e
1 parent 53c961c
commit b9e250e
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 19 deletions.
diff --git a/bukkit-utils/pom.xml b/bukkit-utils/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>net.anweisen.utilities</groupId>
 		<artifactId>root</artifactId>
-		<version>1.3.15</version>
+		<version>1.3.16</version>
 	</parent>
 
 	<artifactId>bukkit-utils</artifactId>

diff --git a/bukkit-utils/src/main/java/net/anweisen/utilities/bukkit/core/BukkitModule.java b/bukkit-utils/src/main/java/net/anweisen/utilities/bukkit/core/BukkitModule.java
@@ -76,17 +76,17 @@ public final void onLoad() {
 			setFirstInstance(this);
 		}
 
-		ILogger.setConstantFactory(this.getLogger());
+		ILogger.setConstantFactory(this.getILogger());
 		trySaveDefaultConfig();
 		if (wasShutdown) isReloaded = true;
 		if (firstInstall = !getDataFolder().exists()) {
-			getLogger().info("Detected first install!");
+			getILogger().info("Detected first install!");
 		}
 		if (devMode = getConfigDocument().getBoolean("dev-mode") || getConfigDocument().getBoolean("dev-mode.enabled")) {
-			getLogger().setLevel(Level.ALL);
-			getLogger().debug("Devmode is enabled: Showing debug messages. This can be disabled in the plugin.yml ('dev-mode')");
+			getILogger().setLevel(Level.ALL);
+			getILogger().debug("Devmode is enabled: Showing debug messages. This can be disabled in the plugin.yml ('dev-mode')");
 		} else {
-			getLogger().setLevel(Level.INFO);
+			getILogger().setLevel(Level.INFO);
 		}
 
 		injectInstance();
@@ -167,8 +167,7 @@ public final boolean isFirstInstance() {
 	}
 
 	@Nonnull
-	@Override
-	public JavaILogger getLogger() {
+	public JavaILogger getILogger() {
 		return logger != null ? logger : (logger = new BukkitLoggerWrapper(super.getLogger()));
 	}
 
@@ -255,7 +254,7 @@ public final void registerCommand(@Nonnull CommandExecutor executor, @Nonnull St
 	private void registerCommand0(@Nonnull CommandExecutor executor, @Nonnull String name) {
 		PluginCommand command = getCommand(name);
 		if (command == null) {
-			getLogger().warn("Tried to register invalid command '{}'", name);
+			getILogger().warn("Tried to register invalid command '{}'", name);
 		} else {
 			command.setExecutor(executor);
 		}
@@ -329,11 +328,11 @@ public final void checkEnabled() {
 	}
 
 	private void registerAsFirstInstance() {
-		getLogger().info(getName() + " was loaded as the first BukkitModule");
+		getILogger().info(getName() + " was loaded as the first BukkitModule");
 		registerListener(
 			new MenuPositionListener()
 		);
-		getLogger().info("Detected server version {} -> {}", getServerVersionExact(), getServerVersion());
+		getILogger().info("Detected server version {} -> {}", getServerVersionExact(), getServerVersion());
 	}
 
 	private void trySaveDefaultConfig() {

diff --git a/bukkit-utils/src/main/java/net/anweisen/utilities/bukkit/core/RequirementsChecker.java b/bukkit-utils/src/main/java/net/anweisen/utilities/bukkit/core/RequirementsChecker.java
@@ -92,7 +92,7 @@ private void requireVersion(@Nonnull Version required) {
 	}
 
 	private void log(@Nonnull String line, @Nonnull Object... args) {
-		module.getLogger().error(line, args);
+		module.getILogger().error(line, args);
 	}
 
 }
diff --git a/bukkit-utils/src/main/java/net/anweisen/utilities/bukkit/utils/logging/Logger.java b/bukkit-utils/src/main/java/net/anweisen/utilities/bukkit/utils/logging/Logger.java
@@ -17,7 +17,7 @@ private Logger() {}
 
 	@Nonnull
 	public static ILogger getInstance() {
-		return BukkitModule.getProvidingModule(ReflectionUtils.getCaller()).getLogger();
+		return BukkitModule.getProvidingModule(ReflectionUtils.getCaller()).getILogger();
 	}
 
 	public static void error(@Nullable Object message, @Nonnull Object... args) {

diff --git a/common-utils/pom.xml b/common-utils/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>net.anweisen.utilities</groupId>
 		<artifactId>root</artifactId>
-		<version>1.3.15</version>
+		<version>1.3.16</version>
 	</parent>
 
 	<artifactId>common-utils</artifactId>

diff --git a/database-api/pom.xml b/database-api/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>net.anweisen.utilities</groupId>
 		<artifactId>root</artifactId>
-		<version>1.3.15</version>
+		<version>1.3.16</version>
 	</parent>
 
 	<artifactId>database-api</artifactId>

diff --git a/database-mongodb/pom.xml b/database-mongodb/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>net.anweisen.utilities</groupId>
 		<artifactId>root</artifactId>
-		<version>1.3.15</version>
+		<version>1.3.16</version>
 	</parent>
 
 	<artifactId>database-mongodb</artifactId>

diff --git a/database-sql/pom.xml b/database-sql/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>net.anweisen.utilities</groupId>
 		<artifactId>root</artifactId>
-		<version>1.3.15</version>
+		<version>1.3.16</version>
 	</parent>
 
 	<artifactId>database-sql</artifactId>

diff --git a/jda-manager/pom.xml b/jda-manager/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>net.anweisen.utilities</groupId>
 		<artifactId>root</artifactId>
-		<version>1.3.15</version>
+		<version>1.3.16</version>
 	</parent>
 
 	<artifactId>jda-manager</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>net.anweisen.utilities</groupId>
 	<artifactId>root</artifactId>
-	<version>1.3.15</version>
+	<version>1.3.16</version>
 	<packaging>pom</packaging>
 
 	<modules>