v2.01, fixed mod downloading and DLL autoextractor

Clef-0 · Jul 20, 2023 · 058e6d1 · 058e6d1
1 parent 54a93c2
commit 058e6d1
Show file tree

Hide file tree

Showing 134 changed files with 99 additions and 953 deletions.
diff --git a/.vs/FMM2/FileContentIndex/fc81a063-62a5-4872-85d2-a720ca8650e5.vsidx b/.vs/FMM2/FileContentIndex/fc81a063-62a5-4872-85d2-a720ca8650e5.vsidx
diff --git a/FMM2/bin/x86/Release/FMM/temp/HUDim.ini → .vs/FMM2/FileContentIndex/read.lock b/FMM2/bin/x86/Release/FMM/temp/HUDim.ini → .vs/FMM2/FileContentIndex/read.lock
diff --git a/.vs/FMM2/v17/.suo b/.vs/FMM2/v17/.suo
diff --git a/FMM2/App.config b/FMM2/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
 </configuration>
diff --git a/FMM2/FMM2 - Shortcut.lnk b/FMM2/FMM2 - Shortcut.lnk
diff --git a/FMM2/FMM2.csproj b/FMM2/FMM2.csproj
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>FMM2</RootNamespace>
     <AssemblyName>FMM</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -228,11 +228,4 @@
     <SplashScreen Include="FMM.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Fody.2.0.0\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.2.0.0\build\dotnet\Fody.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Fody.2.0.0\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.2.0.0\build\dotnet\Fody.targets'))" />
-  </Target>
 </Project>
diff --git a/FMM2/LoadFMMLanguage.cs b/FMM2/LoadFMMLanguage.cs
@@ -18,7 +18,9 @@ private void loadFMMLang()
                 {
                     using (new FileStream("FMM_Lang.ini", FileMode.CreateNew)) { }
                 }
-                catch { }
+                catch {
+                    MessageBox.Show("Couldn't create FMM_Lang.ini file.");
+                }
             }
 
 

diff --git a/FMM2/MainWindow.xaml b/FMM2/MainWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:FMM2"
         mc:Ignorable="d"
-        Title="Foundation Mod Manager v2.00 Kandinsky" Height="670" Width="800" Loaded="Window_Loaded" DataContext="{Binding RelativeSource={RelativeSource Self}}" Closing="Window_Closing">
+        Title="Foundation Mod Manager v2.01 Longest" Height="670" Width="800" Loaded="Window_Loaded" DataContext="{Binding RelativeSource={RelativeSource Self}}" Closing="Window_Closing">
     <Window.Background>
         <SolidColorBrush Color="{DynamicResource {x:Static SystemColors.ControlColorKey}}"/>
     </Window.Background>

diff --git a/FMM2/MainWindow.xaml.cs b/FMM2/MainWindow.xaml.cs
@@ -628,6 +628,13 @@ public MainWindow()
             //servers = new ObservableCollection<Server>();
             myModsList.ItemsSource = mMods;
             downloadableModsList.ItemsSource = dMods;
+
+            // maybe some day?
+            //PropertyGroupDescription groupDescription = new PropertyGroupDescription("Author");
+            //CollectionView view = (CollectionView)CollectionViewSource.GetDefaultView(downloadableModsList.ItemsSource);
+            //view.GroupDescriptions.Add(groupDescription);
+
+
             //myMapsList.ItemsSource = mMaps;
             //downloadableMapsList.ItemsSource = dMaps;
             //myGametypesList.ItemsSource = mGametypes;
@@ -652,7 +659,6 @@ public MainWindow()
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             initialiseAssembly();
-            loadFMMLang();
             bool doNotInit = false;
 #if !DEBUG
             if (!File.Exists("mtndew.dll"))
@@ -663,9 +669,9 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
             }
 #endif
 
-            if (!File.Exists(Path.Combine("FMM", "lib", "INIFileParser.dll")))
+            if (!doNotInit)
             {
-                if (!doNotInit)
+                if (!File.Exists(Path.Combine("FMM", "lib", "INIFileParser.dll")))
                 {
                     doNotInit = true;
                     ExtractDLLs();
@@ -684,10 +690,9 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
                         MessageBox.Show(Application.Current.MainWindow, faileddeploy, this.Title, MessageBoxButton.OK, MessageBoxImage.Error);
                     }
                 }
-            }
 
-            if (!doNotInit)
-            {
+                loadFMMLang();
+
                 new ListViewDragDropManager<Mod>(myModsList);
 
                 modsTabs.Margin = new Thickness { Bottom = 0, Left = 0, Right = 0, Top = menu.ActualHeight };

diff --git a/FMM2/Properties/AssemblyInfo.cs b/FMM2/Properties/AssemblyInfo.cs
@@ -12,7 +12,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Foundation Mod Manager")]
-[assembly: AssemblyCopyright("Copyright © Clef 2017")]
+[assembly: AssemblyCopyright("Copyright © Clef 2023")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -51,5 +51,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("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
+[assembly: AssemblyVersion("2.0.1.0")]
+[assembly: AssemblyFileVersion("2.0.1.0")]
diff --git a/FMM2/Properties/Resources.Designer.cs b/FMM2/Properties/Resources.Designer.cs
diff --git a/FMM2/Properties/Settings.Designer.cs b/FMM2/Properties/Settings.Designer.cs
diff --git a/FMM2/bin/x86/Release/FMM.exe b/FMM2/bin/x86/Release/FMM.exe
diff --git a/FMM2/bin/x86/Release/FMM.exe.config b/FMM2/bin/x86/Release/FMM.exe.config
diff --git a/FMM2/bin/x86/Release/FMM.ini b/FMM2/bin/x86/Release/FMM.ini
diff --git a/FMM2/bin/x86/Release/FMM.pdb b/FMM2/bin/x86/Release/FMM.pdb
diff --git a/FMM2/bin/x86/Release/FMM.zip b/FMM2/bin/x86/Release/FMM.zip
diff --git a/FMM2/bin/x86/Release/FMM/lib/INIFileParser.dll b/FMM2/bin/x86/Release/FMM/lib/INIFileParser.dll
diff --git a/FMM2/bin/x86/Release/FMM/lib/Newtonsoft.Json.dll b/FMM2/bin/x86/Release/FMM/lib/Newtonsoft.Json.dll
diff --git a/FMM2/bin/x86/Release/FMM/lib/SharpSvn.UI.dll b/FMM2/bin/x86/Release/FMM/lib/SharpSvn.UI.dll
diff --git a/FMM2/bin/x86/Release/FMM/lib/SharpSvn.dll b/FMM2/bin/x86/Release/FMM/lib/SharpSvn.dll
diff --git a/FMM2/bin/x86/Release/FMM/temp/Airglow.ini b/FMM2/bin/x86/Release/FMM/temp/Airglow.ini
diff --git a/FMM2/bin/x86/Release/FMM/temp/CenteredCrosshairs.ini b/FMM2/bin/x86/Release/FMM/temp/CenteredCrosshairs.ini
diff --git a/FMM2/bin/x86/Release/FMM/temp/ClefMagSkins.ini b/FMM2/bin/x86/Release/FMM/temp/ClefMagSkins.ini
diff --git a/FMM2/bin/x86/Release/FMM/temp/DMRCrosshairFix.ini b/FMM2/bin/x86/Release/FMM/temp/DMRCrosshairFix.ini
diff --git a/FMM2/bin/x86/Release/FMM/temp/DMRCrosshairFixH3HUDCompatible.ini b/FMM2/bin/x86/Release/FMM/temp/DMRCrosshairFixH3HUDCompatible.ini
diff --git a/FMM2/bin/x86/Release/FMM/temp/EnhancedForge-PUB.ini b/FMM2/bin/x86/Release/FMM/temp/EnhancedForge-PUB.ini
diff --git a/FMM2/bin/x86/Release/FMM/temp/FlatGrass.ini b/FMM2/bin/x86/Release/FMM/temp/FlatGrass.ini
diff --git a/FMM2/bin/x86/Release/FMM/temp/FlatWeapFix.ini b/FMM2/bin/x86/Release/FMM/temp/FlatWeapFix.ini
diff --git a/FMM2/bin/x86/Release/FMM/temp/Grunt_Birthday_Party.ini b/FMM2/bin/x86/Release/FMM/temp/Grunt_Birthday_Party.ini
diff --git a/FMM2/bin/x86/Release/FMM/temp/Guardium.ini b/FMM2/bin/x86/Release/FMM/temp/Guardium.ini
diff --git a/FMM2/bin/x86/Release/FMM/temp/H2ABR.ini b/FMM2/bin/x86/Release/FMM/temp/H2ABR.ini
diff --git a/FMM2/bin/x86/Release/FMM/temp/H3AR.ini b/FMM2/bin/x86/Release/FMM/temp/H3AR.ini
diff --git a/FMM2/bin/x86/Release/FMM/temp/H3BR.ini b/FMM2/bin/x86/Release/FMM/temp/H3BR.ini
diff --git a/FMM2/bin/x86/Release/FMM/temp/H3Bea.ini b/FMM2/bin/x86/Release/FMM/temp/H3Bea.ini
diff --git a/FMM2/bin/x86/Release/FMM/temp/H3Flak.ini b/FMM2/bin/x86/Release/FMM/temp/H3Flak.ini
diff --git a/FMM2/bin/x86/Release/FMM/temp/H3Mag.ini b/FMM2/bin/x86/Release/FMM/temp/H3Mag.ini
diff --git a/FMM2/bin/x86/Release/FMM/temp/H3RL.ini b/FMM2/bin/x86/Release/FMM/temp/H3RL.ini
diff --git a/FMM2/bin/x86/Release/FMM/temp/H3SMG.ini b/FMM2/bin/x86/Release/FMM/temp/H3SMG.ini
diff --git a/FMM2/bin/x86/Release/FMM/temp/H3SPL.ini b/FMM2/bin/x86/Release/FMM/temp/H3SPL.ini
diff --git a/FMM2/bin/x86/Release/FMM/temp/H3Sho.ini b/FMM2/bin/x86/Release/FMM/temp/H3Sho.ini
diff --git a/FMM2/bin/x86/Release/FMM/temp/H3Sni.ini b/FMM2/bin/x86/Release/FMM/temp/H3Sni.ini
diff --git a/FMM2/bin/x86/Release/FMM/temp/HUD.ini b/FMM2/bin/x86/Release/FMM/temp/HUD.ini
diff --git a/FMM2/bin/x86/Release/FMM/temp/Halo 3 HUD.ini b/FMM2/bin/x86/Release/FMM/temp/Halo 3 HUD.ini
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,9 @@ private void loadFMMLang() @@
                     {
                         using (new FileStream("FMM_Lang.ini", FileMode.CreateNew)) { }
                     }
-                    catch { }
+                    catch {
+                        MessageBox.Show("Couldn't create FMM_Lang.ini file.");
+                    }
                 }
@@ Expand Down @@