From 42439019b74001a1f5cc629c7a07d74801cb169f Mon Sep 17 00:00:00 2001 From: aro Date: Mon, 16 Jan 2023 18:27:07 +0100 Subject: [PATCH] style: better code naming/conventions --- .../main/java/net/artelnatif/nicko/NickoBukkit.java | 8 ++++---- .../ServerUtils.java => bungee/BungeeCordSupport.java} | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) rename nicko-core/src/main/java/net/artelnatif/nicko/{utils/ServerUtils.java => bungee/BungeeCordSupport.java} (87%) diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/NickoBukkit.java b/nicko-core/src/main/java/net/artelnatif/nicko/NickoBukkit.java index 0714f39..45472f2 100644 --- a/nicko-core/src/main/java/net/artelnatif/nicko/NickoBukkit.java +++ b/nicko-core/src/main/java/net/artelnatif/nicko/NickoBukkit.java @@ -17,7 +17,7 @@ import net.artelnatif.nicko.mojang.MojangAPI; import net.artelnatif.nicko.placeholder.PlaceHolderHook; import net.artelnatif.nicko.pluginchannel.PluginMessageHandler; import net.artelnatif.nicko.storage.PlayerDataStore; -import net.artelnatif.nicko.utils.ServerUtils; +import net.artelnatif.nicko.bungee.BungeeCordSupport; import org.bukkit.Material; import org.bukkit.command.PluginCommand; import org.bukkit.plugin.PluginDescriptionFile; @@ -135,10 +135,10 @@ public class NickoBukkit extends JavaPlugin { getServer().getPluginManager().registerEvents(new PlayerJoinListener(), this); getServer().getPluginManager().registerEvents(new PlayerQuitListener(), this); - final ServerUtils serverUtils = new ServerUtils(this); - serverUtils.checkSpigotBungeeCordHook(); + final BungeeCordSupport support = new BungeeCordSupport(this); + support.warnNickoNotHookedToBungeeCord(); if (config.isBungeecordSupport()) { - if (serverUtils.checkBungeeCordHook()) { + if (support.stopIfBungeeCordIsNotEnabled()) { getLogger().info("Enabling BungeeCord support..."); getServer().getMessenger().registerIncomingPluginChannel(this, NickoBungee.NICKO_PLUGIN_CHANNEL_UPDATE, new PluginMessageHandler()); } diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/utils/ServerUtils.java b/nicko-core/src/main/java/net/artelnatif/nicko/bungee/BungeeCordSupport.java similarity index 87% rename from nicko-core/src/main/java/net/artelnatif/nicko/utils/ServerUtils.java rename to nicko-core/src/main/java/net/artelnatif/nicko/bungee/BungeeCordSupport.java index 835ed6e..6a524ea 100644 --- a/nicko-core/src/main/java/net/artelnatif/nicko/utils/ServerUtils.java +++ b/nicko-core/src/main/java/net/artelnatif/nicko/bungee/BungeeCordSupport.java @@ -1,17 +1,17 @@ -package net.artelnatif.nicko.utils; +package net.artelnatif.nicko.bungee; import net.artelnatif.nicko.NickoBukkit; import org.bukkit.Server; import org.bukkit.configuration.file.YamlConfiguration; -public class ServerUtils { +public class BungeeCordSupport { private final NickoBukkit instance; - public ServerUtils(NickoBukkit instance) { + public BungeeCordSupport(NickoBukkit instance) { this.instance = instance; } - public void checkSpigotBungeeCordHook() { + public void warnNickoNotHookedToBungeeCord() { final Server server = instance.getServer(); final YamlConfiguration config = server.spigot().getConfig(); if (config.getConfigurationSection("settings").getBoolean("bungeecord") && instance.getNickoConfig().isBungeecordSupport()) { @@ -22,7 +22,7 @@ public class ServerUtils { } } - public boolean checkBungeeCordHook() { + public boolean stopIfBungeeCordIsNotEnabled() { final Server server = instance.getServer(); final YamlConfiguration config = server.spigot().getConfig(); if (!config.getConfigurationSection("settings").getBoolean("bungeecord")) {