Merge pull request #2 from Outfit8TSB/patch-1

update to latest 3.3.4.

Author: Lenni0451

README.MD

@@ -4,24 +4,33 @@ This plugin is only needed if you want to host a public SRV mode proxy instance.
 
 ## SRV ViaProxy
 ### Running ViaProxy in SRV mode
-To use the SRV mode in ViaProxy you have to start it through the command line.\
-The command line arguments are as follows:
-````bash
-java -jar ViaProxy.jar -ba 0.0.0.0 -bp <bind port> -srv -oam_auth -a0 -v1.8.x
-````
-
-You have to replace ``<bind port>`` with the port you want ViaProxy to run on.\
-The ``-oam_auth`` argument is optional and enables the [OpenAuthMod](https://github.com/RaphiMC/OpenAuthMod) authentication.\
-The ``-a0`` and ``-v1.8.x`` arguments are required for ViaProxy to start but don't do anything in SRV mode.
 
+To use the SRV mode in ViaProxy you have to start it through the config.\
+Here are The config options require to make a Public SRV mode.
+```
+bind-address: 0.0.0.0:25568 # will translate to viaproxy.0-0-0-0.nip.io:25568
+target-address: 127.0.0.1 # unused on srv mode.
+target-version: 1.8.x # unused on srv mode.
+auth-method: OpenAuthMod
+wildcard-domain-handling: PUBLIC
+```
+
+You have to replace ``0.0.0.0:<bind port>`` with the port you want ViaProxy to run on.\
+The ``auth-method: openauthmod`` is optional and enables the [OpenAuthMod](https://github.com/RaphiMC/OpenAuthMod) authentication. for 1.19.4 users, see the caution below.\
+The ``target-address`` and ``target-version`` are required for ViaProxy to start but don't do anything in SRV mode.
+> [!CAUTION]
+> warning: auth-method: openauthmod will be not functional for 1.7-1.7.10, Vanilla 1.8-1.19.3, 1.19.4-1.21.1, and Bedrock Edition.\
+> Reason: 1.7-1.7.10: OpenAuthMod is only available for 1.8.
+> Bedrock: Forge or Fabric don't support Bedrock Edition.\
+> 1.19.4+: OpenAuthMod discontinued before release of 1.19.4. use this option if you want to.
 ### Connecting to ViaProxy in SRV mode
 To connect to ViaProxy in SRV mode you need a domain pointing to the IP of the server running ViaProxy.\
 The subdomain ``viaproxy.`` is required for it to work.\
 For local connections you can use ``viaproxy.127-0-0-1.nip.io``.
 
 To connect to a server through ViaProxy you have to prepend the ``server ip``, ``server port`` and ``version`` to your domain:
 ````
-<ip>_<port>_<version>.viaproxy.<domain>
+address_port_version.viaproxy.hostname
 ````
 
 For example to connect to ``lenni0451.net:39999`` with the version ``C0.30-CPE`` you can use:

build.gradle

@@ -17,5 +17,5 @@ repositories {
 }
 
 dependencies {
-    implementation "net.raphimc:ViaProxy:3.2.2"
+    implementation "net.raphimc:ViaProxy:3.3.4-SNAPSHOT"
 }

src/main/java/net/lenni0451/nolocalconnections/KickMessageConfig.java

@@ -0,0 +1,38 @@
+package net.lenni0451.nolocalconnections;
+
+import net.lenni0451.optconfig.ConfigLoader;
+import net.lenni0451.optconfig.annotations.Description;
+import net.lenni0451.optconfig.annotations.OptConfig;
+import net.lenni0451.optconfig.annotations.Option;
+import net.lenni0451.optconfig.provider.ConfigProvider;
+import net.raphimc.viaproxy.util.logging.Logger;
+
+import java.io.File;
+import java.util.List;
+
+@OptConfig(header = {
+        "Configuration for the NoLocalConnections ViaProxy plugin.",
+        "Used to block a Connection for Local Address Connections through ViaProxy(useful for address_port_version.viaproxy.hostname).",
+        "",
+        "Made by Lenni0451",
+        "Source: https://github.com/ViaVersionAddons/NoLocalConnections"
+})
+public class KickMessageConfig {
+
+    @Option("kick")
+    @Description({
+            "kick message when the user tries to join using local address such as 192.168.35.1. you can use the Decoration Codes here using Section Symbol(§)."
+    })
+    public static String kick = "§cYou can't connect to any local address.";
+  
+    public static void load() {
+        try {
+            ConfigLoader<KickMessageConfig> configLoader = new ConfigLoader<>(KickMessageConfig.class);
+            configLoader.getConfigOptions().setResetInvalidOptions(true); //Reset invalid options to their default value
+            configLoader.loadStatic(ConfigProvider.file(new File("kickmessage.yml")));
+        } catch (Throwable t) {
+            Logger.LOGGER.error("Unable to load kick message! turning off viaproxy...", t);
+            System.exit(-1);
+        }
+    }
+}

src/main/java/net/lenni0451/nolocalconnections/Main.java

@@ -1,5 +1,6 @@
 package net.lenni0451.nolocalconnections;
 
+import net.lenni0451.nolocalconnections.KickMessageConfig;
 import net.lenni0451.lambdaevents.EventHandler;
 import net.raphimc.viaproxy.ViaProxy;
 import net.raphimc.viaproxy.plugins.ViaProxyPlugin;
@@ -12,13 +13,14 @@ public class Main extends ViaProxyPlugin {
 
     @Override
     public void onEnable() {
+        KickMessageConfig.load();
         ViaProxy.EVENT_MANAGER.register(this);
     }
 
     @EventHandler
     public void onEvent(PreConnectEvent event) {
         if (!(event.getServerAddress() instanceof InetSocketAddress socketAddress)) return;
-        if (this.isLocal(socketAddress.getAddress())) event.setCancelMessage("§cYou can't connect to any local address");
+        if (this.isLocal(socketAddress.getAddress())) event.setCancelMessage(KickMessageConfig.kick);
     }
 
     private boolean isLocal(final InetAddress address) {