Skip to content

Commit da68d35

Browse files
committed
Don't ask whether to generate helper functions
1 parent 0a53e87 commit da68d35

File tree

2 files changed

+7
-15
lines changed

2 files changed

+7
-15
lines changed

main.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ func main() {
1919
var url string
2020
pflag.StringVar(&url, "url", "", "The URL of the game. (required for clients)")
2121

22-
var supportsWrappers bool
23-
pflag.BoolVar(&supportsWrappers, "supports-wrappers", false, "Whether the wrappers are supported. (required for clients)")
22+
var generateWrappers bool
23+
pflag.BoolVar(&generateWrappers, "generate-wrappers", false, "Whether to generate helper functions.")
2424

2525
var libraryVersion string
2626
pflag.StringVar(&libraryVersion, "library-version", "latest", "The version of the Go library to use, e.g. 0.8")
@@ -49,7 +49,7 @@ func main() {
4949

5050
switch command {
5151
case "new":
52-
err = new(projectName, gameName, url, libraryVersion, supportsWrappers)
52+
err = new(projectName, gameName, url, libraryVersion, generateWrappers)
5353
default:
5454
err = cli.Error("Unknown command: %s\n", command)
5555
}
@@ -58,13 +58,13 @@ func main() {
5858
}
5959
}
6060

61-
func new(projectName, gameName, url, libraryVersion string, supportsWrappers bool) error {
61+
func new(projectName, gameName, url, libraryVersion string, generateWrappers bool) error {
6262
projectType := strings.ToLower(pflag.Arg(1))
6363

6464
var err error
6565
switch projectType {
6666
case "client":
67-
err = client.CreateNewClient(projectName, gameName, url, libraryVersion, supportsWrappers)
67+
err = client.CreateNewClient(projectName, gameName, url, libraryVersion, generateWrappers)
6868
case "server":
6969
err = server.CreateNewServer(projectName, libraryVersion)
7070
default:

new/client/client.go

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ var goClientWrapperGameTemplate string
2525
//go:embed templates/wrappers/events.go.tmpl
2626
var goClientWrapperEventsTemplate string
2727

28-
func CreateNewClient(projectName, gameName, serverURL, libraryVersion string, supportsWrappers bool) error {
28+
func CreateNewClient(projectName, gameName, serverURL, libraryVersion string, generateWrappers bool) error {
2929
module, err := cli.Input("Project module path:")
3030
if err != nil {
3131
return err
@@ -41,14 +41,6 @@ func CreateNewClient(projectName, gameName, serverURL, libraryVersion string, su
4141
return err
4242
}
4343

44-
wrappers := false
45-
if supportsWrappers {
46-
wrappers, err = cli.YesNo("Do you want to generate helper functions?", true)
47-
if err != nil {
48-
return err
49-
}
50-
}
51-
5244
cli.Begin("Installing correct go-client version...")
5345
_, err = util.Execute(true, "go", "get", fmt.Sprintf("%s@%s", libraryURL, libraryTag))
5446
if err != nil {
@@ -57,7 +49,7 @@ func CreateNewClient(projectName, gameName, serverURL, libraryVersion string, su
5749
cli.Finish()
5850

5951
cli.Begin("Creating project template...")
60-
err = createGoClientTemplate(projectName, module, gameName, serverURL, libraryURL, wrappers)
52+
err = createGoClientTemplate(projectName, module, gameName, serverURL, libraryURL, generateWrappers)
6153
if err != nil {
6254
return err
6355
}

0 commit comments

Comments
 (0)