Support Forge clients (#27)

* Add nix devshell and .envrc * Add .direnv to .gitignore * Handle forge FML protocol
AbandonTech · Apr 22, 2024 · bb5612c · bb5612c
1 parent df7f23b
commit bb5612c
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 1 deletion.
diff --git a/.envrc b/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 data
 
 
-.idea
+.idea
+.direnv
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -0,0 +1,11 @@
+{
+  outputs = { self, nixpkgs, ... }:
+    let
+      forAllSystems = function:
+        nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ]
+        (system: function nixpkgs.legacyPackages.${system});
+    in rec {
+      devShells =
+        forAllSystems (pkgs: { default = pkgs.callPackage ./shell.nix { }; });
+    };
+}
diff --git a/pkg/router.go b/pkg/router.go
@@ -117,8 +117,13 @@ func (r Router) handleConnection(client net.Conn) {
 		return
 	}
 	serverAddress := string(serverAddressRaw)
+
+	// Its common for proxies or mods to append extra data to the server address after a "///" separator. We ignore this for routing.
 	serverAddress = strings.Split(serverAddress, "///")[0]
 
+	// Forge's "FML" protocol appends a marker to the end of the server address prefixed with a null character.
+	serverAddress = strings.Split(serverAddress, "\x00")[0]
+
 	serverPortRaw := make([]byte, 2)
 	_, err = packetReader.Read(serverPortRaw)
 	if err != nil {

diff --git a/shell.nix b/shell.nix
@@ -0,0 +1,4 @@
+{ pkgs ? import <nixpkgs> { }, ... }:
+pkgs.mkShell {
+  packages = with pkgs; [ go gopls ];
+}