Skip to content

Commit

Permalink
cleanup: code reorganization
Browse files Browse the repository at this point in the history
  • Loading branch information
samfces committed Jun 15, 2023
1 parent f2ba943 commit bdcd066
Show file tree
Hide file tree
Showing 6 changed files with 83 additions and 65 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import io.socket.client.Socket;
import io.socket.emitter.Emitter;
import io.v4guard.plugin.core.socket.listener.*;
import io.v4guard.plugin.core.socket.listener.messaging.MessageListener;
import io.v4guard.plugin.core.utils.HashCalculator;
import io.v4guard.plugin.core.v4GuardCore;
import org.bson.Document;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package io.v4guard.plugin.core.socket.listener.messaging;

import io.socket.emitter.Emitter;
import io.v4guard.plugin.core.socket.BackendConnector;
import io.v4guard.plugin.core.v4GuardCore;

public class MessageListener implements Emitter.Listener {

BackendConnector backendConnector;

public MessageListener(BackendConnector backendConnector) {
this.backendConnector = backendConnector;
}

@Override
public void call(Object... args) {
switch (v4GuardCore.getInstance().getPluginMode()){
case BUNGEE: {
MessageListenerBungeeProcess.process(args);
break;
}
case VELOCITY: {
MessageListenerVelocityProcess.process(args);
break;
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package io.v4guard.plugin.core.socket.listener.messaging;

import io.v4guard.plugin.bungee.v4GuardBungee;
import org.bson.Document;

import java.util.ArrayList;
import java.util.List;

public class MessageListenerBungeeProcess {

public static void process(Object... args) {
Document doc = Document.parse(args[0].toString());
String permission = doc.getOrDefault("permission", "no-permission").toString();
List<String> players = (List<String>) doc.getOrDefault("players", new ArrayList<>());
String message = (String) doc.getOrDefault("message", "Disconnected");
if(!permission.equals("no-permission")){
List<String> broadcasted = v4GuardBungee.getV4Guard().getMessager().broadcastWithPermission(message, permission);
players.removeAll(broadcasted);
}
for(String player : players){
v4GuardBungee.getV4Guard().getMessager().sendToPlayer(message, player);
}

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package io.v4guard.plugin.core.socket.listener.messaging;

import io.v4guard.plugin.velocity.v4GuardVelocity;
import org.bson.Document;

import java.util.ArrayList;
import java.util.List;

public class MessageListenerVelocityProcess {

public static void process(Object... args) {
Document doc = Document.parse(args[0].toString());
String permission = doc.getOrDefault("permission", "no-permission").toString();
List<String> players = (List<String>) doc.getOrDefault("players", new ArrayList<>());
String message = (String) doc.getOrDefault("message", "Disconnected");
if(!permission.equals("no-permission")) {
List<String> broadcasted = v4GuardVelocity.getV4Guard().getMessager().broadcastWithPermission(message, permission);
players.removeAll(broadcasted);
}
for(String player : players){
v4GuardVelocity.getV4Guard().getMessager().sendToPlayer(message, player);
}

}
}
16 changes: 4 additions & 12 deletions src/main/java/io/v4guard/plugin/velocity/v4GuardVelocity.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,13 @@
import com.velocitypowered.api.event.Subscribe;
import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
import com.velocitypowered.api.event.proxy.ProxyShutdownEvent;
import com.velocitypowered.api.plugin.Dependency;
import com.velocitypowered.api.plugin.Plugin;
import com.velocitypowered.api.proxy.ProxyServer;
import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier;
import io.v4guard.plugin.core.accounts.AccountShieldManager;
import io.v4guard.plugin.core.mode.v4GuardMode;
import io.v4guard.plugin.core.v4GuardCore;
import io.v4guard.plugin.velocity.accounts.VelocityMessageReceiver;
import io.v4guard.plugin.velocity.listener.AntiVPNListener;
import io.v4guard.plugin.velocity.listener.PlayerBrandListener;
import io.v4guard.plugin.velocity.listener.PluginMessagingListener;
import io.v4guard.plugin.velocity.messager.Messager;
import net.kyori.adventure.text.Component;
Expand All @@ -27,10 +24,10 @@
version = v4GuardCore.pluginVersion,
url = "https://v4guard.io",
description = "v4Guard Plugin for Minecraft Servers",
authors = {"DigitalSynware"},
dependencies = {
@Dependency(id = "v4guard-account-shield", optional = true)
}
authors = {"DigitalSynware"}
// dependencies = {
// @Dependency(id = "v4guard-account-shield", optional = true)
// }

)
public class v4GuardVelocity {
Expand Down Expand Up @@ -76,13 +73,8 @@ public void onProxyInitialization(ProxyInitializeEvent event) {
return;
}
v4GuardVelocity = this;

server.getChannelRegistrar().register(MinecraftChannelIdentifier.from("labymod3:main"));
server.getChannelRegistrar().register(MinecraftChannelIdentifier.create("labymod3", "main"));

server.getEventManager().register(this, new AntiVPNListener());
server.getEventManager().register(this, new PluginMessagingListener());
server.getEventManager().register(this, new PlayerBrandListener());
server.getConsoleCommandSource().sendMessage(
Component.text("§e[v4guard-plugin] (Velocity) Enabling... [DONE]")
);
Expand Down

0 comments on commit bdcd066

Please sign in to comment.