Fixing velocity loading issues

Remove unused import

Assembly/dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>AntiVPN</artifactId>
     <groupId>dev.brighten.antivpn</groupId>
-    <version>1.8.2</version>
+    <version>1.9.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>Assembly</artifactId>
@@ -18,6 +18,18 @@
             <goals>
               <goal>shade</goal>
             </goals>
+            <configuration>
+              <relocations>
+                <relocation>
+                  <pattern>org.yaml.snakeyaml</pattern>
+                  <shadedPattern>dev.brighten.antivpn.shaded.org.yaml.snakeyaml</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>com.google.common</pattern>
+                  <shadedPattern>dev.brighten.antivpn.shaded.com.google.common</shadedPattern>
+                </relocation>
+              </relocations>
+            </configuration>
           </execution>
         </executions>
       </plugin>

Assembly/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.8.2</version>
+        <version>1.9.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,6 +28,18 @@
                         <goals>
                             <goal>shade</goal>
                         </goals>
+                        <configuration>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.yaml.snakeyaml</pattern>
+                                    <shadedPattern>dev.brighten.antivpn.shaded.org.yaml.snakeyaml</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.google.common</pattern>
+                                    <shadedPattern>dev.brighten.antivpn.shaded.com.google.common</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Bukkit/dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>AntiVPN</artifactId>
     <groupId>dev.brighten.antivpn</groupId>
-    <version>1.8.2</version>
+    <version>1.9.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>Bukkit</artifactId>
@@ -26,23 +26,32 @@
       </plugin>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.4</version>
         <executions>
           <execution>
             <phase>package</phase>
             <goals>
               <goal>shade</goal>
             </goals>
+            <configuration>
+              <minimizeJar>true</minimizeJar>
+              <relocations>
+                <relocation>
+                  <pattern>org.bstats</pattern>
+                  <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>
+                <relocation>
+                  <pattern>com.google.common</pattern>
+                  <shadedPattern>dev.brighten.antivpn.shaded.com.google.common</shadedPattern>
+                </relocation>
+              </relocations>
+            </configuration>
           </execution>
         </executions>
-        <configuration>
-          <relocations>
-            <relocation>
-              <pattern>org.bstats</pattern>
-              <shadedPattern>dev.brighten.antivpn.bukkit.org.bstats</shadedPattern>
-            </relocation>
-          </relocations>
-        </configuration>
       </plugin>
     </plugins>
   </build>
@@ -56,7 +65,7 @@
     <dependency>
       <groupId>dev.brighten.antivpn</groupId>
       <artifactId>Common</artifactId>
-      <version>1.8.2</version>
+      <version>1.9.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -71,4 +80,3 @@
     <maven.compiler.source>8</maven.compiler.source>
   </properties>
 </project>
-

Bukkit/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.8.2</version>
+        <version>1.9.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,22 +26,31 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <relocations>
-                        <relocation>
-                            <pattern>org.bstats</pattern>
-                            <!-- Replace this with your package! -->
-                            <shadedPattern>dev.brighten.antivpn.bukkit.org.bstats</shadedPattern>
-                        </relocation>
-                    </relocations>
-                </configuration>
+                <version>3.2.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
                         </goals>
+                        <configuration>
+                            <minimizeJar>true</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>
+                                <relocation>
+                                    <pattern>com.google.common</pattern>
+                                    <shadedPattern>dev.brighten.antivpn.shaded.com.google.common</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -69,7 +78,7 @@
         <dependency>
             <groupId>dev.brighten.antivpn</groupId>
             <artifactId>Common</artifactId>
-            <version>1.8.2</version>
+            <version>1.9.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Bukkit/src/main/java/dev/brighten/antivpn/bukkit/BukkitListener.java

@@ -1,9 +1,12 @@
 package dev.brighten.antivpn.bukkit;
 
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import dev.brighten.antivpn.AntiVPN;
 import dev.brighten.antivpn.api.APIPlayer;
 import dev.brighten.antivpn.api.VPNExecutor;
 import dev.brighten.antivpn.message.VpnString;
+import dev.brighten.antivpn.web.objects.VPNResponse;
 import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -16,11 +19,18 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
 
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 
 public class BukkitListener extends VPNExecutor implements Listener {
 
     private BukkitTask cacheResetTask;
+    private final Cache<UUID, VPNResponse> responseCache = CacheBuilder.newBuilder()
+            .expireAfterWrite(5, TimeUnit.MINUTES)
+            .maximumSize(10000)
+            .build();
+
     @Override
     public void registerListeners() {
         BukkitPlugin.pluginInstance.getServer().getPluginManager()
@@ -29,11 +39,12 @@ public class BukkitListener extends VPNExecutor implements Listener {
 
     @Override
     public void runCacheReset() {
+        // Reset cache every 20 minutes
         cacheResetTask = new BukkitRunnable() {
             public void run() {
                 resetCache();
             }
-        }.runTaskTimerAsynchronously(BukkitPlugin.pluginInstance, 24000, 24000); //Reset cache every 20 minutes
+        }.runTaskTimerAsynchronously(BukkitPlugin.pluginInstance, 24000, 24000);
 
         HandlerList.unregisterAll(this);
         threadExecutor.shutdown();
@@ -44,9 +55,14 @@ public class BukkitListener extends VPNExecutor implements Listener {
         if(cacheResetTask != null && !cacheResetTask.isCancelled()) cacheResetTask.cancel();
     }
 
+    @Override
+    public void log(Level level, String log, Object... objects) {
+        Bukkit.getLogger().log(level, String.format(log, objects));
+    }
+
     @Override
     public void log(String log, Object... objects) {
-        Bukkit.getLogger().log(Level.INFO, String.format(log, objects));
+        log(Level.INFO, String.format(log, objects));
     }
 
     @EventHandler
@@ -68,7 +84,6 @@ public class BukkitListener extends VPNExecutor implements Listener {
     @EventHandler
     public void onListener(final PlayerLoginEvent event) {
         //If they're exempt, don't check.
-        System.out.println(event.getAddress().getHostAddress() + ";" + event.getPlayer().getUniqueId() + ";" + event.getPlayer().getName());
         if(event.getPlayer().hasPermission("antivpn.bypass") //Has bypass permission
                 || AntiVPN.getInstance().getExecutor().isWhitelisted(event.getPlayer().getUniqueId()) //Is exempt
                 //Or has a name that starts with a certain prefix. This is for Bedrock exempting.
@@ -76,6 +91,18 @@ public class BukkitListener extends VPNExecutor implements Listener {
                 || AntiVPN.getInstance().getVpnConfig().getPrefixWhitelists().stream()
                 .anyMatch(prefix -> event.getPlayer().getName().startsWith(prefix))) return;
 
+
+        if(responseCache.asMap().containsKey(event.getPlayer().getUniqueId())) {
+            VPNResponse cached = responseCache.getIfPresent(event.getPlayer().getUniqueId());
+
+            if (cached != null && cached.isProxy()) {
+                event.setResult(PlayerLoginEvent.Result.KICK_BANNED);
+                event.setKickMessage(org.bukkit.ChatColor.translateAlternateColorCodes('&',
+                        AntiVPN.getInstance().getVpnConfig().getKickString()));
+                return;
+            }
+        }
+
         final Player player = event.getPlayer();
         checkIp(event.getAddress().getHostAddress(),
                 AntiVPN.getInstance().getVpnConfig().cachedResults(), result -> {
@@ -83,15 +110,24 @@ public class BukkitListener extends VPNExecutor implements Listener {
                         //We need to run on main thread or kicking and running commands will cause errors
                         new BukkitRunnable() {
                             public void run() {
+                                //If the player is whitelisted, we don't want to kick them
+                                if(AntiVPN.getInstance().getExecutor().isWhitelisted(event.getPlayer().getUniqueId())) {
+                                    log("UUID is whitelisted: %s",
+                                            event.getPlayer().getUniqueId().toString());
+                                    return;
+                                }
+
+                                //If the IP is whitelisted, we don't want to kick them
+                                if(AntiVPN.getInstance().getExecutor().isWhitelisted(event.getPlayer().getAddress().getAddress()
+                                        .getHostAddress())) {
+                                   log("IP is whitelisted: %s",
+                                            event.getPlayer().getAddress().getAddress().getHostAddress());
+                                    return;
+                                }
+
                                 // If the countryList() size is zero, no need to check.
                                 // Running country check first
                                 if(AntiVPN.getInstance().getVpnConfig().countryList().size() > 0
-                                        && !(AntiVPN.getInstance().getExecutor()
-                                        .isWhitelisted(event.getPlayer().getUniqueId()) //Is exempt
-                                        //Or has a name that starts with a certain prefix. This is for Bedrock exempting.
-                                        || AntiVPN.getInstance().getExecutor().isWhitelisted(event.getPlayer()
-                                        .getAddress().getAddress()
-                                        .getHostAddress()))
                                         // This bit of code will decide whether or not to kick the player
                                         // If it contains the code and it is set to whitelist, it will not kick as they are equal
                                         // and vise versa. However, if the contains does not match the state, it will kick.
@@ -124,7 +160,7 @@ public class BukkitListener extends VPNExecutor implements Listener {
                                     if(AntiVPN.getInstance().getVpnConfig().kickPlayersOnDetect())
                                         player.kickPlayer(org.bukkit.ChatColor.translateAlternateColorCodes('&',
                                                 AntiVPN.getInstance().getVpnConfig().getKickString()));
-                                    Bukkit.getLogger().info(event.getPlayer().getName()
+                                    log(Level.INFO, event.getPlayer().getName()
                                             + " joined on a VPN/Proxy (" + result.getMethod() + ")");
 
                                     //Ensuring the user wishes to alert to staff
@@ -151,8 +187,7 @@ public class BukkitListener extends VPNExecutor implements Listener {
                             }
                         }.runTask(BukkitPlugin.pluginInstance);
                     } else {
-                        Bukkit.getLogger()
-                                .log(Level.WARNING,
+                        log(Level.WARNING,
                                         "The API query was not a success! " +
                                                 "You may need to upgrade your license on https://funkemunky.cc/shop");
                     }

Bungee/dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>AntiVPN</artifactId>
     <groupId>dev.brighten.antivpn</groupId>
-    <version>1.8.2</version>
+    <version>1.9.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>Bungee</artifactId>
@@ -41,6 +41,14 @@
               <pattern>org.bstats</pattern>
               <shadedPattern>dev.brighten.antivpn.bungee.org.bstats</shadedPattern>
             </relocation>
+            <relocation>
+              <pattern>org.yaml.snakeyaml</pattern>
+              <shadedPattern>dev.brighten.antivpn.shaded.org.yaml.snakeyaml</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>com.google</pattern>
+              <shadedPattern>dev.brighten.antivpn.shaded.com.google</shadedPattern>
+            </relocation>
           </relocations>
         </configuration>
       </plugin>
@@ -50,8 +58,18 @@
     <dependency>
       <groupId>dev.brighten.antivpn</groupId>
       <artifactId>Common</artifactId>
-      <version>1.8.2</version>
+      <version>1.9.1</version>
       <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>snakeyaml</artifactId>
+          <groupId>org.yaml</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>guava</artifactId>
+          <groupId>com.google.guava</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.github.bungee</groupId>

Bungee/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.8.2</version>
+        <version>1.9.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -34,6 +34,14 @@
                             <!-- Replace this with your package! -->
                             <shadedPattern>dev.brighten.antivpn.bungee.org.bstats</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>org.yaml.snakeyaml</pattern>
+                            <shadedPattern>dev.brighten.antivpn.shaded.org.yaml.snakeyaml</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>com.google</pattern>
+                            <shadedPattern>dev.brighten.antivpn.shaded.com.google</shadedPattern>
+                        </relocation>
                     </relocations>
                 </configuration>
                 <executions>
@@ -63,7 +71,7 @@
         <dependency>
             <groupId>dev.brighten.antivpn</groupId>
             <artifactId>Common</artifactId>
-            <version>1.8.2</version>
+            <version>1.9.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Bungee/src/main/java/dev/brighten/antivpn/bungee/BungeeListener.java

@@ -1,17 +1,22 @@
 package dev.brighten.antivpn.bungee;
 
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import dev.brighten.antivpn.AntiVPN;
 import dev.brighten.antivpn.api.APIPlayer;
 import dev.brighten.antivpn.api.VPNExecutor;
+import dev.brighten.antivpn.web.objects.VPNResponse;
 import net.md_5.bungee.BungeeCord;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.event.PlayerDisconnectEvent;
 import net.md_5.bungee.api.event.PostLoginEvent;
+import net.md_5.bungee.api.event.PreLoginEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.api.scheduler.ScheduledTask;
 import net.md_5.bungee.event.EventHandler;
 
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 
@@ -19,6 +24,11 @@ public class BungeeListener extends VPNExecutor implements Listener {
 
     private ScheduledTask cacheResetTask;
 
+    private final Cache<UUID, VPNResponse> responseCache = CacheBuilder.newBuilder()
+            .expireAfterWrite(5, TimeUnit.MINUTES)
+            .maximumSize(10000)
+            .build();
+
     @Override
     public void registerListeners() {
         BungeePlugin.pluginInstance.getProxy().getPluginManager()
@@ -42,10 +52,32 @@ public class BungeeListener extends VPNExecutor implements Listener {
     }
 
     @Override
-    public void log(String log, Object... objects) {
+    public void log(Level level, String log, Object... objects) {
         BungeeCord.getInstance().getLogger().log(Level.INFO, String.format(log, objects));
     }
 
+    @Override
+    public void log(String log, Object... objects) {
+        log(Level.INFO, String.format(log, objects));
+    }
+
+    @EventHandler
+    public void onListener(final PreLoginEvent event) {
+        if(!responseCache.asMap().containsKey(event.getConnection().getUniqueId())) return;
+
+        VPNResponse cached = responseCache.getIfPresent(event.getConnection().getUniqueId());
+
+        if(cached != null && cached.isProxy()) {
+            event.setCancelled(true);
+            event.setCancelReason(TextComponent.fromLegacyText(ChatColor
+                    .translateAlternateColorCodes('&',
+                            AntiVPN.getInstance().getVpnConfig().getKickString())));
+            AntiVPN.getInstance().getExecutor().log(Level.INFO,
+                    "%s was kicked from pre-login proxy cache.",
+                    event.getConnection().getName());
+        }
+    }
+
     @EventHandler
     public void onListener(final PostLoginEvent event) {
         if(event.getPlayer().hasPermission("antivpn.bypass") //Has bypass permission
@@ -55,13 +87,24 @@ public class BungeeListener extends VPNExecutor implements Listener {
         checkIp(event.getPlayer().getAddress().getAddress().getHostAddress(),
                 AntiVPN.getInstance().getVpnConfig().cachedResults(), result -> {
             if(result.isSuccess()) {
-                // If the countryList() size is zero, no need to check.
-                // Running country check first
+                //If the player is whitelisted, we don't want to kick them
+                if(AntiVPN.getInstance().getExecutor().isWhitelisted(event.getPlayer().getUniqueId())) {
+                    AntiVPN.getInstance().getExecutor().log("UUID is whitelisted: %s",
+                            event.getPlayer().getUniqueId().toString());
+                    return;
+                }
+
+                //If the IP is whitelisted, we don't want to kick them
+                if(AntiVPN.getInstance().getExecutor().isWhitelisted(event.getPlayer().getAddress().getAddress()
+                        .getHostAddress())) {
+                    AntiVPN.getInstance().getExecutor().log("IP is whitelisted: %s",
+                            event.getPlayer().getAddress().getAddress().getHostAddress());
+                    return;
+                }
+
+                responseCache.put(event.getPlayer().getUniqueId(), result);
+
                 if(AntiVPN.getInstance().getVpnConfig().countryList().size() > 0
-                        && !(AntiVPN.getInstance().getExecutor().isWhitelisted(event.getPlayer().getUniqueId()) //Is exempt
-                        //Or has a name that starts with a certain prefix. This is for Bedrock exempting.
-                        || AntiVPN.getInstance().getExecutor().isWhitelisted(event.getPlayer().getAddress().getAddress()
-                        .getHostAddress()))
                         // This bit of code will decide whether or not to kick the player
                         // If it contains the code and it is set to whitelist, it will not kick as they are equal
                         // and vise versa. However, if the contains does not match the state, it will kick.

Common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.8.2</version>
+        <version>1.9.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,6 +28,32 @@
                     <compilerArgument>-XDignore.symbol.file</compilerArgument>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <minimizeJar>true</minimizeJar>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.yaml.snakeyaml</pattern>
+                                    <shadedPattern>dev.brighten.antivpn.shaded.org.yaml.snakeyaml</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.google.common</pattern>
+                                    <shadedPattern>dev.brighten.antivpn.shaded.com.google.common</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <resources>
             <resource>
@@ -62,7 +88,12 @@
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
             <version>1.30</version>
-            <scope>provided</scope>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>31.1-jre</version>
         </dependency>
         <dependency>
             <groupId>org.mongodb</groupId>

Common/src/main/java/dev/brighten/antivpn/AntiVPN.java

@@ -32,7 +32,6 @@ import java.util.List;
 @Getter
 @Setter(AccessLevel.PRIVATE)
 @MavenLibrary(groupId = "com.h2database", artifactId ="h2", version = "2.1.214")
-@MavenLibrary(groupId = "org.yaml", artifactId = "snakeyaml", version = "1.30")
 @MavenLibrary(groupId = "org.mongodb", artifactId = "mongo-java-driver", version = "3.12.11")
 @MavenLibrary(groupId = "mysql", artifactId = "mysql-connector-java", version = "8.0.30")
 public class AntiVPN {

Common/src/main/java/dev/brighten/antivpn/api/VPNExecutor.java

@@ -12,6 +12,7 @@ import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.function.Consumer;
+import java.util.logging.Level;
 
 public abstract class VPNExecutor {
     public static ExecutorService threadExecutor = Executors.newSingleThreadExecutor();
@@ -32,6 +33,8 @@ public abstract class VPNExecutor {
 
     public abstract void shutdown();
 
+    public abstract void log(Level level, String log, Object... objects);
+
     public abstract void log(String log, Object... objects);
 
     public boolean isWhitelisted(UUID uuid) {

Common/src/main/java/dev/brighten/antivpn/database/VPNDatabase.java

@@ -12,6 +12,8 @@ public interface VPNDatabase {
 
     void cacheResponse(VPNResponse toCache);
 
+    void deleteResponse(String ip);
+
     boolean isWhitelisted(UUID uuid);
 
     boolean isWhitelisted(String ip);

Common/src/main/java/dev/brighten/antivpn/database/local/H2VPN.java

@@ -65,7 +65,12 @@ public class H2VPN implements VPNDatabase {
                         rs.getString("method"), rs.getString("isp"), "N/A",
                         rs.getBoolean("proxy"), rs.getBoolean("cached"), true,
                         rs.getDouble("latitude"), rs.getDouble("longitude"),
-                        System.currentTimeMillis(), -1);
+                        rs.getTimestamp("inserted").getTime(), -1);
+
+                if(System.currentTimeMillis() - response.getLastAccess() > TimeUnit.HOURS.toMillis(1)) {
+                    VPNExecutor.threadExecutor.execute(() -> deleteResponse(ip));
+                    return Optional.empty();
+                }
                 return Optional.of(response);
             }
         } catch (SQLException throwables) {
@@ -98,6 +103,14 @@ public class H2VPN implements VPNDatabase {
                 .append(toCache.getLatitude()).append(toCache.getLongitude()).execute();
     }
 
+    @Override
+    public void deleteResponse(String ip) {
+        if(!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed())
+            return;
+
+        Query.prepare("delete from `responses` where `ip` = ?").append(ip).execute();
+    }
+
     @SneakyThrows
     @Override
     public boolean isWhitelisted(UUID uuid) {

Common/src/main/java/dev/brighten/antivpn/database/mongo/MongoVPN.java

@@ -7,13 +7,16 @@ import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.model.Filters;
 import com.mongodb.client.model.Indexes;
+import com.mongodb.client.model.UpdateOptions;
 import dev.brighten.antivpn.AntiVPN;
 import dev.brighten.antivpn.api.VPNExecutor;
 import dev.brighten.antivpn.database.VPNDatabase;
 import dev.brighten.antivpn.web.objects.VPNResponse;
 import org.bson.Document;
+import org.bson.conversions.Bson;
 
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
 public class MongoVPN implements VPNDatabase {
@@ -27,6 +30,13 @@ public class MongoVPN implements VPNDatabase {
         Document rdoc = cacheDocument.find(Filters.eq("ip", ip)).first();
 
         if(rdoc != null) {
+            long lastUpdate = rdoc.get("lastAccess", 0L);
+
+            if(System.currentTimeMillis() - lastUpdate > TimeUnit.HOURS.toMillis(1)) {
+                VPNExecutor.threadExecutor.execute(() -> deleteResponse(ip));
+                return Optional.empty();
+            }
+
             return Optional.of(VPNResponse.builder().asn(rdoc.getString("asn")).ip(ip)
                     .countryName(rdoc.getString("countryName"))
                     .countryCode(rdoc.getString("countryCode"))
@@ -39,6 +49,7 @@ public class MongoVPN implements VPNDatabase {
                     .success(true)
                     .latitude(rdoc.getDouble("latitude"))
                     .longitude(rdoc.getDouble("longitude"))
+                    .lastAccess(rdoc.get("lastAccess", 0L))
                     .build());
         }
         return Optional.empty();
@@ -60,13 +71,20 @@ public class MongoVPN implements VPNDatabase {
         rdoc.put("success", toCache.isSuccess());
         rdoc.put("latitude", toCache.getLatitude());
         rdoc.put("longitude", toCache.getLongitude());
+        rdoc.put("lastAccess", System.currentTimeMillis());
 
         VPNExecutor.threadExecutor.execute(() -> {
-            cacheDocument.deleteMany(Filters.eq("ip", toCache.getIp()));
-            cacheDocument.insertOne(rdoc);
+            Bson update = new Document("$set", rdoc);
+            cacheDocument.updateOne(Filters.eq("ip", toCache.getIp()), update,
+                    new UpdateOptions().upsert(true));
         });
     }
 
+    @Override
+    public void deleteResponse(String ip) {
+        cacheDocument.deleteMany(Filters.eq("ip", ip));
+    }
+
     @Override
     public boolean isWhitelisted(UUID uuid) {
         return settingsDocument
@@ -100,8 +118,8 @@ public class MongoVPN implements VPNDatabase {
     @Override
     public void setWhitelisted(String ip, boolean whitelisted) {
         if(whitelisted) {
-            Document wdoc = new Document("setting", "whitelist");
-            wdoc.put("ip", ip);
+            Document wdoc = new Document("setting", "whitelist").append("ip", ip);
+
             AntiVPN.getInstance().getExecutor().getWhitelistedIps().add(ip);
             VPNExecutor.threadExecutor.execute(() -> settingsDocument.insertOne(wdoc));
         } else {

Common/src/main/java/dev/brighten/antivpn/database/sql/MySqlVPN.java

@@ -52,7 +52,7 @@ public class MySqlVPN implements VPNDatabase {
 
     @Override
     public Optional<VPNResponse> getStoredResponse(String ip) {
-        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled()|| MySQL.isClosed())
+        if (isDisabled())
             return Optional.empty();
 
         ResultSet rs = Query.prepare("select * from `responses` where `ip` = ? limit 1").append(ip).executeQuery();
@@ -65,7 +65,13 @@ public class MySqlVPN implements VPNDatabase {
                         rs.getString("method"), rs.getString("isp"), "N/A",
                         rs.getBoolean("proxy"), rs.getBoolean("cached"), true,
                         rs.getDouble("latitude"), rs.getDouble("longitude"),
-                        System.currentTimeMillis(), -1);
+                        rs.getTimestamp("inserted").getTime(), -1);
+
+                if(System.currentTimeMillis() - response.getLastAccess() > TimeUnit.HOURS.toMillis(1)) {
+                    VPNExecutor.threadExecutor.execute(() -> deleteResponse(ip));
+                    return Optional.empty();
+                }
+                
                 return Optional.of(response);
             }
         } catch (SQLException throwables) {
@@ -86,7 +92,7 @@ public class MySqlVPN implements VPNDatabase {
      */
     @Override
     public void cacheResponse(VPNResponse toCache) {
-        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed())
+        if (isDisabled())
             return;
 
         Query.prepare("insert into `responses` (`ip`,`asn`,`countryName`,`countryCode`,`city`,`timeZone`,"
@@ -98,10 +104,18 @@ public class MySqlVPN implements VPNDatabase {
                 .append(toCache.getLatitude()).append(toCache.getLongitude()).execute();
     }
 
+    @Override
+    public void deleteResponse(String ip) {
+        if(!isDisabled())
+            return;
+
+        Query.prepare("delete from `responses` where `ip` = ?").append(ip).execute();
+    }
+
     @SneakyThrows
     @Override
     public boolean isWhitelisted(UUID uuid) {
-        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed())
+        if (isDisabled())
             return false;
         ResultSet set = Query.prepare("select uuid from `whitelisted` where `uuid` = ? limit 1")
                 .append(uuid.toString()).executeQuery();
@@ -112,7 +126,7 @@ public class MySqlVPN implements VPNDatabase {
     @SneakyThrows
     @Override
     public boolean isWhitelisted(String ip) {
-        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed())
+        if (isDisabled())
             return false;
         ResultSet set = Query.prepare("select `ip` from `whitelisted-ips` where `ip` = ? limit 1")
                 .append(ip).executeQuery();
@@ -123,7 +137,7 @@ public class MySqlVPN implements VPNDatabase {
 
     @Override
     public void setWhitelisted(UUID uuid, boolean whitelisted) {
-        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed())
+        if (isDisabled())
             return;
 
         if (whitelisted) {
@@ -139,7 +153,7 @@ public class MySqlVPN implements VPNDatabase {
 
     @Override
     public void setWhitelisted(String ip, boolean whitelisted) {
-        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed())
+        if (isDisabled())
             return;
 
         if(whitelisted) {
@@ -333,6 +347,10 @@ public class MySqlVPN implements VPNDatabase {
             System.err.println("MySQL Excepton created" + e.getMessage());
         }
     }
+    
+    private boolean isDisabled() {
+        return !AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled()|| MySQL.isClosed();
+    }
 
     @Override
     public void shutdown() {

Common/src/main/java/dev/brighten/antivpn/database/sql/utils/MySQL.java

@@ -1,11 +1,17 @@
 package dev.brighten.antivpn.database.sql.utils;
 
 import dev.brighten.antivpn.AntiVPN;
+import org.h2.jdbc.JdbcSQLNonTransientConnectionException;
 
 import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.nio.file.Files;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
+import java.util.Properties;
 
 public class MySQL {
     private static Connection conn;
@@ -36,13 +42,17 @@ public class MySQL {
         }
     }
 
+    private static boolean attemptedTwice = false;
     public static void initH2() {
-        File dataFolder = new File(AntiVPN.getInstance().getPluginFolder(), "databases" + File.separator + "database");
+        File dataFolder = new File(AntiVPN.getInstance().getPluginFolder(), "databases");
+        File databaseFile = new File(dataFolder, "database");
         try {
-            Class.forName("org.h2.Driver");
-            conn = new NonClosableConnection(DriverManager.getConnection ("jdbc:h2:file:" +
-                    dataFolder.getAbsolutePath(),
-                    AntiVPN.getInstance().getVpnConfig().getUsername(),AntiVPN.getInstance().getVpnConfig().getPassword()));
+            Constructor jdbcConnection = Class.forName("org.h2.jdbc.JdbcConnection")
+                    .getConstructor(String.class, Properties.class, String.class, Object.class, boolean.class);
+            conn = new NonClosableConnection((Connection)jdbcConnection.newInstance("jdbc:h2:file:" +
+                            databaseFile.getAbsolutePath(),
+                    new Properties(), AntiVPN.getInstance().getVpnConfig().getUsername(),
+                    AntiVPN.getInstance().getVpnConfig().getPassword(), false));
             conn.setAutoCommit(true);
             Query.use(conn);
             AntiVPN.getInstance().getExecutor().log("Connection to H2 has been established.");
@@ -51,7 +61,47 @@ public class MySQL {
             ex.printStackTrace();
         } catch (ClassNotFoundException ex) {
             AntiVPN.getInstance().getExecutor().log("No H2 library found!");
+        } catch (NoSuchMethodException | InstantiationException | IllegalAccessException e) {
+            AntiVPN.getInstance().getExecutor().log("Java exception on initialize");
+            e.printStackTrace();
+        } catch(InvocationTargetException e) {
+            if(attemptedTwice) return;
+            if(e.getCause() instanceof JdbcSQLNonTransientConnectionException) {
+                File[] files = dataFolder.listFiles();
+
+                if(files == null) {
+                    e.printStackTrace();
+                    return;
+                }
+
+                File oldDbs = new File(dataFolder, "old");
+
+                boolean made = false;
+                if(!oldDbs.isDirectory()) {
+                    made = oldDbs.mkdir();
+                } else made = true;
+
+                if(!made) {
+                    throw new RuntimeException(String.format("Unable to upgrade H2 files since this application " +
+                            "was unable to create a new directory %s (insufficient permissions?)!", oldDbs.getPath()));
+                }
+                AntiVPN.getInstance().getExecutor().log("Upgrading h2 files...");
+                for (File file : files) {
+                    if(file.getName().endsWith(".db")) {
+                        try {
+                            Files.copy(file.toPath(), new File(oldDbs, file.getName()).toPath());
+                        } catch (IOException ex) {
+                            throw new RuntimeException(ex);
+                        }
+                        if(file.delete()) {
+                            AntiVPN.getInstance().getExecutor().log("Successfully deleted old " + file.getName());
+                        } else throw new RuntimeException("Unable to delete old database file " + file.getName());
+                    }
+                }
+                initH2();
+            } else e.printStackTrace();
         }
+        attemptedTwice = true;
     }
 
     public static void use() {
@@ -70,6 +120,7 @@ public class MySQL {
                 } else conn.close();
                 conn = null;
             }
+            attemptedTwice = false;
         } catch (Exception e) {
             e.printStackTrace();
         }

Common/src/main/java/dev/brighten/antivpn/message/MessageHandler.java

@@ -30,7 +30,7 @@ public class MessageHandler {
     public void addString(VpnString string, Function<VpnString, String> getter) {
         string.setConfigStringGetter(getter);
         getter.apply(string);
-        System.out.println("Added string " + string.getKey());
+        AntiVPN.getInstance().getExecutor().log("Added string " + string.getKey());
         messages.put(string.getKey(), string);
     }
 

Common/src/main/java/dev/brighten/antivpn/utils/Suppliers.java

@@ -24,8 +24,6 @@ import static dev.brighten.antivpn.utils.Preconditions.checkNotNull;
 import static dev.brighten.antivpn.utils.NullnessCasts.uncheckedCastNullableTToT;
 import static java.util.Objects.requireNonNull;
 
-import jdk.tools.jlink.internal.Platform;
-
 /**
  * Useful suppliers.
  *

Common/src/main/resources/config.yml

@@ -15,8 +15,8 @@ prefixWhitelists: []
 # Configure your database here.
 database:
   # Enable to cache queries and save alerts state beyond restarts
-  enabled: false
-  useCredentials: true
+  enabled: true
+  useCredentials: false
   #Options Mongo, MySQL, or H2
   type: H2
   # The database name you would like to use

Sponge/pom.xml

@@ -0,0 +1,41 @@
+<?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">
+    <parent>
+        <artifactId>AntiVPN</artifactId>
+        <groupId>dev.brighten.antivpn</groupId>
+        <version>1.9.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>Sponge</artifactId>
+
+    <repositories>
+        <repository>
+            <id>sponge</id>
+            <url>https://repo.spongepowered.org/repository/maven-public/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.spongepowered</groupId>
+            <artifactId>spongeapi</artifactId>
+            <version>8.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>dev.brighten.antivpn</groupId>
+            <artifactId>Common</artifactId>
+            <version>1.9.1</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+    </properties>
+
+</project>

Sponge/src/main/java/dev/brighten/antivpn/sponge/SpongePlayer.java

@@ -0,0 +1,31 @@
+package dev.brighten.antivpn.sponge;
+
+import dev.brighten.antivpn.api.APIPlayer;
+import dev.brighten.antivpn.sponge.util.StringUtil;
+import net.kyori.adventure.text.Component;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
+
+public class SpongePlayer extends APIPlayer {
+
+    private final ServerPlayer player;
+
+    public SpongePlayer(ServerPlayer player) {
+        super(player.uniqueId(), player.name(), player.connection().address().getAddress());
+        this.player = player;
+    }
+
+    @Override
+    public void sendMessage(String message) {
+        //player.sendMessage(StringUtil.translateColorCodes('&', message));
+    }
+
+    @Override
+    public void kickPlayer(String reason) {
+        player.kick(Component.text(StringUtil.translateColorCodes('&', reason)));
+    }
+
+    @Override
+    public boolean hasPermission(String permission) {
+        return player.hasPermission(permission);
+    }
+}

Sponge/src/main/java/dev/brighten/antivpn/sponge/SpongePlayerExecutor.java

@@ -0,0 +1,31 @@
+package dev.brighten.antivpn.sponge;
+
+import dev.brighten.antivpn.api.APIPlayer;
+import dev.brighten.antivpn.api.PlayerExecutor;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+public class SpongePlayerExecutor implements PlayerExecutor {
+    @Override
+    public Optional<APIPlayer> getPlayer(String name) {
+
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<APIPlayer> getPlayer(UUID uuid) {
+        return Optional.empty();
+    }
+
+    @Override
+    public void unloadPlayer(UUID uuid) {
+
+    }
+
+    @Override
+    public List<APIPlayer> getOnlinePlayers() {
+        return null;
+    }
+}

Sponge/src/main/java/dev/brighten/antivpn/sponge/SpongePlugin.java

@@ -0,0 +1,28 @@
+package dev.brighten.antivpn.sponge;
+
+import com.google.inject.Inject;
+import org.spongepowered.api.Server;
+import org.spongepowered.api.event.Listener;
+import org.spongepowered.api.event.lifecycle.StartedEngineEvent;
+import org.spongepowered.plugin.builtin.jvm.Plugin;
+
+import java.util.logging.Logger;
+
+@Plugin("kaurivpn")
+public class SpongePlugin {
+
+    public static SpongePlugin INSTANCE;
+    //Plugin init
+
+    @Inject
+    private Logger logger;
+
+    @Listener
+    public void onServerStart(final StartedEngineEvent<Server> event) {
+        INSTANCE = this;
+
+        logger.info("Starting AntiVPN services...");
+        //Start AntiVPN
+    }
+
+}

Sponge/src/main/java/dev/brighten/antivpn/sponge/util/StringUtil.java

@@ -0,0 +1,17 @@
+package dev.brighten.antivpn.sponge.util;
+
+public class StringUtil {
+
+    public static String translateColorCodes(char altColorChar, String textToTranslate) {
+        char[] b = textToTranslate.toCharArray();
+
+        for(int i = 0; i < b.length - 1; ++i) {
+            if (b[i] == altColorChar && "0123456789AaBbCcDdEeFfKkLlMmNnOoRr".indexOf(b[i + 1]) > -1) {
+                b[i] = 167;
+                b[i + 1] = Character.toLowerCase(b[i + 1]);
+            }
+        }
+
+        return new String(b);
+    }
+}

Velocity/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.8.2</version>
+        <version>1.9.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>dev.brighten.antivpn</groupId>
             <artifactId>Common</artifactId>
-            <version>1.8.2</version>
+            <version>1.9.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -67,6 +67,10 @@
                             <!-- Replace this with your package! -->
                             <shadedPattern>dev.brighten.antivpn.velocity.org.bstats</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>org.yaml.snakeyaml</pattern>
+                            <shadedPattern>dev.brighten.antivpn.shaded.org.yaml.snakeyaml</shadedPattern>
+                        </relocation>
                     </relocations>
                 </configuration>
                 <executions>

Velocity/src/main/java/dev/brighten/antivpn/velocity/VelocityListener.java

@@ -1,5 +1,8 @@
 package dev.brighten.antivpn.velocity;
 
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.velocitypowered.api.event.ResultedEvent;
 import com.velocitypowered.api.event.connection.DisconnectEvent;
 import com.velocitypowered.api.event.connection.LoginEvent;
 import com.velocitypowered.api.scheduler.ScheduledTask;
@@ -7,14 +10,21 @@ import dev.brighten.antivpn.AntiVPN;
 import dev.brighten.antivpn.api.APIPlayer;
 import dev.brighten.antivpn.api.VPNExecutor;
 import dev.brighten.antivpn.velocity.util.StringUtils;
+import dev.brighten.antivpn.web.objects.VPNResponse;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 
 public class VelocityListener extends VPNExecutor {
 
     private ScheduledTask cacheResetTask;
+    private final Cache<UUID, VPNResponse> responseCache = CacheBuilder.newBuilder()
+            .expireAfterWrite(5, TimeUnit.MINUTES)
+            .maximumSize(10000)
+            .build();
+
 
     @Override
     public void registerListeners() {
@@ -36,6 +46,18 @@ public class VelocityListener extends VPNExecutor {
                                 || AntiVPN.getInstance().getVpnConfig().getPrefixWhitelists().stream()
                                 .anyMatch(prefix -> event.getPlayer().getUsername().startsWith(prefix))) return;
 
+                        if(responseCache.asMap().containsKey(event.getPlayer().getUniqueId())) {
+                            VPNResponse cached = responseCache.getIfPresent(event.getPlayer().getUniqueId());
+
+                            if (cached != null && cached.isProxy()) {
+                                event.setResult(ResultedEvent.ComponentResult.denied(LegacyComponentSerializer.builder()
+                                        .character('&')
+                                        .build().deserialize(AntiVPN.getInstance().getVpnConfig()
+                                                .getKickString())));
+                                return;
+                            }
+                        }
+
                         checkIp(event.getPlayer().getRemoteAddress().getAddress().getHostAddress(),
                                 AntiVPN.getInstance().getVpnConfig().cachedResults(), result -> {
                                     if (result.isSuccess()) {
@@ -148,8 +170,13 @@ public class VelocityListener extends VPNExecutor {
         VelocityPlugin.INSTANCE.getServer().getEventManager().unregisterListener(VelocityPlugin.INSTANCE, this);
     }
 
+    @Override
+    public void log(Level level, String log, Object... objects) {
+        VelocityPlugin.INSTANCE.getLogger().log(level, String.format(log, objects));
+    }
+
     @Override
     public void log(String log, Object... objects) {
-        VelocityPlugin.INSTANCE.getLogger().log(Level.INFO, String.format(log, objects));
+        log(Level.INFO, String.format(log, objects));
     }
 }

pom.xml

@@ -7,7 +7,7 @@
     <groupId>dev.brighten.antivpn</groupId>
     <artifactId>AntiVPN</artifactId>
     <packaging>pom</packaging>
-    <version>1.8.2</version>
+    <version>1.9.1</version>
 
     <modules>
         <module>Common</module>
@@ -15,6 +15,7 @@
         <module>Bukkit</module>
         <module>Assembly</module>
         <module>Velocity</module>
+        <module>Sponge</module>
     </modules>
 
     <properties>