From f46ff894ccefe2b7ebd97ee512b7c2a16b1b07c9 Mon Sep 17 00:00:00 2001
From: comp500 <comp500@users.noreply.github.com>
Date: Wed, 13 Nov 2019 21:24:08 +0000
Subject: [PATCH] Change ModID/FileID structs to use AddonFileReference

---
 curseforge/import.go                        | 10 +++++-----
 curseforge/packinterop/interfaces.go        |  6 +-----
 curseforge/packinterop/manifest.go          | 19 +++++--------------
 curseforge/packinterop/minecraftinstance.go | 19 +++++--------------
 4 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/curseforge/import.go b/curseforge/import.go
index 5c95401..e81027c 100644
--- a/curseforge/import.go
+++ b/curseforge/import.go
@@ -174,7 +174,7 @@ var importCmd = &cobra.Command{
 		modsList := packImport.Mods()
 		modIDs := make([]int, len(modsList))
 		for i, v := range modsList {
-			modIDs[i] = v.ModID
+			modIDs[i] = v.ProjectID
 		}
 
 		fmt.Println("Querying Curse API for mod info...")
@@ -195,9 +195,9 @@ var importCmd = &cobra.Command{
 		referencedModPaths := make([]string, 0, len(modsList))
 		successes := 0
 		for _, v := range modsList {
-			modInfoValue, ok := modInfosMap[v.ModID]
+			modInfoValue, ok := modInfosMap[v.ProjectID]
 			if !ok {
-				fmt.Printf("Failed to obtain mod information for ID %d\n", v.ModID)
+				fmt.Printf("Failed to obtain mod information for ID %d\n", v.ProjectID)
 				continue
 			}
 
@@ -210,9 +210,9 @@ var importCmd = &cobra.Command{
 				}
 			}
 			if !found {
-				fileInfo, err = getFileInfo(v.ModID, v.FileID)
+				fileInfo, err = getFileInfo(v.ProjectID, v.FileID)
 				if err != nil {
-					fmt.Printf("Failed to obtain file information for Mod / File %d / %d: %s\n", v.ModID, v.FileID, err)
+					fmt.Printf("Failed to obtain file information for Mod / File %d / %d: %s\n", v.ProjectID, v.FileID, err)
 					continue
 				}
 			}
diff --git a/curseforge/packinterop/interfaces.go b/curseforge/packinterop/interfaces.go
index beca2c9..d2bc905 100644
--- a/curseforge/packinterop/interfaces.go
+++ b/curseforge/packinterop/interfaces.go
@@ -10,11 +10,7 @@ type ImportPackFile interface {
 type ImportPackMetadata interface {
 	Name() string
 	Versions() map[string]string
-	// TODO: use AddonFileReference?
-	Mods() []struct {
-		ModID  int
-		FileID int
-	}
+	Mods() []AddonFileReference
 	GetFiles() ([]ImportPackFile, error)
 }
 
diff --git a/curseforge/packinterop/manifest.go b/curseforge/packinterop/manifest.go
index 06a226b..a2f4f0d 100644
--- a/curseforge/packinterop/manifest.go
+++ b/curseforge/packinterop/manifest.go
@@ -48,21 +48,12 @@ func (c cursePackMeta) Versions() map[string]string {
 	return vers
 }
 
-func (c cursePackMeta) Mods() []struct {
-	ModID  int
-	FileID int
-} {
-	list := make([]struct {
-		ModID  int
-		FileID int
-	}, len(c.Files))
+func (c cursePackMeta) Mods() []AddonFileReference {
+	list := make([]AddonFileReference, len(c.Files))
 	for i, v := range c.Files {
-		list[i] = struct {
-			ModID  int
-			FileID int
-		}{
-			ModID:  v.ProjectID,
-			FileID: v.FileID,
+		list[i] = AddonFileReference{
+			ProjectID: v.ProjectID,
+			FileID:    v.FileID,
 		}
 	}
 	return list
diff --git a/curseforge/packinterop/minecraftinstance.go b/curseforge/packinterop/minecraftinstance.go
index 0e161df..f859f35 100644
--- a/curseforge/packinterop/minecraftinstance.go
+++ b/curseforge/packinterop/minecraftinstance.go
@@ -47,21 +47,12 @@ func (m twitchInstalledPackMeta) Versions() map[string]string {
 	return vers
 }
 
-func (m twitchInstalledPackMeta) Mods() []struct {
-	ModID  int
-	FileID int
-} {
-	list := make([]struct {
-		ModID  int
-		FileID int
-	}, len(m.ModsInternal))
+func (m twitchInstalledPackMeta) Mods() []AddonFileReference {
+	list := make([]AddonFileReference, len(m.ModsInternal))
 	for i, v := range m.ModsInternal {
-		list[i] = struct {
-			ModID  int
-			FileID int
-		}{
-			ModID:  v.ID,
-			FileID: v.File.ID,
+		list[i] = AddonFileReference{
+			ProjectID: v.ID,
+			FileID:    v.File.ID,
 		}
 	}
 	return list