diff --git a/build.gradle.kts b/build.gradle.kts index 5e74873..efa46bd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -39,7 +39,12 @@ tasks { } dependencies { - compileOnly("com.alttd.cosmos:cosmos-api:1.21.6-R0.1-SNAPSHOT") { + compileOnly("com.alttd.cosmos:cosmos-api:1.21.7-R0.1-SNAPSHOT") { isChanging = true } + + implementation("org.slf4j:slf4j-api:2.0.17") + + compileOnly("org.projectlombok:lombok:1.18.38") + annotationProcessor("org.projectlombok:lombok:1.18.38") } diff --git a/src/main/java/com/alttd/playerutils/PlayerUtils.java b/src/main/java/com/alttd/playerutils/PlayerUtils.java index c83d2e0..9538db0 100644 --- a/src/main/java/com/alttd/playerutils/PlayerUtils.java +++ b/src/main/java/com/alttd/playerutils/PlayerUtils.java @@ -7,7 +7,6 @@ import com.alttd.playerutils.config.Config; import com.alttd.playerutils.config.KeyStorage; import com.alttd.playerutils.config.Messages; import com.alttd.playerutils.event_listeners.*; -import com.alttd.playerutils.util.Logger; import org.bukkit.Bukkit; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; @@ -16,12 +15,10 @@ import java.util.concurrent.TimeUnit; public final class PlayerUtils extends JavaPlugin { - private Logger logger; private PlayerUtilsCommand playerUtilsCommand; @Override public void onEnable() { - this.logger = new Logger(getLogger()); registerCommands(); registerEvents(); reloadConfigs(); @@ -34,30 +31,30 @@ public final class PlayerUtils extends JavaPlugin { } private void registerCommands() { - playerUtilsCommand = new PlayerUtilsCommand(this, logger); + playerUtilsCommand = new PlayerUtilsCommand(this); } private void registerEvents() { PluginManager pluginManager = getServer().getPluginManager(); - pluginManager.registerEvents(new XpBottleEvent(this, logger), this); + pluginManager.registerEvents(new XpBottleEvent(this), this); pluginManager.registerEvents(new TeleportEvent(), this); - pluginManager.registerEvents(new GoatHornEvent(logger), this); - pluginManager.registerEvents(new LimitArmorStands(this, logger), this); - pluginManager.registerEvents(new BlockBlockUseEvent(logger), this); + pluginManager.registerEvents(new GoatHornEvent(), this); + pluginManager.registerEvents(new LimitArmorStands(this), this); + pluginManager.registerEvents(new BlockBlockUseEvent(), this); - RotateBlockEvent rotateBlockEvent = new RotateBlockEvent(logger); + RotateBlockEvent rotateBlockEvent = new RotateBlockEvent(); pluginManager.registerEvents(rotateBlockEvent, this); playerUtilsCommand.addSubCommand(new RotateBlock(rotateBlockEvent)); - GhastSpeedEvent ghastSpeedEvent = new GhastSpeedEvent(logger); + GhastSpeedEvent ghastSpeedEvent = new GhastSpeedEvent(); pluginManager.registerEvents(ghastSpeedEvent, this); - playerUtilsCommand.addSubCommand(new GhastSpeed(logger, ghastSpeedEvent)); + playerUtilsCommand.addSubCommand(new GhastSpeed(ghastSpeedEvent)); } public void reloadConfigs() { - Config.reload(logger); - Messages.reload(logger); - KeyStorage.reload(logger); + Config.reload(); + Messages.reload(); + KeyStorage.reload(); } private void registerSchedulers() { diff --git a/src/main/java/com/alttd/playerutils/commands/PlayerUtilsCommand.java b/src/main/java/com/alttd/playerutils/commands/PlayerUtilsCommand.java index 8f19bd2..669a1fb 100644 --- a/src/main/java/com/alttd/playerutils/commands/PlayerUtilsCommand.java +++ b/src/main/java/com/alttd/playerutils/commands/PlayerUtilsCommand.java @@ -3,26 +3,26 @@ package com.alttd.playerutils.commands; import com.alttd.playerutils.PlayerUtils; import com.alttd.playerutils.commands.playerutils_subcommands.*; import com.alttd.playerutils.config.Messages; -import com.alttd.playerutils.event_listeners.RotateBlockEvent; -import com.alttd.playerutils.util.Logger; +import lombok.Getter; +import lombok.extern.slf4j.Slf4j; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; import org.bukkit.command.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +@Slf4j @Getter public class PlayerUtilsCommand implements CommandExecutor, TabExecutor { private final List subCommands; - public PlayerUtilsCommand(PlayerUtils playerUtils, Logger logger) { + public PlayerUtilsCommand(PlayerUtils playerUtils) { PluginCommand command = playerUtils.getCommand("playerutils"); if (command == null) { subCommands = null; - logger.severe("Unable to find playerutils command."); + log.error("Unable to find playerutils command."); return; } command.setExecutor(this); @@ -30,11 +30,11 @@ public class PlayerUtilsCommand implements CommandExecutor, TabExecutor { command.setAliases(List.of("pu")); subCommands = new ArrayList<>(List.of( - new Glow(logger), + new Glow(), new XPCheque(playerUtils), new XPCalc(), new Reload(playerUtils), - new Key(logger)) + new Key()) ); } @@ -85,10 +85,6 @@ public class PlayerUtilsCommand implements CommandExecutor, TabExecutor { return res; } - public List getSubCommands() { - return subCommands; - } - private SubCommand getSubCommand(String cmdName) { return subCommands.stream() .filter(subCommand -> subCommand.getName().equals(cmdName)) diff --git a/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/GhastSpeed.java b/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/GhastSpeed.java index db2a6fa..ba41d27 100644 --- a/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/GhastSpeed.java +++ b/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/GhastSpeed.java @@ -5,7 +5,6 @@ import com.alttd.playerutils.commands.argument_parser.GhastSpeedParser; import com.alttd.playerutils.config.Messages; import com.alttd.playerutils.data_objects.GHAST_SPEED; import com.alttd.playerutils.event_listeners.GhastSpeedEvent; -import com.alttd.playerutils.util.Logger; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeInstance; @@ -20,11 +19,9 @@ public class GhastSpeed extends SubCommand { private final static GhastSpeedParser GHAST_SPEED_PARSER = new GhastSpeedParser(); private final static int GHAST_SPEED_ARG = 1; - private final Logger logger; private final GhastSpeedEvent ghastSpeedEvent; - public GhastSpeed(Logger logger, GhastSpeedEvent ghastSpeedEvent) { - this.logger = logger; + public GhastSpeed(GhastSpeedEvent ghastSpeedEvent) { this.ghastSpeedEvent = ghastSpeedEvent; } diff --git a/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Glow.java b/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Glow.java index 976f60e..5f79438 100644 --- a/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Glow.java +++ b/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Glow.java @@ -2,7 +2,7 @@ package com.alttd.playerutils.commands.playerutils_subcommands; import com.alttd.playerutils.commands.SubCommand; import com.alttd.playerutils.config.Messages; -import com.alttd.playerutils.util.Logger; +import lombok.extern.slf4j.Slf4j; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.TextColor; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; @@ -19,13 +19,7 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -public class Glow extends SubCommand { - - private final Logger logger; - - public Glow(Logger logger) { - this.logger = logger; - } +@Slf4j public class Glow extends SubCommand { @Override public boolean onCommand(CommandSender commandSender, String[] args) { @@ -106,7 +100,7 @@ public class Glow extends SubCommand { private void turnOnGlow(CommandSender commandSender, Player player, Team team, DyeColor dyeColor, boolean otherPlayer) { if (team.getScoreboard() == null) { commandSender.sendRichMessage(Messages.GLOW.UNABLE_TO_GET_SCOREBOARD); - logger.warning("Unable to get scoreboard for team"); + log.warn("Unable to get scoreboard for team"); return; } diff --git a/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Key.java b/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Key.java index 7daf569..608f45d 100644 --- a/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Key.java +++ b/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Key.java @@ -4,8 +4,8 @@ import com.alttd.playerutils.commands.SubCommand; import com.alttd.playerutils.config.Config; import com.alttd.playerutils.config.KeyStorage; import com.alttd.playerutils.config.Messages; -import com.alttd.playerutils.util.Logger; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; +import lombok.extern.slf4j.Slf4j; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import org.bukkit.Bukkit; @@ -15,13 +15,7 @@ import org.bukkit.entity.Player; import java.util.List; import java.util.UUID; -public class Key extends SubCommand { - - private final Logger logger; - - public Key(Logger logger) { - this.logger = logger; - } +@Slf4j public class Key extends SubCommand { @Override public boolean onCommand(CommandSender commandSender, String[] args) { @@ -52,7 +46,7 @@ public class Key extends SubCommand { } crateMap.addTo(uuid, 1); - logger.info(String.format("Gave %s one key for %s", player.getName(), crate)); + log.info("Gave {} one key for {}", player.getName(), crate); commandSender.getServer().dispatchCommand(Bukkit.getConsoleSender(), String.format("crate give v %s 1 %s", crate, player.getName())); if (keys + 1 == totalKeys) { commandSender.sendRichMessage(Messages.KEY.GAVE_FINAL_KEY, TagResolver.resolver( diff --git a/src/main/java/com/alttd/playerutils/config/AbstractConfig.java b/src/main/java/com/alttd/playerutils/config/AbstractConfig.java index 8e748ea..75e37c0 100644 --- a/src/main/java/com/alttd/playerutils/config/AbstractConfig.java +++ b/src/main/java/com/alttd/playerutils/config/AbstractConfig.java @@ -1,8 +1,8 @@ package com.alttd.playerutils.config; import com.alttd.playerutils.PlayerUtils; -import com.alttd.playerutils.util.Logger; import com.google.common.collect.ImmutableMap; +import lombok.extern.slf4j.Slf4j; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; @@ -19,19 +19,16 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -@SuppressWarnings({"unused", "SameParameterValue"}) +@Slf4j @SuppressWarnings({"unused", "SameParameterValue"}) abstract class AbstractConfig { File file; YamlConfiguration yaml; - private static Logger logger = null; - AbstractConfig(PlayerUtils playerUtils, String filename, Logger logger) { - AbstractConfig.logger = logger; + AbstractConfig(PlayerUtils playerUtils, String filename) { init(new File(playerUtils.getDataFolder(), filename), filename); } - AbstractConfig(File file, String filename, Logger logger) { - AbstractConfig.logger = logger; + AbstractConfig(File file, String filename) { init(new File(file.getPath() + File.separator + filename), filename); } @@ -41,10 +38,9 @@ abstract class AbstractConfig { try { yaml.load(file); } catch (IOException ignore) { - } catch (InvalidConfigurationException ex) { - if (logger != null) - logger.severe(String.format("Could not load %s, please correct your syntax errors", filename)); - throw new RuntimeException(ex); + } catch (InvalidConfigurationException e) { + log.error("Could not load {}, please correct your syntax errors", filename, e); + throw new RuntimeException(e); } yaml.options().copyDefaults(true); } @@ -59,10 +55,8 @@ abstract class AbstractConfig { method.invoke(instance); } catch (InvocationTargetException ex) { throw new RuntimeException(ex.getCause()); - } catch (Exception ex) { - if (logger != null) - logger.severe("Error invoking %.", method.toString()); - ex.printStackTrace(); + } catch (Exception e) { + log.error("Error invoking {}.", method, e); } } } @@ -75,10 +69,8 @@ abstract class AbstractConfig { private void save() { try { yaml.save(file); - } catch (IOException ex) { - if (logger != null) - logger.severe("Could not save %.", file.toString()); - ex.printStackTrace(); + } catch (IOException e) { + log.error("Could not save {}.", file.toString(), e); } } @@ -150,4 +142,4 @@ abstract class AbstractConfig { ConfigurationSection getConfigurationSection(String path) { return yaml.getConfigurationSection(path); } -} \ No newline at end of file +} diff --git a/src/main/java/com/alttd/playerutils/config/Config.java b/src/main/java/com/alttd/playerutils/config/Config.java index a8f9e53..8d52089 100644 --- a/src/main/java/com/alttd/playerutils/config/Config.java +++ b/src/main/java/com/alttd/playerutils/config/Config.java @@ -1,31 +1,28 @@ package com.alttd.playerutils.config; -import com.alttd.playerutils.util.Logger; +import lombok.extern.slf4j.Slf4j; import org.bukkit.configuration.ConfigurationSection; import java.io.File; import java.util.HashMap; -import java.util.List; import java.util.Set; -public class Config extends AbstractConfig{ +@Slf4j public class Config extends AbstractConfig{ static Config config; - private Logger logger; - Config(Logger logger) { + Config() { super( new File(File.separator + "mnt" + File.separator + "configs" + File.separator + "PlayerUtils"), - "config.yml", logger); - this.logger = logger; + "config.yml"); } - public static void reload(Logger logger) { - logger.info("Reloading config"); - config = new Config(logger); + public static void reload() { + log.info("Reloading config"); + config = new Config(); config.readConfig(Config.class, null); } @@ -50,7 +47,7 @@ public class Config extends AbstractConfig{ CRATES.clear(); ConfigurationSection configurationSection = config.getConfigurationSection(prefix.substring(0, prefix.length() - 1)); if (configurationSection == null) { - config.logger.warning("No keys configured, adding default"); + log.warn("No keys configured, adding default"); config.set(prefix, "dailyvotecrate", 0); config.set(prefix, "weeklyvotecrate", 0); config.set(prefix, "questcrate", 0); @@ -73,7 +70,7 @@ public class Config extends AbstractConfig{ LIMIT.clear(); ConfigurationSection configurationSection = config.getConfigurationSection(prefix.substring(0, prefix.length() - 1)); if (configurationSection == null) { - config.logger.warning("No limits configured, adding default"); + log.warn("No limits configured, adding default"); config.set(prefix, "default", 10); } Set limits = configurationSection.getKeys(false); diff --git a/src/main/java/com/alttd/playerutils/config/KeyStorage.java b/src/main/java/com/alttd/playerutils/config/KeyStorage.java index 82568ee..dbb9d96 100644 --- a/src/main/java/com/alttd/playerutils/config/KeyStorage.java +++ b/src/main/java/com/alttd/playerutils/config/KeyStorage.java @@ -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 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 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))); diff --git a/src/main/java/com/alttd/playerutils/config/Messages.java b/src/main/java/com/alttd/playerutils/config/Messages.java index 42d1139..040e32a 100644 --- a/src/main/java/com/alttd/playerutils/config/Messages.java +++ b/src/main/java/com/alttd/playerutils/config/Messages.java @@ -1,27 +1,22 @@ package com.alttd.playerutils.config; -import com.alttd.playerutils.util.Logger; -import org.jetbrains.annotations.NotNull; - import java.io.File; import java.util.List; public class Messages extends AbstractConfig { static Messages config; - private final Logger logger; - Messages(Logger logger) { + Messages() { super( new File(File.separator + "mnt" + File.separator + "configs" + File.separator + "PlayerUtils"), - "messages.yml", logger); - this.logger = logger; + "messages.yml"); } - public static void reload(Logger logger) { - config = new Messages(logger); + public static void reload() { + config = new Messages(); config.readConfig(Messages.class, null); } diff --git a/src/main/java/com/alttd/playerutils/event_listeners/BlockBlockUseEvent.java b/src/main/java/com/alttd/playerutils/event_listeners/BlockBlockUseEvent.java index e823807..d7a87c4 100644 --- a/src/main/java/com/alttd/playerutils/event_listeners/BlockBlockUseEvent.java +++ b/src/main/java/com/alttd/playerutils/event_listeners/BlockBlockUseEvent.java @@ -1,10 +1,8 @@ package com.alttd.playerutils.event_listeners; import com.alttd.playerutils.config.Messages; -import com.alttd.playerutils.util.Logger; import com.destroystokyo.paper.MaterialTags; import org.bukkit.Material; -import org.bukkit.Tag; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -15,12 +13,6 @@ import org.bukkit.inventory.ItemStack; public class BlockBlockUseEvent implements Listener { - private final Logger logger; - - public BlockBlockUseEvent(Logger logger) { - this.logger = logger; - } - @EventHandler public void onBlockPlace(BlockCanBuildEvent event) { Player player = event.getPlayer(); diff --git a/src/main/java/com/alttd/playerutils/event_listeners/GhastSpeedEvent.java b/src/main/java/com/alttd/playerutils/event_listeners/GhastSpeedEvent.java index 3a6232b..4417966 100644 --- a/src/main/java/com/alttd/playerutils/event_listeners/GhastSpeedEvent.java +++ b/src/main/java/com/alttd/playerutils/event_listeners/GhastSpeedEvent.java @@ -1,7 +1,6 @@ package com.alttd.playerutils.event_listeners; import com.alttd.playerutils.data_objects.GHAST_SPEED; -import com.alttd.playerutils.util.Logger; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeInstance; import org.bukkit.entity.Entity; @@ -19,12 +18,10 @@ import java.util.UUID; public class GhastSpeedEvent implements Listener { private static final org.slf4j.Logger log = LoggerFactory.getLogger(GhastSpeedEvent.class); - private final Logger logger; private final HashMap lastSetSpeed = new HashMap<>(); - public GhastSpeedEvent(Logger logger) { - this.logger = logger; + public GhastSpeedEvent() { } @EventHandler diff --git a/src/main/java/com/alttd/playerutils/event_listeners/GoatHornEvent.java b/src/main/java/com/alttd/playerutils/event_listeners/GoatHornEvent.java index 9e5293d..6911ee7 100644 --- a/src/main/java/com/alttd/playerutils/event_listeners/GoatHornEvent.java +++ b/src/main/java/com/alttd/playerutils/event_listeners/GoatHornEvent.java @@ -1,6 +1,6 @@ package com.alttd.playerutils.event_listeners; -import com.alttd.playerutils.util.Logger; +import lombok.extern.slf4j.Slf4j; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -11,13 +11,7 @@ import org.bukkit.inventory.ItemStack; import java.util.concurrent.TimeUnit; -public class GoatHornEvent implements Listener { - - private final Logger logger; - - public GoatHornEvent(Logger logger) { - this.logger = logger; - } +@Slf4j public class GoatHornEvent implements Listener { @EventHandler public void onPlayerInteract(PlayerInteractEvent event) { @@ -41,11 +35,10 @@ public class GoatHornEvent implements Listener { if (player.getLocation().distance(spawn) > 250) { - logger.info(String.format("Player %s with uuid %s used a goat horn", player.getName(), player.getUniqueId())); + log.info("Player {} with uuid {} used a goat horn", player.getName(), player.getUniqueId()); return; } - - logger.info(String.format("Player %s with uuid %s used a goat horn in spawn", player.getName(), player.getUniqueId())); + log.info("Player {} with uuid {} used a goat horn in spawn", player.getName(), player.getUniqueId()); player.setCooldown(Material.GOAT_HORN, (int) TimeUnit.MINUTES.toSeconds(5) * 20); } diff --git a/src/main/java/com/alttd/playerutils/event_listeners/LimitArmorStands.java b/src/main/java/com/alttd/playerutils/event_listeners/LimitArmorStands.java index c21abd8..97fb742 100644 --- a/src/main/java/com/alttd/playerutils/event_listeners/LimitArmorStands.java +++ b/src/main/java/com/alttd/playerutils/event_listeners/LimitArmorStands.java @@ -2,7 +2,7 @@ package com.alttd.playerutils.event_listeners; import com.alttd.playerutils.PlayerUtils; import com.alttd.playerutils.config.Config; -import com.alttd.playerutils.util.Logger; +import lombok.extern.slf4j.Slf4j; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; @@ -24,14 +24,12 @@ import org.jetbrains.annotations.NotNull; import java.util.Arrays; -public class LimitArmorStands implements Listener { +@Slf4j public class LimitArmorStands implements Listener { private final PlayerUtils playerUtils; - private final Logger logger; - public LimitArmorStands(PlayerUtils playerUtils, Logger logger) { + public LimitArmorStands(PlayerUtils playerUtils) { this.playerUtils = playerUtils; - this.logger = logger; } @FunctionalInterface @@ -89,7 +87,7 @@ public class LimitArmorStands implements Listener { NamespacedKey namespacedKey = NamespacedKey.fromString("armor_stand_count", playerUtils); if (namespacedKey == null) { event.setCancelled(true); - logger.warning("Unable to retrieve name spaced key for armor stand count."); + log.warn("Unable to retrieve name spaced key for armor stand count."); player.sendRichMessage("Something went wrong while checking the armor stand count. " + "You will not be able to place this until this is fixed. Please contact a staff member"); return; @@ -101,7 +99,7 @@ public class LimitArmorStands implements Listener { Integer armorStandCount = persistentDataContainer.get(namespacedKey, PersistentDataType.INTEGER); if (armorStandCount == null) { event.setCancelled(true); - logger.warning("Unable to retrieve armor stand count."); + log.warn("Unable to retrieve armor stand count."); player.sendRichMessage("Something went wrong while checking the armor stand count. " + "You will not be able to place this until this is fixed. Please contact a staff member"); return; diff --git a/src/main/java/com/alttd/playerutils/event_listeners/RotateBlockEvent.java b/src/main/java/com/alttd/playerutils/event_listeners/RotateBlockEvent.java index 86b9771..379ac34 100644 --- a/src/main/java/com/alttd/playerutils/event_listeners/RotateBlockEvent.java +++ b/src/main/java/com/alttd/playerutils/event_listeners/RotateBlockEvent.java @@ -1,6 +1,6 @@ package com.alttd.playerutils.event_listeners; -import com.alttd.playerutils.util.Logger; +import lombok.extern.slf4j.Slf4j; import org.bukkit.Axis; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -21,17 +21,12 @@ import org.bukkit.inventory.ItemStack; import java.util.*; import java.util.stream.Collectors; +@Slf4j public class RotateBlockEvent implements Listener { private final HashSet rotateEnabled = new HashSet<>(); - private final Logger logger; private static final List VALID_FOUR_STATES = List.of(BlockFace.NORTH, BlockFace.EAST, BlockFace.SOUTH, BlockFace.WEST); - public RotateBlockEvent(Logger logger) { - this.logger = logger; - } - - public synchronized boolean toggleRotate(UUID uuid) { if (rotateEnabled.contains(uuid)) { rotateEnabled.remove(uuid); @@ -61,7 +56,8 @@ public class RotateBlockEvent implements Listener { return; Material type = block.getType(); - logger.debug(String.format("Material %s with action %s", type, event.getAction().isLeftClick() ? "left click" : "right click")); + log.debug("Material {} with action {}", type, event.getAction().isLeftClick() ? "left " + + "click" : "right click"); if (type.equals(Material.IRON_TRAPDOOR) && event.getAction().isLeftClick()) { event.setCancelled(true); toggleTrapDoor(block, player); diff --git a/src/main/java/com/alttd/playerutils/event_listeners/VanillaPetTameEvent.java b/src/main/java/com/alttd/playerutils/event_listeners/VanillaPetTameEvent.java new file mode 100644 index 0000000..4771d9b --- /dev/null +++ b/src/main/java/com/alttd/playerutils/event_listeners/VanillaPetTameEvent.java @@ -0,0 +1,18 @@ +package com.alttd.playerutils.event_listeners; + +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.entity.EntityTameEvent; + +import java.util.UUID; + +public class VanillaPetTameEvent implements Listener { + + + + @EventHandler + public void onEntityTame(EntityTameEvent event) { + UUID uniqueId = event.getOwner().getUniqueId(); + } + +} diff --git a/src/main/java/com/alttd/playerutils/event_listeners/XpBottleEvent.java b/src/main/java/com/alttd/playerutils/event_listeners/XpBottleEvent.java index 2b4b595..153a399 100644 --- a/src/main/java/com/alttd/playerutils/event_listeners/XpBottleEvent.java +++ b/src/main/java/com/alttd/playerutils/event_listeners/XpBottleEvent.java @@ -2,7 +2,7 @@ package com.alttd.playerutils.event_listeners; import com.alttd.playerutils.PlayerUtils; import com.alttd.playerutils.config.Messages; -import com.alttd.playerutils.util.Logger; +import lombok.extern.slf4j.Slf4j; import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; @@ -25,15 +25,13 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; -public class XpBottleEvent implements Listener { +@Slf4j public class XpBottleEvent implements Listener { private final PlayerUtils playerUtils; - private final Logger logger; private final MiniMessage miniMessage = MiniMessage.miniMessage(); - public XpBottleEvent(PlayerUtils playerUtils, Logger logger) { + public XpBottleEvent(PlayerUtils playerUtils) { this.playerUtils = playerUtils; - this.logger = logger; } @EventHandler @@ -42,7 +40,7 @@ public class XpBottleEvent implements Listener { PersistentDataContainer persistentDataContainer = item.getItemMeta().getPersistentDataContainer(); NamespacedKey customXp = NamespacedKey.fromString("custom_xp", playerUtils); if (customXp == null) { - logger.warning("Unable to retrieve name spaced key."); + log.warn("Unable to retrieve name spaced key."); return; } Integer integer = persistentDataContainer.get(customXp, PersistentDataType.INTEGER); @@ -83,7 +81,7 @@ public class XpBottleEvent implements Listener { } for (Map.Entry, Integer> entry : recipesUsed.entrySet()) { - exp += entry.getKey().getExperience() * entry.getValue(); + exp += (int) (entry.getKey().getExperience() * entry.getValue()); } Optional optionalItemStack = getExpBottleItem(player, exp); diff --git a/src/main/java/com/alttd/playerutils/util/Logger.java b/src/main/java/com/alttd/playerutils/util/Logger.java deleted file mode 100644 index d9b9f9c..0000000 --- a/src/main/java/com/alttd/playerutils/util/Logger.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.alttd.playerutils.util; - -import com.alttd.playerutils.config.Config; - -public class Logger { - - private final java.util.logging.Logger logger; - static private final String RESET = "\u001B[0m"; - static private final String GREEN = "\u001B[32m"; - static private final String TEAL = "\u001B[36m"; - - public Logger(java.util.logging.Logger logger) { - this.logger = logger; - } - - public void debug(String debug, String... variables) { - if (!Config.SETTINGS.DEBUG) - return; - logger.info(TEAL + replace(debug, variables) + RESET); - } - - public void info(String info, String... variables) { - logger.info(GREEN + replace(info, variables) + RESET); - } - - public void warning(String warning, String... variables) { - if (!Config.SETTINGS.WARNINGS) - return; - logger.warning(replace(warning, variables)); - } - - public void severe(String severe, String... variables) { - logger.severe(replace(severe, variables)); - } - - private String replace(String text, String... variables) { - for (String variable : variables) { - text = text.replaceFirst("%", variable); - } - return text; - } -}