Don't ask whether to generate helper functions

code-game-project · Jun 10, 2022 · da68d35 · da68d35
1 parent 0a53e87
commit da68d35
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/main.go b/main.go
@@ -19,8 +19,8 @@ func main() {
 	var url string
 	pflag.StringVar(&url, "url", "", "The URL of the game. (required for clients)")
 
-	var supportsWrappers bool
-	pflag.BoolVar(&supportsWrappers, "supports-wrappers", false, "Whether the wrappers are supported. (required for clients)")
+	var generateWrappers bool
+	pflag.BoolVar(&generateWrappers, "generate-wrappers", false, "Whether to generate helper functions.")
 
 	var libraryVersion string
 	pflag.StringVar(&libraryVersion, "library-version", "latest", "The version of the Go library to use, e.g. 0.8")
@@ -49,7 +49,7 @@ func main() {
 
 	switch command {
 	case "new":
-		err = new(projectName, gameName, url, libraryVersion, supportsWrappers)
+		err = new(projectName, gameName, url, libraryVersion, generateWrappers)
 	default:
 		err = cli.Error("Unknown command: %s\n", command)
 	}
@@ -58,13 +58,13 @@ func main() {
 	}
 }
 
-func new(projectName, gameName, url, libraryVersion string, supportsWrappers bool) error {
+func new(projectName, gameName, url, libraryVersion string, generateWrappers bool) error {
 	projectType := strings.ToLower(pflag.Arg(1))
 
 	var err error
 	switch projectType {
 	case "client":
-		err = client.CreateNewClient(projectName, gameName, url, libraryVersion, supportsWrappers)
+		err = client.CreateNewClient(projectName, gameName, url, libraryVersion, generateWrappers)
 	case "server":
 		err = server.CreateNewServer(projectName, libraryVersion)
 	default:

diff --git a/new/client/client.go b/new/client/client.go
@@ -25,7 +25,7 @@ var goClientWrapperGameTemplate string
 //go:embed templates/wrappers/events.go.tmpl
 var goClientWrapperEventsTemplate string
 
-func CreateNewClient(projectName, gameName, serverURL, libraryVersion string, supportsWrappers bool) error {
+func CreateNewClient(projectName, gameName, serverURL, libraryVersion string, generateWrappers bool) error {
 	module, err := cli.Input("Project module path:")
 	if err != nil {
 		return err
@@ -41,14 +41,6 @@ func CreateNewClient(projectName, gameName, serverURL, libraryVersion string, su
 		return err
 	}
 
-	wrappers := false
-	if supportsWrappers {
-		wrappers, err = cli.YesNo("Do you want to generate helper functions?", true)
-		if err != nil {
-			return err
-		}
-	}
-
 	cli.Begin("Installing correct go-client version...")
 	_, err = util.Execute(true, "go", "get", fmt.Sprintf("%s@%s", libraryURL, libraryTag))
 	if err != nil {
@@ -57,7 +49,7 @@ func CreateNewClient(projectName, gameName, serverURL, libraryVersion string, su
 	cli.Finish()
 
 	cli.Begin("Creating project template...")
-	err = createGoClientTemplate(projectName, module, gameName, serverURL, libraryURL, wrappers)
+	err = createGoClientTemplate(projectName, module, gameName, serverURL, libraryURL, generateWrappers)
 	if err != nil {
 		return err
 	}