diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlus.java b/plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlus.java index 792cc47..195d888 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlus.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlus.java @@ -44,7 +44,7 @@ import lol.pyr.znpcsplus.updater.UpdateChecker; import lol.pyr.znpcsplus.updater.UpdateNotificationListener; import lol.pyr.znpcsplus.user.UserListener; import lol.pyr.znpcsplus.user.UserManager; -import lol.pyr.znpcsplus.util.BungeeUtil; +import lol.pyr.znpcsplus.util.BungeeConnector; import lol.pyr.znpcsplus.util.FoliaUtil; import lol.pyr.znpcsplus.util.LazyLoader; import lol.pyr.znpcsplus.util.ZLocation; @@ -110,7 +110,7 @@ public class ZNpcsPlus extends JavaPlugin { TaskScheduler scheduler = FoliaUtil.isFolia() ? new FoliaScheduler(this) : new SpigotScheduler(this); MetadataFactory metadataFactory = setupMetadataFactory(); PacketFactory packetFactory = setupPacketFactory(scheduler, metadataFactory); - BungeeUtil bungeeUtil = new BungeeUtil(this); + BungeeConnector bungeeConnector = new BungeeConnector(this); ConfigManager configManager = new ConfigManager(getDataFolder()); ActionRegistry actionRegistry = new ActionRegistry(); NpcRegistryImpl npcRegistry = new NpcRegistryImpl(configManager, this, packetFactory, actionRegistry); @@ -119,7 +119,7 @@ public class ZNpcsPlus extends JavaPlugin { log(ChatColor.WHITE+ " * Registerring components..."); NpcTypeImpl.defineTypes(packetEvents); - actionRegistry.registerTypes(npcRegistry, scheduler, adventure, bungeeUtil, textSerializer); + actionRegistry.registerTypes(npcRegistry, scheduler, adventure, bungeeConnector, textSerializer); packetEvents.getEventManager().registerListener(new InteractionPacketListener(userManager, npcRegistry), PacketListenerPriority.MONITOR); new Metrics(this, PLUGIN_ID); pluginManager.registerEvents(new UserListener(userManager), this); diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/interaction/ActionRegistry.java b/plugin/src/main/java/lol/pyr/znpcsplus/interaction/ActionRegistry.java index 98b72ae..ba2a477 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/interaction/ActionRegistry.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/interaction/ActionRegistry.java @@ -6,7 +6,7 @@ import lol.pyr.znpcsplus.interaction.playercommand.PlayerCommandActionType; import lol.pyr.znpcsplus.interaction.switchserver.SwitchServerActionType; import lol.pyr.znpcsplus.npc.NpcRegistryImpl; import lol.pyr.znpcsplus.scheduling.TaskScheduler; -import lol.pyr.znpcsplus.util.BungeeUtil; +import lol.pyr.znpcsplus.util.BungeeConnector; import lol.pyr.znpcsplus.util.StringSerializer; import net.kyori.adventure.platform.bukkit.BukkitAudiences; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; @@ -23,10 +23,10 @@ public class ActionRegistry { public ActionRegistry() { } - public void registerTypes(NpcRegistryImpl npcRegistry, TaskScheduler taskScheduler, BukkitAudiences adventure, BungeeUtil bungeeUtil, LegacyComponentSerializer textSerializer) { + public void registerTypes(NpcRegistryImpl npcRegistry, TaskScheduler taskScheduler, BukkitAudiences adventure, BungeeConnector bungeeConnector, LegacyComponentSerializer textSerializer) { register(new ConsoleCommandActionType(taskScheduler, npcRegistry)); register(new PlayerCommandActionType(taskScheduler, npcRegistry)); - register(new SwitchServerActionType(bungeeUtil, npcRegistry)); + register(new SwitchServerActionType(bungeeConnector, npcRegistry)); register(new MessageActionType(adventure, textSerializer, npcRegistry)); } diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/interaction/switchserver/SwitchServerAction.java b/plugin/src/main/java/lol/pyr/znpcsplus/interaction/switchserver/SwitchServerAction.java index be7351f..c2fb557 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/interaction/switchserver/SwitchServerAction.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/interaction/switchserver/SwitchServerAction.java @@ -1,22 +1,22 @@ package lol.pyr.znpcsplus.interaction.switchserver; import lol.pyr.znpcsplus.interaction.InteractionAction; -import lol.pyr.znpcsplus.util.BungeeUtil; +import lol.pyr.znpcsplus.util.BungeeConnector; import org.bukkit.entity.Player; public class SwitchServerAction extends InteractionAction { - private final BungeeUtil bungeeUtil; + private final BungeeConnector bungeeConnector; private final String server; - public SwitchServerAction(BungeeUtil bungeeUtil, String server, long delay) { + public SwitchServerAction(BungeeConnector bungeeConnector, String server, long delay) { super(delay); - this.bungeeUtil = bungeeUtil; + this.bungeeConnector = bungeeConnector; this.server = server; } @Override public void run(Player player) { - bungeeUtil.sendPlayerToServer(player, server); + bungeeConnector.sendPlayer(player, server); } public String getServer() { diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/interaction/switchserver/SwitchServerActionType.java b/plugin/src/main/java/lol/pyr/znpcsplus/interaction/switchserver/SwitchServerActionType.java index 1dcf45c..79b95a3 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/interaction/switchserver/SwitchServerActionType.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/interaction/switchserver/SwitchServerActionType.java @@ -6,7 +6,7 @@ import lol.pyr.znpcsplus.interaction.InteractionActionType; import lol.pyr.znpcsplus.interaction.InteractionCommandHandler; import lol.pyr.znpcsplus.npc.NpcEntryImpl; import lol.pyr.znpcsplus.npc.NpcRegistryImpl; -import lol.pyr.znpcsplus.util.BungeeUtil; +import lol.pyr.znpcsplus.util.BungeeConnector; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; @@ -16,11 +16,11 @@ import java.util.Collections; import java.util.List; public class SwitchServerActionType implements InteractionActionType, InteractionCommandHandler { - private final BungeeUtil bungeeUtil; + private final BungeeConnector bungeeConnector; private final NpcRegistryImpl npcRegistry; - public SwitchServerActionType(BungeeUtil bungeeUtil, NpcRegistryImpl npcRegistry) { - this.bungeeUtil = bungeeUtil; + public SwitchServerActionType(BungeeConnector bungeeConnector, NpcRegistryImpl npcRegistry) { + this.bungeeConnector = bungeeConnector; this.npcRegistry = npcRegistry; } @@ -32,7 +32,7 @@ public class SwitchServerActionType implements InteractionActionType