From d79d8426e0008fe1b3303ccdedad319b48d83db0 Mon Sep 17 00:00:00 2001 From: hub Date: Sat, 10 Sep 2022 16:39:22 +0200 Subject: [PATCH] server provider --- README.md | 2 +- cmd/server.go | 4 ++-- server/paper.go | 1 - server/provider.go | 6 ------ server/spigot.go | 26 -------------------------- 5 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 server/spigot.go diff --git a/README.md b/README.md index 4f226ab..58c7ac3 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Use "mrpack-install [command] --help" for more information about a command. Download and configure one of several Minecraft server flavors. Usage: - mrpack-install server (vanilla | fabric | quilt | forge | paper | spigot) [flags] + mrpack-install server (vanilla | fabric | quilt | forge | paper) [flags] Examples: mrpack-install server fabric --server-dir fabric-srv diff --git a/cmd/server.go b/cmd/server.go index 5e62038..c4dd9e7 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -16,13 +16,13 @@ func init() { } var serverCmd = &cobra.Command{ - Use: "server (vanilla | fabric | quilt | forge | paper | spigot)", + Use: "server (vanilla | fabric | quilt | forge | paper)", Short: "Prepare a plain server environment", Long: `Download and configure one of several Minecraft server flavors.`, Example: ` mrpack-install server fabric --server-dir fabric-srv mrpack-install server paper --minecraft-version 1.18.2 --server-file srv.jar`, Args: cobra.ExactValidArgs(1), - ValidArgs: []string{"vanilla", "fabric", "quilt", "forge", "paper", "spigot"}, + ValidArgs: []string{"vanilla", "fabric", "quilt", "forge", "paper"}, Run: func(cmd *cobra.Command, args []string) { minecraftVersion, err := cmd.Flags().GetString("minecraft-version") if err != nil { diff --git a/server/paper.go b/server/paper.go index 2831e92..2aaf6bd 100644 --- a/server/paper.go +++ b/server/paper.go @@ -9,7 +9,6 @@ import ( type Paper struct { MinecraftVersion string - PaperVersion string } func (provider *Paper) Provide(serverDir string, serverFile string) error { diff --git a/server/provider.go b/server/provider.go index cf179dd..7eee705 100644 --- a/server/provider.go +++ b/server/provider.go @@ -35,12 +35,6 @@ func NewProvider(flavor string, minecraftVersion string, flavorVersion string) ( case "paper": provider = &Paper{ MinecraftVersion: minecraftVersion, - PaperVersion: flavorVersion, - } - case "spigot": - provider = &Spigot{ - MinecraftVersion: minecraftVersion, - SpigotVersion: flavorVersion, } } diff --git a/server/spigot.go b/server/spigot.go deleted file mode 100644 index 1464d2e..0000000 --- a/server/spigot.go +++ /dev/null @@ -1,26 +0,0 @@ -package server - -import ( - "errors" - "os" -) - -type Spigot struct { - MinecraftVersion string - SpigotVersion string -} - -func (provider *Spigot) Provide(serverDir string, serverFile string) error { - return errors.New("spigot provider not implemented") - - err := os.MkdirAll("work/spigot", 0755) - if err != nil { - return err - } - - // TODO: download https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar - // TODO: git config --global --unset core.autocrlf - // TODO: java -jar BuildTools.jar --rev ${minecraftVersion} - - return nil -}