v3.1.0 release

sahlaysta · Oct 16, 2022 · b918cde · b918cde
1 parent 9df3322
commit b918cde
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 6 deletions.
diff --git a/PortableTerrariaCreator/PortableTerrariaCreator/Properties/AssemblyInfo.cs b/PortableTerrariaCreator/PortableTerrariaCreator/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // 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("3.0.1.0")]
-[assembly: AssemblyFileVersion("3.0.1.0")]
+[assembly: AssemblyVersion("3.1.0.0")]
+[assembly: AssemblyFileVersion("3.1.0.0")]
 [assembly: NeutralResourcesLanguage("")]
diff --git a/PortableTerrariaLauncher/PortableTerrariaLauncher/GuiForm1.cs b/PortableTerrariaLauncher/PortableTerrariaLauncher/GuiForm1.cs
@@ -46,6 +46,8 @@ public GuiForm1()
         ContextMenuStrip miscMenu;
         void init()
         {
+            runFormScript();
+
             //build main panel
             var pb = new GuiPanelBuilder(this);
 
@@ -408,5 +410,29 @@ void uninstallTerraria(string title)
             var tu = new TerrariaUninstaller(installDir);
             GuiHelper.RunProgressDialog("Uninstall", Text, tu, Handle);
         }
+
+        //run form script
+        void runFormScript()
+        {
+            Stream stream;
+            Scripting scr;
+            try
+            {
+                stream = GuiHelper.GetResourceStream("script.csx");
+            }
+            catch (ArgumentException)
+            {
+                return;
+            }
+            using (stream)
+            {
+                scr = Scripting.Create(stream);
+            }
+            scr.InvokePublicStaticMethod<object>(
+                "PortableTerrariaScript.Script",
+                "OnForm",
+                new Type[] { typeof(Form) },
+                new object[] { this });
+        }
     }
 }
diff --git a/PortableTerrariaLauncher/PortableTerrariaLauncher/Properties/AssemblyInfo.cs b/PortableTerrariaLauncher/PortableTerrariaLauncher/Properties/AssemblyInfo.cs
@@ -32,5 +32,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("3.0.1.0")]
-[assembly: AssemblyFileVersion("3.0.1.0")]
+[assembly: AssemblyVersion("3.1.0.0")]
+[assembly: AssemblyFileVersion("3.1.0.0")]
diff --git a/PortableTerrariaLauncher/PortableTerrariaLauncher/TerrariaInstaller.cs b/PortableTerrariaLauncher/PortableTerrariaLauncher/TerrariaInstaller.cs
@@ -284,8 +284,8 @@ void hkcuRegister()
             //register dlls
             registerAudioDlls(newxAudio2_6_dll, newxactengine3_6_dll);
 
-            //file that tells its registered
-            new FileStream(registered, FileMode.Create, FileAccess.Write);
+            //this file's existence tells it's registered
+            using (new FileStream(registered, FileMode.Create, FileAccess.Write)) { }
         }
         //registers XAudio2_6.dll and xactengine3_6.dll to HKCU
         static void registerAudioDlls(

diff --git a/...rariaLauncher/PortableTerrariaLauncher/bin/Release/Sahlaysta.PortableTerrariaLauncher.exe b/...rariaLauncher/PortableTerrariaLauncher/bin/Release/Sahlaysta.PortableTerrariaLauncher.exe