Skip to content

Start of project restructure to use a JarInJarClassLoader #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
funkemunky merged 8 commits into from
Dec 12, 2025
Merged

Start of project restructure to use a JarInJarClassLoader #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
606144d
Start of project restructure to use a JarInJarClassLoader
funkemunky Dec 2, 2025
6dc0f13
Undoing the local change I made for dev purposes
funkemunky Dec 3, 2025
f4d1c7a
Correcting build process for the rest of the downstream maven poms
funkemunky Dec 3, 2025
011d18a
fixing class path for bootstrap class in loader bukkit plugin
funkemunky Dec 3, 2025
c09269c
Implemented Velocity refactor
funkemunky Dec 4, 2025
8faa59f
Updating to use proxy instead
funkemunky Dec 4, 2025
c7734b2
Refactored so in the future I can combine everything into one jar
funkemunky Dec 4, 2025
c95c9bb
Near final staged for refactor
funkemunky Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 91 additions & 0 deletions Bukkit/Loader/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>dev.brighten.antivpn</groupId>
<artifactId>Bukkit</artifactId>
<version>1.9.4</version>
</parent>
<groupId>dev.brighten.antivpn.bukkit</groupId>
<artifactId>Loader</artifactId>

<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
</repositories>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<source>17</source>
<target>17</target>
<compilerArgument>-XDignore.symbol.file</compilerArgument>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<minimizeJar>false</minimizeJar>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
<resource>antivpn-bukkit.jarinjar</resource>
<file>${project.parent.basedir}/Plugin/target/Plugin-${project.version}.jar</file>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>

<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.20.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>dev.brighten.antivpn</groupId>
<artifactId>Plugin</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>dev.brighten.antivpn</groupId>
<artifactId>loader-utils</artifactId>
<version>1.9.4</version>
<scope>compile</scope>
</dependency>
</dependencies>

</project>
36 changes: 36 additions & 0 deletions Bukkit/Loader/src/main/java/dev/brighten/antivpn/bukkit/loader/BukkitLoaderPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package dev.brighten.antivpn.bukkit.loader;

import dev.brighten.antivpn.loader.JarInJarClassLoader;
import dev.brighten.antivpn.loader.LoaderBootstrap;
import org.bukkit.plugin.java.JavaPlugin;

public class BukkitLoaderPlugin extends JavaPlugin {

private static final String JAR_NAME = "antivpn-bukkit.jarinjar";
private static final String SOURCE_NAME = "antivpn-source.jarinjar";
private static final String BOOTSTRAP_CLASS = "dev.brighten.antivpn.bukkit.BukkitPlugin";

private final LoaderBootstrap plugin;

public BukkitLoaderPlugin() {
JarInJarClassLoader loader = new JarInJarClassLoader(getClass().getClassLoader(), JAR_NAME, SOURCE_NAME);
this.plugin = loader.instantiatePlugin(BOOTSTRAP_CLASS, JavaPlugin.class, this);
}

@Override
public void onLoad() {
this.plugin.onLoad(getDataFolder());
}

@Override
public void onEnable() {
this.plugin.onEnable();
}

@Override
public void onDisable() {
this.plugin.onDisable();
}


}
2 changes: 1 addition & 1 deletion Bukkit/src/main/resources/plugin.yml → Bukkit/Loader/src/main/resources/plugin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: KauriVPN
main: dev.brighten.antivpn.bukkit.BukkitPlugin
main: dev.brighten.antivpn.bukkit.loader.BukkitLoaderPlugin
version: ${project.version}
author: funkemunky
api-version: 1.13
102 changes: 102 additions & 0 deletions Bukkit/Plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>dev.brighten.antivpn</groupId>
<artifactId>Bukkit</artifactId>
<version>1.9.4</version>
</parent>

<artifactId>Plugin</artifactId>

<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
</repositories>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<source>17</source>
<target>17</target>
<compilerArgument>-XDignore.symbol.file</compilerArgument>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<minimizeJar>false</minimizeJar>
<relocations>
<relocation>
<pattern>org.bstats</pattern>
<!-- Replace this with your package! -->
<shadedPattern>dev.brighten.antivpn.bukkit.org.bstats</shadedPattern>
</relocation>
<relocation>
<pattern>org.yaml.snakeyaml</pattern>
<shadedPattern>dev.brighten.antivpn.shaded.org.yaml.snakeyaml</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>

<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.20.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>dev.brighten.antivpn</groupId>
<artifactId>Source</artifactId>
<version>1.9.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId>
<version>2.2.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>dev.brighten.antivpn</groupId>
<artifactId>loader-utils</artifactId>
<version>1.9.4</version>
<scope>provided</scope>
</dependency>
</dependencies>

</project>
0 ...antivpn/bukkit/BukkitCommandExecutor.java → ...antivpn/bukkit/BukkitCommandExecutor.java
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ighten/antivpn/bukkit/BukkitListener.java → ...ighten/antivpn/bukkit/BukkitListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ public class BukkitListener extends VPNExecutor implements Listener {

@Override
public void registerListeners() {
BukkitPlugin.pluginInstance.getServer().getPluginManager()
.registerEvents(this, BukkitPlugin.pluginInstance);
Bukkit.getPluginManager()
.registerEvents(this, BukkitPlugin.pluginInstance.getPlugin());
}

@Override
Expand All @@ -53,7 +53,7 @@ public void runCommand(String command) {
@Override
public void disablePlugin() {
HandlerList.unregisterAll(this);
BukkitPlugin.pluginInstance.getServer().getPluginManager().disablePlugin(BukkitPlugin.pluginInstance);
Bukkit.getPluginManager().disablePlugin(BukkitPlugin.pluginInstance.getPlugin());
}

@EventHandler(priority = EventPriority.HIGH)
Expand Down
2 changes: 1 addition & 1 deletion ...brighten/antivpn/bukkit/BukkitPlayer.java → ...brighten/antivpn/bukkit/BukkitPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public void kickPlayer(String reason) {
public void run() {
player.kickPlayer(ChatColor.translateAlternateColorCodes('&', reason));
}
}.runTask(BukkitPlugin.pluginInstance);
}.runTask(BukkitPlugin.pluginInstance.getPlugin());
} else player.kickPlayer(ChatColor.translateAlternateColorCodes('&', reason));
}

Expand Down
0 .../antivpn/bukkit/BukkitPlayerExecutor.java → .../antivpn/bukkit/BukkitPlayerExecutor.java
View file
Open in desktop
File renamed without changes.
31 changes: 23 additions & 8 deletions ...brighten/antivpn/bukkit/BukkitPlugin.java → ...brighten/antivpn/bukkit/BukkitPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import dev.brighten.antivpn.database.local.H2VPN;
import dev.brighten.antivpn.database.mongo.MongoVPN;
import dev.brighten.antivpn.database.sql.MySqlVPN;
import dev.brighten.antivpn.loader.LoaderBootstrap;
import lombok.Getter;
import org.bstats.bukkit.Metrics;
import org.bstats.charts.SimplePie;
Expand All @@ -17,20 +18,34 @@
import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.scheduler.BukkitRunnable;

import java.io.File;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

public class BukkitPlugin extends JavaPlugin {
public class BukkitPlugin implements LoaderBootstrap {

public static BukkitPlugin pluginInstance;
private SimpleCommandMap commandMap;
@Getter
private File dataFolder;
private final List<org.bukkit.command.Command> registeredCommands = new ArrayList<>();
@Getter
private final JavaPlugin plugin;

public BukkitPlugin(JavaPlugin plugin) {
this.plugin = plugin;
}

@Getter
private PlayerCommandRunner playerCommandRunner;

@Override
public void onLoad(File dataFolder) {
this.dataFolder = dataFolder;
}

public void onEnable() {
pluginInstance = this;

Expand All @@ -43,18 +58,18 @@ public void onEnable() {
// Loading our bStats metrics to be pushed to https://bstats.org
if(AntiVPN.getInstance().getVpnConfig().metrics()) {
Bukkit.getLogger().info("Starting bStats metrics...");
Metrics metrics = new Metrics(this, 12615);
Metrics metrics = new Metrics(plugin, 12615);
metrics.addCustomChart(new SimplePie("database_used", this::getDatabaseType));
new BukkitRunnable() {
public void run() {
AntiVPN.getInstance().checked = AntiVPN.getInstance().detections = 0;
}
}.runTaskTimerAsynchronously(this, 12000, 12000);
}.runTaskTimerAsynchronously(plugin, 12000, 12000);
}

Bukkit.getLogger().info("Setting up and registering commands...");
// We need access to the commandMap to register our commands without using the "proper" method
if (pluginInstance.getServer().getPluginManager() instanceof SimplePluginManager manager) {
if (Bukkit.getServer().getPluginManager() instanceof SimplePluginManager manager) {
try {
Field field = SimplePluginManager.class.getDeclaredField("commandMap");
field.setAccessible(true);
Expand All @@ -73,7 +88,7 @@ public void run() {
registeredCommands.add(newCommand);

// This tells Bukkit to register our command for use.
commandMap.register(pluginInstance.getName(), newCommand);
commandMap.register(plugin.getName(), newCommand);
}

//TODO Finish system before implementing on startup
Expand All @@ -83,7 +98,7 @@ public void run() {
.get());
AntiVPN.getInstance().getMessageHandler().reloadStrings();*/

reloadConfig();
plugin.reloadConfig();
}

@Override
Expand All @@ -109,10 +124,10 @@ public void onDisable() {
}

Bukkit.getLogger().info("Unregistering listeners...");
HandlerList.unregisterAll(this);
HandlerList.unregisterAll(plugin);

Bukkit.getLogger().info("Cancelling any running tasks...");
Bukkit.getScheduler().cancelTasks(this);
Bukkit.getScheduler().cancelTasks(plugin);
}

private String getDatabaseType() {
Expand Down
2 changes: 1 addition & 1 deletion ...n/antivpn/bukkit/PlayerCommandRunner.java → ...n/antivpn/bukkit/PlayerCommandRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ void start() {
public void run() {
action.getAction().run();
}
}.runTask(BukkitPlugin.pluginInstance);
}.runTask(BukkitPlugin.pluginInstance.getPlugin());

playerActions.poll();
}
Expand Down
0 ...antivpn/bukkit/command/BukkitCommand.java → ...antivpn/bukkit/command/BukkitCommand.java
View file
Open in desktop
File renamed without changes.
Loading