Refactor logging by replacing custom Logger with SLF4J and adapt all usages
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
package com.alttd.playerutils.config;
|
||||
|
||||
import com.alttd.playerutils.util.Logger;
|
||||
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.bukkit.configuration.ConfigurationSection;
|
||||
|
||||
import java.io.File;
|
||||
@@ -9,24 +9,23 @@ import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
@Slf4j
|
||||
public class KeyStorage extends AbstractConfig {
|
||||
|
||||
static KeyStorage config;
|
||||
private final Logger logger;
|
||||
|
||||
public KeyStorage(Logger logger) {
|
||||
public KeyStorage() {
|
||||
super(
|
||||
new File(File.separator
|
||||
+ "mnt" + File.separator
|
||||
+ "configs" + File.separator
|
||||
+ "PlayerUtils"),
|
||||
"key_storage.yml", logger);
|
||||
this.logger = logger;
|
||||
"key_storage.yml");
|
||||
}
|
||||
|
||||
public static void reload(Logger logger) {
|
||||
logger.info("Reloading key storage");
|
||||
config = new KeyStorage(logger);
|
||||
public static void reload() {
|
||||
log.info("Reloading key storage");
|
||||
config = new KeyStorage();
|
||||
config.readConfig(KeyStorage.class, null);
|
||||
}
|
||||
|
||||
@@ -43,13 +42,13 @@ public class KeyStorage extends AbstractConfig {
|
||||
Object2IntOpenHashMap<UUID> count = new Object2IntOpenHashMap<>();
|
||||
ConfigurationSection configurationSection = config.getConfigurationSection(prefix + crate);
|
||||
if (configurationSection == null) {
|
||||
config.logger.info(String.format("No section yet for crate %s", crate));
|
||||
log.info("No section yet for crate {}", crate);
|
||||
KEYS.put(crate, count);
|
||||
continue;
|
||||
}
|
||||
List<UUID> uuids = configurationSection.getKeys(false).stream().map(UUID::fromString).toList();
|
||||
if (uuids.isEmpty()) {
|
||||
config.logger.info(String.format("No keys yet for crate %s", crate));
|
||||
log.info("No keys yet for crate {}", crate);
|
||||
KEYS.put(crate, count);
|
||||
continue;
|
||||
}
|
||||
@@ -62,7 +61,7 @@ public class KeyStorage extends AbstractConfig {
|
||||
}
|
||||
|
||||
public synchronized static void save() {
|
||||
config.logger.info("Saving KeyStorage");
|
||||
log.info("Saving KeyStorage");
|
||||
KEYS.keySet()
|
||||
.forEach(crate -> KEYS.get(crate)
|
||||
.forEach((uuid, keys) -> config.set(prefix + crate + ".", uuid.toString(), keys)));
|
||||
|
||||
Reference in New Issue
Block a user