funkemunky/AntiVPN
1
0
Fork 0
mirror of https://github.com/funkemunky/AntiVPN.git synced 2026-05-31 09:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Got Sponge support working, need to ensure other plugins are still working tho

Browse Source
This commit is contained in:
Dawson
2025-05-28 15:42:43 -04:00
parent 7247341693
commit 68a2acce00
9 changed files with 285 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/src/main/java/dev/brighten/antivpn/api/APIPlayer.java
+4 -1
View File
@@ -54,7 +54,10 @@ public abstract class APIPlayer {
CheckResult cachedResult = checkResultCache.getIfPresent(ip.getHostAddress());
if(cachedResult != null) {
return cachedResult;
if(cachedResult.response().getIp().equals(ip.getHostAddress())) {
AntiVPN.getInstance().getExecutor().log(Level.FINE, "Cached result for " + ip.getHostAddress() + " is " + cachedResult.resultType());
return cachedResult;
}
}
AntiVPN.getInstance().getExecutor().checkIp(ip.getHostAddress())
Common/src/main/java/dev/brighten/antivpn/depends/LibraryLoader.java
+8 -2
View File
@@ -55,14 +55,20 @@ import java.util.jar.JarOutputStream;
public final class LibraryLoader {
@SuppressWarnings("Guava")
private static final Supplier<URLClassLoaderAccess> URL_INJECTOR = Suppliers.memoize(() ->
URLClassLoaderAccess.create((URLClassLoader) AntiVPN.getInstance().getClass().getClassLoader()));
private static final Supplier<URLClassLoaderAccess> URL_INJECTOR = AntiVPN.getInstance().getClass().getClassLoader() instanceof URLClassLoader ?
Suppliers.memoize(() ->
URLClassLoaderAccess.create((URLClassLoader) AntiVPN.getInstance().getClass().getClassLoader()))
: null;
public static void loadAll(Object object) {
if(URL_INJECTOR == null)
return;
loadAll(object.getClass());
}
public static void loadAll(Class<?> clazz) {
if(URL_INJECTOR == null)
return;
MavenLibrary[] libs = clazz.getDeclaredAnnotationsByType(MavenLibrary.class);
for (MavenLibrary lib : libs) {
Sponge/pom.xml
+96 -1
View File
@@ -29,7 +29,32 @@
<groupId>dev.brighten.antivpn</groupId>
<artifactId>Common</artifactId>
<version>1.9.4-DEV</version>
<scope>provided</scope>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<version>3.1.8</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
<version>3.12.14</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>9.1.0</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>2.2.220</version>
<scope>compile</scope>
</dependency>
</dependencies>
@@ -61,7 +86,77 @@
<goal>shade</goal>
</goals>
<configuration>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>com/google/**</exclude>
<exclude>org/objectweb/**</exclude>
<exclude>org/checkerframework/**</exclude>
</excludes>
</filter>
</filters>
<relocations>
<relocation>
<pattern>org.yaml.snakeyaml</pattern>
<shadedPattern>dev.brighten.antivpn.shaded.org.yaml.snakeyaml</shadedPattern>
<excludes>
<!-- Exclude annotation values from relocation -->
<exclude>dev.brighten.antivpn.depends.Relocate</exclude>
<exclude>dev.brighten.antivpn.depends.MavenLibraries</exclude>
</excludes>
</relocation>
<relocation>
<pattern>com.github.benmanes.caffeine</pattern>
<shadedPattern>dev.brighten.antivpn.com.github.benmanes.caffeine</shadedPattern>
</relocation>
<relocation>
<pattern>org.h2</pattern>
<shadedPattern>dev.brighten.antivpn.shaded.org.h2</shadedPattern>
<excludes>
<!-- Exclude annotation values from relocation -->
<exclude>dev.brighten.antivpn.depends.Relocate</exclude>
<exclude>dev.brighten.antivpn.depends.MavenLibraries</exclude>
</excludes>
</relocation>
<relocation>
<pattern>org.bson</pattern>
<shadedPattern>dev.brighten.antivpn.shaded.org.bson</shadedPattern>
<excludes>
<!-- Exclude annotation values from relocation -->
<exclude>dev.brighten.antivpn.depends.Relocate</exclude>
<exclude>dev.brighten.antivpn.depends.MavenLibraries</exclude>
</excludes>
</relocation>
<relocation>
<pattern>com.mongodb</pattern>
<shadedPattern>dev.brighten.antivpn.shaded.com.mongodb</shadedPattern>
<excludes>
<!-- Exclude annotation values from relocation -->
<exclude>dev.brighten.antivpn.depends.Relocate</exclude>
<exclude>dev.brighten.antivpn.depends.MavenLibraries</exclude>
</excludes>
</relocation>
<relocation>
<pattern>com.mysql.cj</pattern>
<shadedPattern>dev.brighten.antivpn.shaded.com.mysql.cj</shadedPattern>
<excludes>
<!-- Exclude annotation values from relocation -->
<exclude>dev.brighten.antivpn.depends.Relocate</exclude>
<exclude>dev.brighten.antivpn.depends.MavenLibraries</exclude>
</excludes>
</relocation>
<relocation>
<pattern>com.mysql.jdbc</pattern>
<shadedPattern>dev.brighten.antivpn.shaded.com.mysql.jdbc</shadedPattern>
<excludes>
<!-- Exclude annotation values from relocation -->
<exclude>dev.brighten.antivpn.depends.Relocate</exclude>
<exclude>dev.brighten.antivpn.depends.MavenLibraries</exclude>
</excludes>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
Sponge/src/main/java/dev/brighten/antivpn/sponge/SpongeListener.java
+1 -1
View File
@@ -101,6 +101,6 @@ public class SpongeListener extends VPNExecutor {
@Override
public void disablePlugin() {
Sponge.eventManager().unregisterListeners(this);
AntiVPN.getInstance().getExecutor().log(Level.INFO, "Disabling listeners for plugin...");
}
}
Sponge/src/main/java/dev/brighten/antivpn/sponge/SpongePlayerExecutor.java
+2
View File
@@ -7,6 +7,7 @@ import dev.brighten.antivpn.api.PlayerExecutor;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.entity.living.player.server.ServerPlayer;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
@@ -49,6 +50,7 @@ public class SpongePlayerExecutor implements PlayerExecutor {
@Override
public List<APIPlayer> getOnlinePlayers() {
if(!Sponge.game().isServerAvailable()) return Collections.emptyList();
return Sponge.server().onlinePlayers()
.stream()
.map(pl -> {
Sponge/src/main/java/dev/brighten/antivpn/sponge/SpongePlugin.java
+21 -16
View File
@@ -2,38 +2,35 @@ package dev.brighten.antivpn.sponge;
import com.google.inject.Inject;
import dev.brighten.antivpn.AntiVPN;
import dev.brighten.antivpn.sponge.command.SpongeCommand;
import lombok.Getter;
import org.spongepowered.api.Server;
import org.apache.logging.log4j.Logger;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.command.Command;
import org.spongepowered.api.config.ConfigManager;
import org.spongepowered.api.event.Listener;
import org.spongepowered.api.event.lifecycle.*;
import org.spongepowered.plugin.PluginContainer;
import org.spongepowered.plugin.builtin.jvm.Plugin;
import java.nio.file.Path;
@Plugin("kaurivpn")
@Getter
public class SpongePlugin {
//Plugin init
private final PluginContainer container;
private final Logger logger;
@Inject
SpongePlugin(final PluginContainer container, final Logger logger) {
this.container = container;
this.logger = logger;
}
private PluginContainer container;
@Inject
private Logger logger;
@Getter
private static SpongePlugin instance;
@Listener
public void onServerStart(final ConstructPluginEvent event) {
//Start AntiVPN
public void onConstruct(final ConstructPluginEvent event) {
instance = this;
ConfigManager configManager = Sponge.game().configManager();
ConfigManager configManager = Sponge.configManager();
SpongeListener spongeListener = new SpongeListener();
var path = configManager.sharedConfig(container).directory();
@@ -48,8 +45,16 @@ public class SpongePlugin {
AntiVPN.getInstance().getExecutor().disablePlugin();
}
public static SpongePlugin getInstance() {
return (SpongePlugin) Sponge.pluginManager().plugin("kaurivpn").get();
@Listener
public void onRegisterRawCommands(final RegisterCommandEvent<Command.Raw> event){
if(AntiVPN.getInstance() == null) {
for(int i = 0 ; i < 5 ; i++) System.out.println("FUCKING NULL");
return;
}
AntiVPN.getInstance().getExecutor().log("Registering commands...");
for (dev.brighten.antivpn.command.Command command : AntiVPN.getInstance().getCommands()) {
AntiVPN.getInstance().getExecutor().log("Registering command %s...", command.name());
event.register(this.container, new SpongeCommand(command), command.name(), command.aliases());
}
}
}
Sponge/src/main/java/dev/brighten/antivpn/sponge/command/SpongeCommand.java
+111
View File
@@ -0,0 +1,111 @@
package dev.brighten.antivpn.sponge.command;
import dev.brighten.antivpn.AntiVPN;
import dev.brighten.antivpn.command.Command;
import dev.brighten.antivpn.command.CommandExecutor;
import dev.brighten.antivpn.utils.StringUtil;
import lombok.val;
import net.kyori.adventure.text.Component;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.spongepowered.api.command.CommandCause;
import org.spongepowered.api.command.CommandCompletion;
import org.spongepowered.api.command.CommandResult;
import org.spongepowered.api.command.parameter.ArgumentReader;
import java.util.*;
import java.util.stream.IntStream;
public class SpongeCommand implements org.spongepowered.api.command.Command.Raw {
private final Command command;
public SpongeCommand(Command command) {
this.command = command;
}
@Override
public CommandResult process(CommandCause sender, ArgumentReader.Mutable arguments) {
String[] args = arguments.input().split(" ");
CommandExecutor commandExecutor = new SpongeCommandExecutor(sender);
val children = command.children();
if(children.length > 0 && args.length > 0) {
for (dev.brighten.antivpn.command.Command child : children) {
if(child.name().equalsIgnoreCase(args[0]) || Arrays.stream(child.aliases())
.anyMatch(alias -> alias.equalsIgnoreCase(args[0]))) {
if(!sender.hasPermission("antivpn.command.*")
&& !sender.hasPermission(child.permission())) {
return CommandResult.error(Component.text(StringUtil.translateAlternateColorCodes('&',
AntiVPN.getInstance().getMessageHandler().getString("no-permission").getMessage())));
}
commandExecutor.sendMessage(StringUtil
.translateAlternateColorCodes('&',
child.execute(commandExecutor, IntStream
.range(0, args.length - 1)
.mapToObj(i -> args[i + 1]).toArray(String[]::new))));
return CommandResult.success();
}
}
}
commandExecutor.sendMessage(StringUtil
.translateAlternateColorCodes('&',
command.execute(new SpongeCommandExecutor(sender), args)));
command.execute(new SpongeCommandExecutor(sender), args);
return CommandResult.success();
}
@Override
public List<CommandCompletion> complete(CommandCause sender, ArgumentReader.Mutable arguments) {
val children = command.children();
String[] args = arguments.input().split(" ");
if(children.length > 0 && args.length > 0) {
for (dev.brighten.antivpn.command.Command child : children) {
if(child.name().equalsIgnoreCase(args[0]) || Arrays.stream(child.aliases())
.anyMatch(alias2 -> alias2.equalsIgnoreCase(args[0]))) {
return child.tabComplete(new SpongeCommandExecutor(sender), "alias", IntStream
.range(0, args.length - 1)
.mapToObj(i -> args[i + 1]).toArray(String[]::new))
.stream()
.map(CommandCompletion::of)
.toList();
}
}
}
return command.tabComplete(new SpongeCommandExecutor(sender), "alias", args)
.stream()
.map(CommandCompletion::of)
.toList();
}
@Override
public boolean canExecute(CommandCause cause) {
return cause.hasPermission(command.permission());
}
@Override
public Optional<Component> shortDescription(CommandCause cause) {
return command.description() != null ? Optional.of(Component.text(command.description())) : Optional.empty();
}
@Override
public Optional<Component> extendedDescription(CommandCause cause) {
return Optional.empty();
}
@Override
public Optional<Component> help(@NonNull CommandCause cause) {
return Optional.of(Component.text(StringUtil.translateAlternateColorCodes('&',
command.execute(new SpongeCommandExecutor(cause), new String[0]))));
}
@Override
public Component usage(CommandCause cause) {
return command.usage() != null ? Component.text(command.usage()) : Component.empty();
}
}
Sponge/src/main/java/dev/brighten/antivpn/sponge/command/SpongeCommandExecutor.java
+42
View File
@@ -0,0 +1,42 @@
package dev.brighten.antivpn.sponge.command;
import dev.brighten.antivpn.AntiVPN;
import dev.brighten.antivpn.api.APIPlayer;
import dev.brighten.antivpn.command.CommandExecutor;
import dev.brighten.antivpn.sponge.util.StringUtil;
import lombok.RequiredArgsConstructor;
import net.kyori.adventure.text.Component;
import org.spongepowered.api.command.CommandCause;
import org.spongepowered.api.entity.living.player.server.ServerPlayer;
import java.util.Optional;
@RequiredArgsConstructor
public class SpongeCommandExecutor implements CommandExecutor {
private final CommandCause cause;
@Override
public void sendMessage(String message, Object... objects) {
cause.sendMessage(Component.text(StringUtil.translateColorCodes('&',
String.format(message, objects))));
}
@Override
public boolean hasPermission(String permission) {
return cause.hasPermission(permission);
}
@Override
public Optional<APIPlayer> getPlayer() {
if(cause.subject() instanceof ServerPlayer serverPlayer) {
return AntiVPN.getInstance().getPlayerExecutor().getPlayer(serverPlayer.uniqueId());
}
return Optional.empty();
}
@Override
public boolean isPlayer() {
return cause.subject() instanceof ServerPlayer;
}
}
Universal/pom.xml
-5
View File
@@ -42,11 +42,6 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>dev.brighten.antivpn</groupId>
<artifactId>Sponge</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>