domain/domain.go

@@ -3,16 +3,17 @@ package domain
 import (
 	"errors"
 
-	"git.gregbrzezinski.com/Skirda/skirdaGoLauncher/sharedutils/skirdasession"
+	"git.gregbrzezinski.com/Skirda/sharedutils/games/skirdagame"
+	"git.gregbrzezinski.com/Skirda/sharedutils/skirdasession"
 )
 
 type SkirdaDomain struct {
 	DomainId string
-	SkirdaGames
+	skirdagame.SkirdaGames
 	skirdasession.SkirdaSessions
 }
 
-func (domain SkirdaDomain) BuildDomain(newGames []SkirdaGame, newSessions []skirdasession.SkirdaSession) {
+func (domain SkirdaDomain) BuildDomain(newGames []skirdagame.SkirdaGame, newSessions []skirdasession.SkirdaSession) {
 	domain.AddGames(newGames)
 	domain.AddSessions(newSessions)
 }
@@ -23,7 +24,7 @@ func (domains Domains) Set(newDomains []SkirdaDomain) {
 	domains = append([]SkirdaDomain{}, newDomains...)
 }
 
-func (domains Domains) FindGameByID(gameId string) (SkirdaGame, error) {
+func (domains Domains) FindGameByID(gameId string) (skirdagame.SkirdaGame, error) {
 	for _, domain := range domains {
 		game, _ := domain.FindGameByID(gameId)
 		if game.GetSkirdaGameId() == gameId {
@@ -34,8 +35,8 @@ func (domains Domains) FindGameByID(gameId string) (SkirdaGame, error) {
 	return nil, errors.New("")
 }
 
-func (domains Domains) GetGames() SkirdaGames {
-	allGames := SkirdaGames{}
+func (domains Domains) GetGames() skirdagame.SkirdaGames {
+	allGames := skirdagame.SkirdaGames{}
 	for _, domain := range domains {
 		allGames = append(allGames, domain.SkirdaGames...)
 	}

games/minecraftgame/minecraftgame.go

@@ -1,10 +1,12 @@
-package domain
+package minecraftgame
 
-// const gameType = "minecraft"
+import "git.gregbrzezinski.com/Skirda/sharedutils/games/skirdagame"
+
+const gameType = "minecraft"
 
 type MinecraftGame struct {
 	SkirdaGameId string
-	Assets       GameUIAssets
+	Assets       skirdagame.GameUIAssets
 	Versions     []string
 }
 
@@ -12,7 +14,7 @@ func (game MinecraftGame) GetSkirdaGameId() string {
 	return game.SkirdaGameId
 }
 
-func (game MinecraftGame) GetUIAssets() GameUIAssets {
+func (game MinecraftGame) GetUIAssets() skirdagame.GameUIAssets {
 	return game.Assets
 }
 
@@ -21,11 +23,11 @@ func (game MinecraftGame) GetLaunchArgs() []string {
 }
 
 func (game MinecraftGame) GetType() string {
-	return "minecraft"
+	return gameType
 }
 
-func (game MinecraftGame) GetArguments() Arguments {
-	return Arguments{}
+func (game MinecraftGame) GetArguments() skirdagame.Arguments {
+	return skirdagame.Arguments{}
 }
 
 func (game MinecraftGame) GetVersions() []string {

games/skirdagame/skirdagame.go

@@ -1,4 +1,4 @@
-package domain
+package skirdagame
 
 import "errors"
 

games/steamgame/steamgame.go

@@ -1,10 +1,14 @@
-package domain
+package steamgame
+
+import "git.gregbrzezinski.com/Skirda/sharedutils/games/skirdagame"
+
+const gameType = "steam"
 
 type SteamGame struct {
 	SkirdaGameId string
 	SteamId      string
-	Assets       GameUIAssets
-	Arguments    Arguments
+	Assets       skirdagame.GameUIAssets
+	Arguments    skirdagame.Arguments
 	// CurrentVersion string
 }
 
@@ -12,7 +16,7 @@ func (game SteamGame) GetSkirdaGameId() string {
 	return game.SkirdaGameId
 }
 
-func (game SteamGame) GetUIAssets() GameUIAssets {
+func (game SteamGame) GetUIAssets() skirdagame.GameUIAssets {
 	return game.Assets
 }
 
@@ -21,9 +25,9 @@ func (game SteamGame) GetLaunchArgs() []string {
 }
 
 func (game SteamGame) GetType() string {
-	return "steam"
+	return gameType
 }
 
-func (game SteamGame) GetArguments() Arguments {
+func (game SteamGame) GetArguments() skirdagame.Arguments {
 	return game.Arguments
 }