See description for details

solidDoWant · solidDoWant · commit 7d911b60292b · 2018-01-21T11:33:38.000-06:00
-Fixed PNG, strings, and OBJ exceptions while loading
-Added optional Version property to ModBase
-Added method to easily get framework version
-Updated assembly version
diff --git a/FrameworkMod.cs b/FrameworkMod.cs
@@ -1,9 +1,13 @@
-﻿using Planetbase;
+﻿using System;
+using System.Reflection;
+using Planetbase;
 
 namespace PlanetbaseFramework
 {
-    class FrameworkMod : ModBase
+    public class FrameworkMod : ModBase
     {
+        public override Version ModVersion => Assembly.GetExecutingAssembly().GetName().Version;
+
         public FrameworkMod()
         {
             Utils.ErrorTexture = ModTextures.Find(x => x.name.Equals("error.png"));
diff --git a/ModBase.cs b/ModBase.cs
@@ -11,34 +11,48 @@ public abstract class ModBase
         public List<Texture2D> ModTextures { get; protected set; }
         public List<GameObject> ModObjects { get; protected set; }
 
+        public virtual Version ModVersion => new Version(0, 0, 0, 0);
+
         protected ModBase()
         {
             try
             {
-                Debug.Log("Loaded " + LoadAllString("assets" + Path.DirectorySeparatorChar + "strings" + Path.DirectorySeparatorChar) + " string file(s)");
+                LoadAllString(Path.Combine("assets", "strings"));
             }
-            catch (Exception)
+            catch (Exception e)
             {
-                Debug.Log("Couldn't/no strings filies to load");
+                Debug.Log("Failed to load strings files due to exception:");
+                Utils.LogException(e);
             }
 
             try
             {
-                ModTextures = LoadAllPng("assets" + Path.DirectorySeparatorChar + "png" + Path.DirectorySeparatorChar);
+                ModTextures = LoadAllPng(Path.Combine("assets","png"));
+
+                if (ModTextures.Count > 0)
+                {
+                    Debug.Log("Successfully loaded " + ModTextures.Count + " texture(s)");
+                }
             }
-            catch (Exception)
+            catch (Exception e)
             {
-                Debug.Log("Couldn't/no PNG files to load");
+                Debug.Log("Failed to load PNG files due to exception:");
+                Utils.LogException(e);
             }
 
             try
             {
-                ModObjects = LoadAllObj("assets" + Path.DirectorySeparatorChar + "obj" + Path.DirectorySeparatorChar);
+                ModObjects = LoadAllObj(Path.Combine("assets", "obj"));
 
+                if(ModObjects.Count > 0)
+                {
+                    Debug.Log("Successfully loaded " + ModObjects.Count + " object(s)");
+                }
             }
-            catch (Exception)
+            catch (Exception e)
             {
-                Debug.Log("Couldn't/no OBJ files to load");
+                Debug.Log("Failed to load OBJ files due to exception:");
+                Utils.LogException(e);
             }
         }
 
@@ -62,6 +76,8 @@ public int LoadAllString(string subfolder = null)
         {
             string[] files = GetFilesMatchingFiletype("xml", subfolder);
 
+            Debug.Log("Found " + files.Length + " strings files");
+
             foreach (string file in files)
             {
                 Utils.LoadStringsFromFile(file);
@@ -74,6 +90,8 @@ public List<Texture2D> LoadAllPng(string subfolder = null)
         {
             string[] files = GetFilesMatchingFiletype("png", subfolder);
 
+            Debug.Log("Found " + files.Length + " PNG files");
+
             List<Texture2D> loadedFiles = new List<Texture2D>(files.Length);
             foreach (String file in files)
             {
@@ -85,9 +103,10 @@ public List<Texture2D> LoadAllPng(string subfolder = null)
 
         public List<GameObject> LoadAllObj(string subfolder = null)
         {
-
             string[] files = GetFilesMatchingFiletype("obj", subfolder);
 
+            Debug.Log("Found " + files.Length + " OBJ files");
+
             List<GameObject> loadedFiles = new List<GameObject>(files.Length);
             foreach (String file in files)
             {
@@ -108,14 +127,7 @@ private string[] GetFilesMatchingFiletype(string filetype, string subfolder = nu
                 subfolder = string.Empty;
             }
 
-            if (Directory.Exists(this.ModPath + subfolder))
-            {
-                return Directory.GetFiles(this.ModPath + subfolder, "*." + filetype);
-            }
-            else
-            {
-                throw new Exception("Could not load " + filetype.ToUpper() + " files from invalid folder " + this.ModPath + subfolder + Path.DirectorySeparatorChar.ToString());
-            }
+            return Directory.Exists(ModPath + subfolder) ? Directory.GetFiles(ModPath + subfolder, "*." + filetype) : new string[0];
         }
     }
 }
diff --git a/Modloader.cs b/Modloader.cs
@@ -13,6 +13,7 @@ namespace PlanetbaseFramework
     public class Modloader
     {
         public static List<ModBase> ModList = new List<ModBase>();
+
         public static void LoadMods()
         {
             Debug.Log("Loading mod \"Planetbase Framework\"");
diff --git a/PlanetbaseFramework.sln b/PlanetbaseFramework.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27130.2020
+VisualStudioVersion = 15.0.27130.2024
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlanetbaseFramework", "PlanetbaseFramework.csproj", "{74541FF9-9E89-4A95-9C9D-8215BBFACE26}"
 EndProject
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Planetbase-XMLModloaderMod"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLModloaderMod", "..\XMLModloaderModV2\XMLModloaderMod.csproj", "{3C4CDA74-6FD6-4E6A-8120-3D2A866E47E4}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PatcherV2", "..\PatcherV2\PatcherV2.csproj", "{D046FF94-10E1-458D-A64C-2FB2F85F1AFE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,6 +41,10 @@ Global
 		{3C4CDA74-6FD6-4E6A-8120-3D2A866E47E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3C4CDA74-6FD6-4E6A-8120-3D2A866E47E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3C4CDA74-6FD6-4E6A-8120-3D2A866E47E4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D046FF94-10E1-458D-A64C-2FB2F85F1AFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D046FF94-10E1-458D-A64C-2FB2F85F1AFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D046FF94-10E1-458D-A64C-2FB2F85F1AFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D046FF94-10E1-458D-A64C-2FB2F85F1AFE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("solidDoWant")]
 [assembly: AssemblyProduct("PlanetbaseFramework")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyCopyright("Copyright ©  2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.1.2.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Utils.cs b/Utils.cs
@@ -11,7 +11,8 @@
 namespace PlanetbaseFramework
 {
     public static class Utils
-    {   public static Texture2D ErrorTexture { get; internal set; }
+    {
+        public static Texture2D ErrorTexture { get; internal set; }
 
         public static void LoadStringsFromFile(string absolutePath)
         {
@@ -346,5 +347,10 @@ public static void RecursivelyAddColliders(this Transform t)
                 }
             }
         }
+
+        public static FrameworkMod GetFrameworkMod()
+        {
+            return Modloader.ModList.Find(mod => mod.ModName.Equals("Planetbase Framework")) as FrameworkMod;
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,13 @@`
`1`		`-using Planetbase;`
	`1`	`+using System;`
	`2`	`+using System.Reflection;`
	`3`	`+using Planetbase;`
`2`	`4`
`3`	`5`	`namespace PlanetbaseFramework`
`4`	`6`	`{`
`5`		`- class FrameworkMod : ModBase`
	`7`	`+ public class FrameworkMod : ModBase`
`6`	`8`	`{`
	`9`	`+ public override Version ModVersion => Assembly.GetExecutingAssembly().GetName().Version;`
	`10`	`+`
`7`	`11`	`public FrameworkMod()`
`8`	`12`	`{`
`9`	`13`	`Utils.ErrorTexture = ModTextures.Find(x => x.name.Equals("error.png"));`
Original file line number	Diff line number	Diff line change
`@@ -11,34 +11,48 @@ public abstract class ModBase`
`11`	`11`	`public List<Texture2D> ModTextures { get; protected set; }`
`12`	`12`	`public List<GameObject> ModObjects { get; protected set; }`
`13`	`13`
	`14`	`+ public virtual Version ModVersion => new Version(0, 0, 0, 0);`
	`15`	`+`
`14`	`16`	`protected ModBase()`
`15`	`17`	`{`
`16`	`18`	`try`
`17`	`19`	`{`
`18`		`- Debug.Log("Loaded " + LoadAllString("assets" + Path.DirectorySeparatorChar + "strings" + Path.DirectorySeparatorChar) + " string file(s)");`
	`20`	`+ LoadAllString(Path.Combine("assets", "strings"));`
`19`	`21`	`}`
`20`		`- catch (Exception)`
	`22`	`+ catch (Exception e)`
`21`	`23`	`{`
`22`		`- Debug.Log("Couldn't/no strings filies to load");`
	`24`	`+ Debug.Log("Failed to load strings files due to exception:");`
	`25`	`+ Utils.LogException(e);`
`23`	`26`	`}`
`24`	`27`
`25`	`28`	`try`
`26`	`29`	`{`
`27`		`- ModTextures = LoadAllPng("assets" + Path.DirectorySeparatorChar + "png" + Path.DirectorySeparatorChar);`
	`30`	`+ ModTextures = LoadAllPng(Path.Combine("assets","png"));`
	`31`	`+`
	`32`	`+ if (ModTextures.Count > 0)`
	`33`	`+ {`
	`34`	`+ Debug.Log("Successfully loaded " + ModTextures.Count + " texture(s)");`
	`35`	`+ }`
`28`	`36`	`}`
`29`		`- catch (Exception)`
	`37`	`+ catch (Exception e)`
`30`	`38`	`{`
`31`		`- Debug.Log("Couldn't/no PNG files to load");`
	`39`	`+ Debug.Log("Failed to load PNG files due to exception:");`
	`40`	`+ Utils.LogException(e);`
`32`	`41`	`}`
`33`	`42`
`34`	`43`	`try`
`35`	`44`	`{`
`36`		`- ModObjects = LoadAllObj("assets" + Path.DirectorySeparatorChar + "obj" + Path.DirectorySeparatorChar);`
	`45`	`+ ModObjects = LoadAllObj(Path.Combine("assets", "obj"));`
`37`	`46`
	`47`	`+ if(ModObjects.Count > 0)`
	`48`	`+ {`
	`49`	`+ Debug.Log("Successfully loaded " + ModObjects.Count + " object(s)");`
	`50`	`+ }`
`38`	`51`	`}`
`39`		`- catch (Exception)`
	`52`	`+ catch (Exception e)`
`40`	`53`	`{`
`41`		`- Debug.Log("Couldn't/no OBJ files to load");`
	`54`	`+ Debug.Log("Failed to load OBJ files due to exception:");`
	`55`	`+ Utils.LogException(e);`
`42`	`56`	`}`
`43`	`57`	`}`
`44`	`58`
`@@ -62,6 +76,8 @@ public int LoadAllString(string subfolder = null)`
`62`	`76`	`{`
`63`	`77`	`string[] files = GetFilesMatchingFiletype("xml", subfolder);`
`64`	`78`
	`79`	`+ Debug.Log("Found " + files.Length + " strings files");`
	`80`	`+`
`65`	`81`	`foreach (string file in files)`
`66`	`82`	`{`
`67`	`83`	`Utils.LoadStringsFromFile(file);`
`@@ -74,6 +90,8 @@ public List<Texture2D> LoadAllPng(string subfolder = null)`
`74`	`90`	`{`
`75`	`91`	`string[] files = GetFilesMatchingFiletype("png", subfolder);`
`76`	`92`
	`93`	`+ Debug.Log("Found " + files.Length + " PNG files");`
	`94`	`+`
`77`	`95`	`List<Texture2D> loadedFiles = new List<Texture2D>(files.Length);`
`78`	`96`	`foreach (String file in files)`
`79`	`97`	`{`
`@@ -85,9 +103,10 @@ public List<Texture2D> LoadAllPng(string subfolder = null)`
`85`	`103`
`86`	`104`	`public List<GameObject> LoadAllObj(string subfolder = null)`
`87`	`105`	`{`
`88`		`-`
`89`	`106`	`string[] files = GetFilesMatchingFiletype("obj", subfolder);`
`90`	`107`
	`108`	`+ Debug.Log("Found " + files.Length + " OBJ files");`
	`109`	`+`
`91`	`110`	`List<GameObject> loadedFiles = new List<GameObject>(files.Length);`
`92`	`111`	`foreach (String file in files)`
`93`	`112`	`{`
`@@ -108,14 +127,7 @@ private string[] GetFilesMatchingFiletype(string filetype, string subfolder = nu`
`108`	`127`	`subfolder = string.Empty;`
`109`	`128`	`}`
`110`	`129`
`111`		`- if (Directory.Exists(this.ModPath + subfolder))`
`112`		`- {`
`113`		`- return Directory.GetFiles(this.ModPath + subfolder, "*." + filetype);`
`114`		`- }`
`115`		`- else`
`116`		`- {`
`117`		`- throw new Exception("Could not load " + filetype.ToUpper() + " files from invalid folder " + this.ModPath + subfolder + Path.DirectorySeparatorChar.ToString());`
`118`		`- }`
	`130`	`+ return Directory.Exists(ModPath + subfolder) ? Directory.GetFiles(ModPath + subfolder, "*." + filetype) : new string[0];`
`119`	`131`	`}`
`120`	`132`	`}`
`121`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ namespace PlanetbaseFramework`
`13`	`13`	`public class Modloader`
`14`	`14`	`{`
`15`	`15`	`public static List<ModBase> ModList = new List<ModBase>();`
	`16`	`+`
`16`	`17`	`public static void LoadMods()`
`17`	`18`	`{`
`18`	`19`	`Debug.Log("Loading mod \"Planetbase Framework\"");`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@`
`11`	`11`	`namespace PlanetbaseFramework`
`12`	`12`	`{`
`13`	`13`	`public static class Utils`
`14`		`- { public static Texture2D ErrorTexture { get; internal set; }`
	`14`	`+ {`
	`15`	`+ public static Texture2D ErrorTexture { get; internal set; }`
`15`	`16`
`16`	`17`	`public static void LoadStringsFromFile(string absolutePath)`
`17`	`18`	`{`
`@@ -346,5 +347,10 @@ public static void RecursivelyAddColliders(this Transform t)`
`346`	`347`	`}`
`347`	`348`	`}`
`348`	`349`	`}`
	`350`	`+`
	`351`	`+ public static FrameworkMod GetFrameworkMod()`
	`352`	`+ {`
	`353`	`+ return Modloader.ModList.Find(mod => mod.ModName.Equals("Planetbase Framework")) as FrameworkMod;`
	`354`	`+ }`
`349`	`355`	`}`
`350`	`356`	`}`