Skip to content

Commit 4f0bdaa

Browse files
committed
Use Java logger
Unfortunately slf4j is not available on Spigot Related: 7689bca
1 parent 4c05b1b commit 4f0bdaa

File tree

6 files changed

+34
-34
lines changed

6 files changed

+34
-34
lines changed

src/main/java/pl/craftserve/radiation/CraftserveListener.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@
2424
import org.bukkit.event.Listener;
2525
import org.bukkit.event.player.PlayerJoinEvent;
2626
import org.bukkit.plugin.Plugin;
27-
import org.slf4j.Logger;
28-
import org.slf4j.LoggerFactory;
2927

3028
import java.net.InetAddress;
3129
import java.net.UnknownHostException;
3230
import java.util.Locale;
3331
import java.util.Objects;
32+
import java.util.logging.Level;
33+
import java.util.logging.Logger;
3434

3535
public class CraftserveListener implements Listener {
36-
static final Logger logger = LoggerFactory.getLogger(CraftserveListener.class);
36+
static final Logger logger = Logger.getLogger(CraftserveListener.class.getName());
3737

3838
private static final String PERMISSION = "craftserveradiation.ad";
3939
private static final String TEXT = ChatColor.GREEN + "Polecamy korzystanie z hostingu " +
@@ -50,7 +50,7 @@ public void enable() {
5050
try {
5151
shouldAdvertise = this.shouldAdvertise();
5252
} catch (UnknownHostException e) {
53-
logger.error("Could not resolve local host.", e);
53+
logger.log(Level.SEVERE, "Could not resolve local host.", e);
5454
shouldAdvertise = true;
5555
}
5656

src/main/java/pl/craftserve/radiation/LugolsIodinePotion.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@
4040
import org.bukkit.plugin.Plugin;
4141
import org.bukkit.potion.PotionData;
4242
import org.bukkit.potion.PotionType;
43-
import org.slf4j.Logger;
44-
import org.slf4j.LoggerFactory;
4543
import pl.craftserve.radiation.nms.RadiationNmsBridge;
4644

4745
import java.text.MessageFormat;
@@ -54,9 +52,11 @@
5452
import java.util.StringJoiner;
5553
import java.util.concurrent.TimeUnit;
5654
import java.util.function.Predicate;
55+
import java.util.logging.Level;
56+
import java.util.logging.Logger;
5757

5858
public class LugolsIodinePotion implements Listener, Predicate<ItemStack> {
59-
static final Logger logger = LoggerFactory.getLogger(LugolsIodinePotion.class);
59+
static final Logger logger = Logger.getLogger(LugolsIodinePotion.class.getName());
6060

6161
private static final byte TRUE = 1;
6262

@@ -147,7 +147,7 @@ private void broadcastConsumption(Player player, int durationSeconds) {
147147
Objects.requireNonNull(player, "player");
148148

149149
String name = this.config.name();
150-
logger.info("{} has consumed {} with a duration of {} seconds", player.getName(), name, durationSeconds);
150+
logger.info(player.getName() + " has consumed " + name + " with a duration of " + durationSeconds + " seconds");
151151

152152
this.config.drinkMessage().ifPresent(rawMessage -> {
153153
String message = ChatColor.RED + MessageFormat.format(rawMessage, player.getDisplayName() + ChatColor.RESET, name);

src/main/java/pl/craftserve/radiation/MetricsHandler.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@
2323
import org.bukkit.event.HandlerList;
2424
import org.bukkit.event.Listener;
2525
import org.bukkit.plugin.Plugin;
26-
import org.slf4j.Logger;
27-
import org.slf4j.LoggerFactory;
2826
import pl.craftserve.metrics.pluginmetricslite.MetricSubmitEvent;
2927
import pl.craftserve.metrics.pluginmetricslite.MetricsLite;
3028

3129
import java.util.Map;
3230
import java.util.Objects;
31+
import java.util.logging.Level;
32+
import java.util.logging.Logger;
3333

3434
public class MetricsHandler implements Listener {
35-
static final Logger logger = LoggerFactory.getLogger(MetricsHandler.class);
35+
static final Logger logger = Logger.getLogger(MetricsHandler.class.getName());
3636

3737
private final Plugin plugin;
3838
private final Server server;
@@ -54,15 +54,15 @@ public void start() {
5454
try {
5555
MetricsLite.start(this.plugin);
5656
} catch (Throwable throwable) {
57-
logger.error("Could not start metrics.", throwable);
57+
logger.log(Level.SEVERE, "Could not start metrics.", throwable);
5858
}
5959
}
6060

6161
public void stop() {
6262
try {
6363
MetricsLite.stopIfRunning(this.plugin);
6464
} catch (Throwable throwable) {
65-
logger.error("Could not stop metrics.", throwable);
65+
logger.log(Level.SEVERE, "Could not stop metrics.", throwable);
6666
}
6767

6868
HandlerList.unregisterAll(this);

src/main/java/pl/craftserve/radiation/Radiation.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@
4242
import org.bukkit.potion.PotionEffect;
4343
import org.bukkit.potion.PotionEffectType;
4444
import org.bukkit.scheduler.BukkitRunnable;
45-
import org.slf4j.Logger;
46-
import org.slf4j.LoggerFactory;
4745

4846
import java.text.MessageFormat;
4947
import java.util.ArrayList;
@@ -56,9 +54,11 @@
5654
import java.util.Set;
5755
import java.util.UUID;
5856
import java.util.function.Predicate;
57+
import java.util.logging.Level;
58+
import java.util.logging.Logger;
5959

6060
public class Radiation implements Listener {
61-
static final Logger logger = LoggerFactory.getLogger(Radiation.class);
61+
static final Logger logger = Logger.getLogger(Radiation.class.getName());
6262

6363
private final Set<UUID> affectedPlayers = new HashSet<>(128);
6464

@@ -124,7 +124,7 @@ private void broadcastEscape(Player player) {
124124
Objects.requireNonNull(player, "player");
125125

126126
String radiationId = this.config.id();
127-
logger.info("{} has escaped to \"{}\" radiation zone at {}", player.getName(), radiationId, player.getLocation());
127+
logger.info(player.getName() + " has escaped to \"" + radiationId + "\" radiation zone at " + player.getLocation());
128128

129129
this.config.enterMessage().ifPresent(rawMessage -> {
130130
String message = ChatColor.RED + MessageFormat.format(rawMessage, player.getDisplayName() + ChatColor.RESET, radiationId);

src/main/java/pl/craftserve/radiation/RadiationPlugin.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
import org.bukkit.configuration.MemoryConfiguration;
3838
import org.bukkit.configuration.file.FileConfiguration;
3939
import org.bukkit.plugin.java.JavaPlugin;
40-
import org.slf4j.Logger;
41-
import org.slf4j.LoggerFactory;
4240
import pl.craftserve.radiation.nms.RadiationNmsBridge;
4341
import pl.craftserve.radiation.nms.V1_14ToV1_15NmsBridge;
4442

@@ -53,9 +51,11 @@
5351
import java.util.TreeSet;
5452
import java.util.concurrent.TimeUnit;
5553
import java.util.concurrent.atomic.AtomicBoolean;
54+
import java.util.logging.Level;
55+
import java.util.logging.Logger;
5656

5757
public final class RadiationPlugin extends JavaPlugin {
58-
static final Logger logger = LoggerFactory.getLogger(RadiationPlugin.class);
58+
static final Logger logger = Logger.getLogger(RadiationPlugin.class.getName());
5959

6060
private static final char COLOR_CODE = '&';
6161

@@ -83,7 +83,7 @@ public static String colorize(String input) {
8383

8484
private RadiationNmsBridge initializeNmsBridge() {
8585
String serverVersion = RadiationNmsBridge.getServerVersion(this.getServer());
86-
logger.info("Detected server version: {}", serverVersion);
86+
logger.info("Detected server version: " + serverVersion);
8787

8888
switch (serverVersion) {
8989
case "v1_14_R1":
@@ -114,7 +114,7 @@ public void onEnable() {
114114
try {
115115
this.radiationNmsBridge = this.initializeNmsBridge();
116116
} catch (Exception e) {
117-
logger.error("Failed to launch {}. Plausibly your server version is unsupported.", this.getName(), e);
117+
logger.log(Level.SEVERE, "Failed to launch " + this.getName() + ". Plausibly your server version is unsupported.", e);
118118
this.setEnabled(false);
119119
return;
120120
}
@@ -132,7 +132,7 @@ public void onEnable() {
132132
try {
133133
this.config = new Config(config);
134134
} catch (InvalidConfigurationException e) {
135-
logger.error("Could not load configuration file.", e);
135+
logger.log(Level.SEVERE, "Could not load configuration file.", e);
136136
this.setEnabled(false);
137137
return;
138138
}
@@ -166,7 +166,7 @@ public void onEnable() {
166166

167167
Set<String> radiationIds = new TreeSet<>(Comparator.naturalOrder());
168168
radiationIds.addAll(this.activeRadiations.keySet());
169-
logger.info("Loaded and enabled {} radiation(s): {}", this.activeRadiations.size(), String.join(", ", radiationIds));
169+
logger.info("Loaded and enabled " + this.activeRadiations.size() + " radiation(s): " + String.join(", ", radiationIds));
170170

171171
this.craftserveListener.enable();
172172
this.metricsHandler.start();
@@ -242,7 +242,7 @@ private boolean migrate(ConfigurationSection section, int protocol) {
242242
Objects.requireNonNull(section, "section");
243243

244244
if (protocol > CURRENT_PROTOCOL_VERSION) {
245-
logger.error("Your configuration file's protocol version \"{}\" is invalid. Are you trying to load it using a newer version of the plugin?", protocol);
245+
logger.severe("Your configuration file's protocol version \"" + protocol + "\" is invalid. Are you trying to load it using a newer version of the plugin?");
246246
return false;
247247
}
248248

@@ -279,7 +279,7 @@ private boolean migrate(ConfigurationSection section, int protocol) {
279279
AtomicBoolean logged = new AtomicBoolean();
280280
section.getStringList("world-names").forEach(worldName -> {
281281
if (logged.compareAndSet(false, true)) {
282-
logger.warn(
282+
logger.warning(
283283
"Enabling in legacy region-name mode! The plugin will try to automatically migrate to the new flag-based system.\n" +
284284
"If everything went fine please completely remove your config.yml file.");
285285
}
@@ -336,7 +336,7 @@ private void migrateFromRegionId(String worldName, String regionId) {
336336

337337
World world = this.getServer().getWorld(worldName);
338338
if (world == null) {
339-
logger.warn(error + "the world is unloaded.");
339+
logger.warning(error + "the world is unloaded.");
340340
return;
341341
}
342342

@@ -346,19 +346,19 @@ private void migrateFromRegionId(String worldName, String regionId) {
346346

347347
RegionContainer regionContainer = matcher.getRegionContainer();
348348
if (regionContainer == null) {
349-
logger.warn(error + "region container is not present.");
349+
logger.warning(error + "region container is not present.");
350350
return;
351351
}
352352

353353
RegionManager regionManager = regionContainer.get(BukkitAdapter.adapt(world));
354354
if (regionManager == null) {
355-
logger.warn(error + "region manager for the world is not present.");
355+
logger.warning(error + "region manager for the world is not present.");
356356
return;
357357
}
358358

359359
ProtectedRegion legacyRegion = regionManager.getRegion(regionId);
360360
if (legacyRegion == null) {
361-
logger.warn(error + "legacy region is not present.");
361+
logger.warning(error + "legacy region is not present.");
362362
return;
363363
}
364364

@@ -372,7 +372,7 @@ private void migrateFromRegionId(String worldName, String regionId) {
372372
}
373373

374374
global.setFlag(this.radiationFlag, true);
375-
logger.info("Region {} in world {} has been successfully migrated to the new flag-based system.", regionId, worldName);
375+
logger.info("Region " + regionId + " in world " + worldName + " has been successfully migrated to the new flag-based system.");
376376
}
377377

378378
//

src/main/java/pl/craftserve/radiation/nms/V1_14ToV1_15NmsBridge.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818

1919
import org.bukkit.Material;
2020
import org.bukkit.NamespacedKey;
21-
import org.slf4j.Logger;
22-
import org.slf4j.LoggerFactory;
2321
import pl.craftserve.radiation.LugolsIodinePotion;
2422

2523
import java.lang.reflect.Array;
2624
import java.lang.reflect.Method;
2725
import java.text.MessageFormat;
2826
import java.util.Objects;
27+
import java.util.logging.Level;
28+
import java.util.logging.Logger;
2929

3030
public class V1_14ToV1_15NmsBridge implements RadiationNmsBridge {
31-
static final Logger logger = LoggerFactory.getLogger(V1_14ToV1_15NmsBridge.class);
31+
static final Logger logger = Logger.getLogger(V1_14ToV1_15NmsBridge.class.getName());
3232

3333
private final Class<?> itemClass;
3434
private final Class<?> iRegistryClass;

0 commit comments

Comments
 (0)