Support java module

Author: juho05

cmd/build.go

@@ -54,7 +54,7 @@ var buildCmd = &cobra.Command{
 			Arch:   arch,
 		}
 		switch data.Lang {
-		case "cs", "go", "js", "ts":
+		case "cs", "go", "java", "js", "ts":
 			err = modules.ExecuteBuild(buildData, data)
 			abort(err)
 		default:

cmd/docs.go

@@ -56,10 +56,10 @@ var docsCmd = &cobra.Command{
 
 		os.Remove(filepath.Join(os.TempDir(), "event_docs.md"))
 
-		err = os.WriteFile(filepath.Join(os.TempDir(), "event_docs.html"), text, 0644)
+		err = os.WriteFile(filepath.Join(os.TempDir(), "event_docs.html"), text, 0o644)
 		abort(err)
 
-		err = os.WriteFile(filepath.Join(os.TempDir(), "event_docs.css"), []byte(docsStyle), 0644)
+		err = os.WriteFile(filepath.Join(os.TempDir(), "event_docs.css"), []byte(docsStyle), 0o644)
 		abort(err)
 
 		cli.Print("Opening documentation...")

cmd/new.go

@@ -164,12 +164,12 @@ func newClient() error {
 		return err
 	}
 
-	language, err := cli.SelectString("Language:", []string{"C#", "Go", "JavaScript", "TypeScript"}, []string{"cs", "go", "js", "ts"})
+	language, err := cli.SelectString("Language:", []string{"C#", "Go", "Java", "JavaScript", "TypeScript"}, []string{"cs", "go", "java", "js", "ts"})
 	if err != nil {
 		return err
 	}
 
-	file := cgfile.CodeGameFileData{
+	file := &cgfile.CodeGameFileData{
 		Game: info.Name,
 		Type: "client",
 		Lang: language,
@@ -193,6 +193,9 @@ func newClient() error {
 	case "go":
 		newData.LibraryVersion = external.LibraryVersionFromCGVersion("code-game-project", "go-client", info.CGVersion)
 		err = modules.ExecuteNewClient(newData)
+	case "java":
+		newData.LibraryVersion = external.LibraryVersionFromCGVersion("code-game-project", "java-client", info.CGVersion)
+		err = modules.ExecuteNewClient(newData)
 	case "js", "ts":
 		newData.LibraryVersion = external.LibraryVersionFromCGVersion("code-game-project", "javascript-client", info.CGVersion)
 		err = modules.ExecuteNewClient(newData)
@@ -203,13 +206,30 @@ func newClient() error {
 		return err
 	}
 
-	if language == "cs" || language == "go" || language == "ts" {
+	file, err = cgfile.LoadCodeGameFile("")
+	if err != nil {
+		return fmt.Errorf("Failed to open .codegame.json: %w", err)
+	}
+
+	if language == "cs" || language == "go" || language == "java" || language == "ts" {
 		eventsOutput := info.Name
 		switch language {
 		case "cs":
 			eventsOutput = strings.ReplaceAll(strings.Title(strings.ReplaceAll(strings.ReplaceAll(eventsOutput, "_", " "), "-", " ")), " ", "")
 		case "go":
 			eventsOutput = strings.ReplaceAll(strings.ReplaceAll(eventsOutput, "-", ""), "_", "")
+		case "java":
+			packageConf, ok := file.LangConfig["package"]
+			if !ok {
+				return errors.New("Missing language config field `package` in .codegame.json!")
+			}
+			packageName := packageConf.(string)
+			if packageConf == "" {
+				return errors.New("Empty language config field `package` in .codegame.json!")
+			}
+			gameDir := filepath.Join("src", "main", "java")
+			pkgDir := filepath.Join(strings.Split(packageName, ".")...)
+			eventsOutput = filepath.Join(gameDir, pkgDir, strings.ReplaceAll(strings.ReplaceAll(strings.ToLower(eventsOutput), "_", ""), "-", ""))
 		case "ts":
 			eventsOutput = filepath.Join("src", eventsOutput)
 		}

cmd/run.go

@@ -33,7 +33,7 @@ var runCmd = &cobra.Command{
 		}
 
 		switch data.Lang {
-		case "cs", "go", "js", "ts":
+		case "cs", "go", "java", "js", "ts":
 			err = modules.ExecuteRun(runData, data)
 			abort(err)
 		default:

cmd/update.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -90,6 +91,9 @@ func updateClient(config *cgfile.CodeGameFileData) error {
 	case "go":
 		updateData.LibraryVersion = external.LibraryVersionFromCGVersion("code-game-project", "go-client", info.CGVersion)
 		err = modules.ExecuteUpdate(updateData, config)
+	case "java":
+		updateData.LibraryVersion = external.LibraryVersionFromCGVersion("code-game-project", "java-client", info.CGVersion)
+		err = modules.ExecuteUpdate(updateData, config)
 	case "js", "ts":
 		updateData.LibraryVersion = external.LibraryVersionFromCGVersion("code-game-project", "javascript-client", info.CGVersion)
 		err = modules.ExecuteUpdate(updateData, config)
@@ -100,13 +104,25 @@ func updateClient(config *cgfile.CodeGameFileData) error {
 		return err
 	}
 
-	if config.Lang == "cs" || config.Lang == "go" || config.Lang == "ts" {
+	if config.Lang == "cs" || config.Lang == "go" || config.Lang == "java" || config.Lang == "ts" {
 		eventsOutput := config.Game
 		switch config.Lang {
 		case "cs":
 			eventsOutput = strings.ReplaceAll(strings.Title(strings.ReplaceAll(strings.ReplaceAll(eventsOutput, "_", " "), "-", " ")), " ", "")
 		case "go":
 			eventsOutput = strings.ReplaceAll(strings.ReplaceAll(eventsOutput, "-", ""), "_", "")
+		case "java":
+			packageConf, ok := config.LangConfig["package"]
+			if !ok {
+				return errors.New("Missing language config field `package` in .codegame.json!")
+			}
+			packageName := packageConf.(string)
+			if packageConf == "" {
+				return errors.New("Empty language config field `package` in .codegame.json!")
+			}
+			gameDir := filepath.Join("src", "main", "java")
+			pkgDir := filepath.Join(strings.Split(packageName, ".")...)
+			eventsOutput = filepath.Join(gameDir, pkgDir, strings.ReplaceAll(strings.ReplaceAll(strings.ToLower(eventsOutput), "_", ""), "-", ""))
 		case "ts":
 			eventsOutput = filepath.Join("src", eventsOutput)
 		}