move cmd to more sensible location

tools/cli/main.go

@@ -1,59 +0,0 @@
-package main
-
-import (
-	"errors"
-	"fmt"
-	"log/slog"
-	"maps"
-	"os"
-	"slices"
-
-	"github.com/admin-else/strom/tools/cli/offline_uuid"
-	"github.com/admin-else/strom/tools/cli/print_nbt"
-	"github.com/admin-else/strom/tools/cli/status"
-)
-
-var ExpectedASubcommandErr = errors.New("expected a subcommand")
-var UnknownSubcommandErr = errors.New("unknown subcommand")
-
-var subcommands = map[string]func(args []string) error{
-	"offline-uuid": offline_uuid.Run,
-	"print-nbt":    print_nbt.Run,
-	"status":       status.Run,
-}
-
-func Help(args []string) (err error) {
-	fmt.Println("Available subcommands", slices.Collect(maps.Keys(subcommands)))
-	return
-}
-
-func mainE() (err error) {
-	subcommands["help"] = Help // this is here because if it isn't tools/cli/main.go:17:5: initialization cycle for subcommands
-	//	tools/cli/main.go:17:5: subcommands refers to Help
-	//	tools/cli/main.go:22:6: Help refers to subcommands
-	args := os.Args
-
-	// Debug stuff
-	//slog.SetLogLoggerLevel(slog.LevelDebug)
-	//args = []string{"TEST", "status", "-srv", "-addr", "tcpshield.1f2d.net:25565"}
-
-	if len(args) < 2 {
-		err = ExpectedASubcommandErr
-		return
-	}
-
-	f, ok := subcommands[args[1]]
-	if !ok {
-		err = UnknownSubcommandErr
-		return
-	}
-	err = f(args[2:])
-	return
-}
-
-func main() {
-	err := mainE()
-	if err != nil {
-		slog.Error("exiting", "err", err)
-	}
-}

tools/cli/offline_uuid/offline_uuid.go

@@ -1,20 +0,0 @@
-package offline_uuid
-
-import (
-	"flag"
-	"fmt"
-
-	"github.com/admin-else/strom/crypto"
-)
-
-var cmd = flag.NewFlagSet("offline-uuid", flag.ContinueOnError)
-var nameFlag = cmd.String("name", "Notch", "name of the player")
-
-func Run(args []string) (err error) {
-	err = cmd.Parse(args)
-	if err != nil {
-		return
-	}
-	fmt.Println(crypto.FromOfflinePlayer(*nameFlag))
-	return
-}

tools/cli/print_nbt/main.go

@@ -1,49 +0,0 @@
-package print_nbt
-
-import (
-	"bytes"
-	"encoding/json"
-	"flag"
-	"os"
-
-	"github.com/admin-else/strom/nbt"
-)
-
-var (
-	cmd            = flag.NewFlagSet("print-nbt", flag.ContinueOnError)
-	FileFlag       = cmd.String("file", "", "The NBT file to print")
-	HashFormatFlag = cmd.Bool("snbt", false, "will print with go %#v")
-)
-
-func Run(args []string) (err error) {
-	err = cmd.Parse(args)
-	if err != nil {
-		return
-	}
-	f, err := os.Open(*FileFlag)
-	if err != nil {
-		return
-	}
-	defer f.Close()
-	n, err := nbt.ReadFile(f)
-	if err != nil {
-		return
-	}
-	var b []byte
-	if *HashFormatFlag {
-		bb := bytes.NewBuffer(nil)
-		err = nbt.PrintSNBTAny(n.Value, bb)
-		if err != nil {
-			return
-		}
-		b = bb.Bytes()
-		//b = []byte(strings.ReplaceAll(string(b), ",", ",\n"))
-	} else {
-		b, err = json.MarshalIndent(n, "", "  ")
-	}
-	if err != nil {
-		return
-	}
-	_, err = os.Stdout.Write(b)
-	return
-}

tools/cli/status/main.go

@@ -1,32 +0,0 @@
-package status
-
-import (
-	"flag"
-	"fmt"
-
-	"github.com/admin-else/strom/client"
-)
-
-var cmd = flag.NewFlagSet("status", flag.ContinueOnError)
-var addrFlag = cmd.String("addr", "localhost:25565", "address to connect to")
-var srvFlag = cmd.Bool("srv", false, "use SRV records to resolve the address")
-
-func Run(args []string) (err error) {
-	err = cmd.Parse(args)
-	if err != nil {
-		return
-	}
-	if *srvFlag {
-		*addrFlag, err = client.DoDnsSimple(*addrFlag)
-		if err != nil {
-			return
-		}
-	}
-
-	status, err := client.StatusRaw(*addrFlag)
-	if err != nil {
-		return
-	}
-	fmt.Println(status.Status)
-	return
-}