From da4d09de7babd4e82075aa658aaf70a71a7dd243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Fern=C3=A1ndez?= Date: Fri, 25 Nov 2022 22:13:52 +0100 Subject: [PATCH] fix: incorrect imports --- .../v4guard/plugin/velocity/VelocityCheckProcessor.java | 3 +-- .../plugin/velocity/accounts/VelocityMessageReceiver.java | 3 +-- .../plugin/velocity/listener/PluginMessagingListener.java | 8 +++----- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/io/v4guard/plugin/velocity/VelocityCheckProcessor.java b/src/main/java/io/v4guard/plugin/velocity/VelocityCheckProcessor.java index 339983a..4cfcea1 100644 --- a/src/main/java/io/v4guard/plugin/velocity/VelocityCheckProcessor.java +++ b/src/main/java/io/v4guard/plugin/velocity/VelocityCheckProcessor.java @@ -5,7 +5,6 @@ import com.velocitypowered.api.event.connection.PostLoginEvent; import com.velocitypowered.api.event.connection.PreLoginEvent; import com.velocitypowered.api.proxy.Player; -import io.v4guard.plugin.bungee.v4GuardBungee; import io.v4guard.plugin.core.check.CheckProcessor; import io.v4guard.plugin.core.check.common.CheckStatus; import io.v4guard.plugin.core.check.common.VPNCheck; @@ -98,7 +97,7 @@ public void complete(boolean nameIsValid) { if(nameIsValid){ - Document privacySettings = (Document) v4GuardBungee.getCoreInstance().getBackendConnector().getSettings().getOrDefault("privacy", new Document()); + Document privacySettings = (Document) v4GuardVelocity.getCoreInstance().getBackendConnector().getSettings().getOrDefault("privacy", new Document()); boolean anonVirtualHost = privacySettings.getBoolean("anonVirtualHost", true); String virtualHost = "notFound"; diff --git a/src/main/java/io/v4guard/plugin/velocity/accounts/VelocityMessageReceiver.java b/src/main/java/io/v4guard/plugin/velocity/accounts/VelocityMessageReceiver.java index 4c086c5..ebed306 100644 --- a/src/main/java/io/v4guard/plugin/velocity/accounts/VelocityMessageReceiver.java +++ b/src/main/java/io/v4guard/plugin/velocity/accounts/VelocityMessageReceiver.java @@ -7,7 +7,6 @@ import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.messages.LegacyChannelIdentifier; import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier; -import io.v4guard.plugin.bungee.v4GuardBungee; import io.v4guard.plugin.core.accounts.auth.AuthType; import io.v4guard.plugin.core.accounts.auth.Authentication; import io.v4guard.plugin.core.accounts.messaging.MessageReceiver; @@ -29,7 +28,7 @@ public VelocityMessageReceiver(v4GuardVelocity plugin) { @Subscribe(order = PostOrder.FIRST) public void onMessage(PluginMessageEvent e){ - boolean invalidatedCache = (boolean) v4GuardBungee.getCoreInstance().getBackendConnector().getSettings().getOrDefault("invalidateCache", false); + boolean invalidatedCache = (boolean) v4GuardVelocity.getCoreInstance().getBackendConnector().getSettings().getOrDefault("invalidateCache", false); if(invalidatedCache) return; if (!e.getIdentifier().getId().equals(MessageReceiver.VELOCITY_CHANNEL)) { return; diff --git a/src/main/java/io/v4guard/plugin/velocity/listener/PluginMessagingListener.java b/src/main/java/io/v4guard/plugin/velocity/listener/PluginMessagingListener.java index b4c566f..bd7b044 100644 --- a/src/main/java/io/v4guard/plugin/velocity/listener/PluginMessagingListener.java +++ b/src/main/java/io/v4guard/plugin/velocity/listener/PluginMessagingListener.java @@ -6,14 +6,12 @@ import com.velocitypowered.api.proxy.Player; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; -import io.v4guard.plugin.bungee.v4GuardBungee; import io.v4guard.plugin.core.tasks.types.CompletableMCBrandTask; import io.v4guard.plugin.core.utils.StringUtils; import io.v4guard.plugin.velocity.v4GuardVelocity; -import net.md_5.bungee.api.plugin.Listener; import org.bson.Document; -public class PluginMessagingListener implements Listener { +public class PluginMessagingListener { @Subscribe(order = PostOrder.FIRST) public void onMessage(PluginMessageEvent e){ @@ -23,12 +21,12 @@ public void onMessage(PluginMessageEvent e){ if(e.getSource() instanceof Player){ if(e.getIdentifier().getId().equals("MC|Brand") || e.getIdentifier().getId().equals("minecraft:brand")){ Player player = (Player) e.getSource(); - CompletableMCBrandTask task = v4GuardBungee.getCoreInstance().getCompletableTaskManager().getBrandTask(player.getUsername()); + CompletableMCBrandTask task = v4GuardVelocity.getCoreInstance().getCompletableTaskManager().getBrandTask(player.getUsername()); if(task == null) task = new CompletableMCBrandTask(player.getUsername()); task.addData(new String(e.getData())); } else if (e.getIdentifier().getId().equals("LMC") || e.getIdentifier().getId().equals("labymod3:main")){ Player player = (Player) e.getSource(); - CompletableMCBrandTask task = v4GuardBungee.getCoreInstance().getCompletableTaskManager().getBrandTask(player.getUsername()); + CompletableMCBrandTask task = v4GuardVelocity.getCoreInstance().getCompletableTaskManager().getBrandTask(player.getUsername()); if(task == null) task = new CompletableMCBrandTask(player.getUsername()); ByteBuf buf = Unpooled.wrappedBuffer(e.getData()); String key = StringUtils.readString(buf, Short.MAX_VALUE);