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

Sponge is loading, other plugins load, fixed some bugs that were introduced, added sponge plugin uploader in maven workflow

Browse Source
This commit is contained in:
Dawson
2025-05-28 16:33:29 -04:00
parent 68a2acce00
commit f271275bfa
7 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/maven.yml
+6 -1
View File
@@ -29,5 +29,10 @@ jobs:
- name: Upload AntiVPN
uses: actions/upload-artifact@v4
with:
name: AntiVPN
name: AntiVPN-Universal
path: Universal/target/AntiVPN-*.jar
- name: Upload Sponge plugin
uses: actions/upload-artifact@v4
with:
name: AntiVPN-Sponge
path: Sponge/target/Sponge-*.jar
Bukkit/src/main/java/dev/brighten/antivpn/bukkit/BukkitListener.java
+3 -1
View File
@@ -62,7 +62,7 @@ public class BukkitListener extends VPNExecutor implements Listener {
.orElse(new OfflinePlayer(
event.getPlayer().getUniqueId(),
event.getPlayer().getName(),
event.getRealAddress()
event.getAddress()
));
CheckResult instantResult = player.checkPlayer(result -> {
@@ -81,6 +81,8 @@ public class BukkitListener extends VPNExecutor implements Listener {
return;
}
AntiVPN.getInstance().getExecutor().log(Level.INFO, "%s was kicked from pre-login cache with IP %s", event.getPlayer().getName(), instantResult.response().getIp());
event.setResult(PlayerLoginEvent.Result.KICK_BANNED);
switch (instantResult.resultType()) {
case DENIED_COUNTRY -> event.setKickMessage(StringUtil.translateAlternateColorCodes('&',
Common/pom.xml
+1 -1
View File
@@ -59,7 +59,7 @@
</relocation>
<relocation>
<pattern>com.github.benmanes.caffeine</pattern>
<shadedPattern>dev.brighten.antivpn.com.github.benmanes.caffeine</shadedPattern>
<shadedPattern>dev.brighten.antivpn.shaded.com.github.benmanes.caffeine</shadedPattern>
</relocation>
<relocation>
<pattern>org.h2</pattern>
Common/src/main/java/dev/brighten/antivpn/AntiVPN.java
+4 -1
View File
@@ -47,7 +47,10 @@ import java.util.List;
@Relocate(from = "com.my\\" + "sql.jdbc", to = "dev.brighten.antivpn.shaded.com.mysql.jdbc")
}
)
@MavenLibrary(groupId = "com.github.ben-manes.caffeine", artifactId = "caffeine", version = "3.1.8")
@MavenLibrary(groupId = "com.\\github\\.ben-manes\\.caffeine", artifactId = "caffeine", version = "3.1.8",
relocations = {
@Relocate(from = "com\\.github\\.benmanes\\.caffeine", to = "dev.brighten.antivpn.shaded.com.github.benmanes.caffeine"),
})
public class AntiVPN {
private static AntiVPN INSTANCE;
Common/src/main/java/dev/brighten/antivpn/api/APIPlayer.java
+2
View File
@@ -90,6 +90,8 @@ public abstract class APIPlayer {
checkResult = new CheckResult(result, ResultType.ALLOWED);
}
AntiVPN.getInstance().getExecutor().log(Level.FINE, "Result for " + ip.getHostAddress() + " is " + checkResult.resultType());
checkResultCache.put(ip.getHostAddress(), checkResult);
onKick.accept(checkResult);
AntiVPN.getInstance().checked++;
Sponge/pom.xml
+1 -1
View File
@@ -109,7 +109,7 @@
</relocation>
<relocation>
<pattern>com.github.benmanes.caffeine</pattern>
<shadedPattern>dev.brighten.antivpn.com.github.benmanes.caffeine</shadedPattern>
<shadedPattern>dev.brighten.antivpn.shaded.com.github.benmanes.caffeine</shadedPattern>
</relocation>
<relocation>
<pattern>org.h2</pattern>
Sponge/src/main/java/dev/brighten/antivpn/sponge/SpongeListener.java
+9 -1
View File
@@ -17,7 +17,7 @@ import java.util.logging.Level;
public class SpongeListener extends VPNExecutor {
@Listener(order = Order.EARLY)
public void onJoin(ServerSideConnectionEvent.Auth event) {
public void onJoin(ServerSideConnectionEvent.Login event) {
AtomicReference<APIPlayer> player = new AtomicReference<>(AntiVPN.getInstance().getPlayerExecutor()
.getPlayer(event.profile().uuid())
.orElse(new OfflinePlayer(
@@ -42,6 +42,8 @@ public class SpongeListener extends VPNExecutor {
return;
}
AntiVPN.getInstance().getExecutor().log(Level.INFO, "%s was kicked from cache with IP %s", player.get().getName(), instantResult.response().getIp());
event.setCancelled(true);
switch (instantResult.resultType()) {
case DENIED_PROXY -> {
@@ -64,6 +66,12 @@ public class SpongeListener extends VPNExecutor {
}
}
@Listener
public void onPlayerDisconnect(ServerSideConnectionEvent.Disconnect event) {
event.profile().ifPresent(profile ->
AntiVPN.getInstance().getPlayerExecutor().unloadPlayer(profile.uuid()));
}
@Override
public void registerListeners() {
Sponge.eventManager().registerListeners(SpongePlugin.getInstance().getContainer(), this);