Skip to content

Commit 79b78c8

Browse files
author
HyperPolygon64
committed
Rewritten the patch script deserialiser
modified: Sonic-06-Mod-Manager/Properties/Resources.Designer.cs modified: Sonic-06-Mod-Manager/Properties/Resources.resx modified: Sonic-06-Mod-Manager/Properties/Settings.Designer.cs modified: Sonic-06-Mod-Manager/Properties/Settings.settings modified: Sonic-06-Mod-Manager/Sonic-06-Mod-Manager.csproj modified: Sonic-06-Mod-Manager/app.config deleted: Sonic-06-Mod-Manager/res/Applications/Protocol Manager.exe deleted: Sonic-06-Mod-Manager/res/Applications/pkgtool.exe deleted: Sonic-06-Mod-Manager/res/Applications/vcruntime140_1.dll modified: Sonic-06-Mod-Manager/src/Environment3/ModCreator.cs modified: Sonic-06-Mod-Manager/src/Environment3/RushInterface.cs modified: Sonic-06-Mod-Manager/src/Environment3/UnifySetup.cs modified: Sonic-06-Mod-Manager/src/UnifyDialogs.cs modified: Sonic-06-Mod-Manager/src/UnifyGlobalisation.cs modified: Sonic-06-Mod-Manager/src/UnifyPatcher.cs modified: Sonic-06-Mod-Manager/src/UnifyProgram.cs modified: Sonic-06-Mod-Manager/src/UnifySerialisers.cs
1 parent 4a640ee commit 79b78c8

17 files changed

Lines changed: 676 additions & 788 deletions

Sonic-06-Mod-Manager/Properties/Resources.Designer.cs

Lines changed: 0 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Sonic-06-Mod-Manager/Properties/Resources.resx

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,6 @@
226226
<data name="PatchURI_GitHub" xml:space="preserve">
227227
<value>https://raw.githubusercontent.com/Knuxfan24/Sonic-06-Mod-Manager-Patches/master/.git-repo</value>
228228
</data>
229-
<data name="pkgtool" type="System.Resources.ResXFileRef, System.Windows.Forms">
230-
<value>..\res\applications\pkgtool.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
231-
</data>
232-
<data name="Protocol_Manager" type="System.Resources.ResXFileRef, System.Windows.Forms">
233-
<value>..\res\applications\protocol manager.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
234-
</data>
235229
<data name="Refresh_grey_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
236230
<value>..\res\images\refresh_grey_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
237231
</data>
@@ -253,9 +247,6 @@
253247
<data name="Update_4" type="System.Resources.ResXFileRef, System.Windows.Forms">
254248
<value>..\res\images\update 4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
255249
</data>
256-
<data name="vcruntime140_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
257-
<value>..\res\applications\vcruntime140_1.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
258-
</data>
259250
<data name="VersionURI_GitHub" xml:space="preserve">
260251
<value>https://raw.githubusercontent.com/HyperPolygon64/Unify-Networking/master/Sonic_06_Mod_Manager/rush/latest.txt</value>
261252
</data>

Sonic-06-Mod-Manager/Properties/Settings.Designer.cs

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Sonic-06-Mod-Manager/Properties/Settings.settings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<Setting Name="General_Priority" Type="System.Boolean" Scope="User">
1818
<Value Profile="(Default)">True</Value>
1919
</Setting>
20-
<Setting Name="Path_GameDirectory" Type="System.String" Scope="User">
20+
<Setting Name="Path_GameExecutable" Type="System.String" Scope="User">
2121
<Value Profile="(Default)" />
2222
</Setting>
2323
<Setting Name="General_Debug" Type="System.Boolean" Scope="User">

Sonic-06-Mod-Manager/Sonic-06-Mod-Manager.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,11 +304,8 @@
304304
<Content Include="res\Applications\7z.exe" />
305305
<Content Include="res\Applications\arctool.exe" />
306306
<Content Include="res\Applications\make_fself.exe" />
307-
<Content Include="res\Applications\pkgtool.exe" />
308-
<Content Include="res\Applications\Protocol Manager.exe" />
309307
<Content Include="res\Applications\scetool.exe" />
310308
<Content Include="res\Applications\unlub.jar" />
311-
<Content Include="res\Applications\vcruntime140_1.dll" />
312309
<Content Include="res\Applications\xextool.exe" />
313310
<Content Include="res\Applications\zlib1.dll" />
314311
<Content Include="res\Icons\error.ico" />

Sonic-06-Mod-Manager/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<setting name="General_Priority" serializeAs="String">
2323
<value>True</value>
2424
</setting>
25-
<setting name="Path_GameDirectory" serializeAs="String">
25+
<setting name="Path_GameExecutable" serializeAs="String">
2626
<value />
2727
</setting>
2828
<setting name="General_Debug" serializeAs="String">
-691 KB
Binary file not shown.
-60 KB
Binary file not shown.
-43.3 KB
Binary file not shown.

Sonic-06-Mod-Manager/src/Environment3/ModCreator.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,11 +220,11 @@ private void Btn_Create_Click(object sender, EventArgs e)
220220
}
221221
}
222222

223-
if (check_GenerateFilesystem.Checked && Path.GetDirectoryName(Properties.Settings.Default.Path_GameDirectory) != string.Empty) {
224-
string[] directories = Directory.GetDirectories(Path.GetDirectoryName(Properties.Settings.Default.Path_GameDirectory), "*.*", SearchOption.AllDirectories);
223+
if (check_GenerateFilesystem.Checked && Path.GetDirectoryName(Properties.Settings.Default.Path_GameExecutable) != string.Empty) {
224+
string[] directories = Directory.GetDirectories(Path.GetDirectoryName(Properties.Settings.Default.Path_GameExecutable), "*.*", SearchOption.AllDirectories);
225225

226226
foreach (string path in directories) {
227-
string pathTrim = path.Remove(0, Path.GetDirectoryName(Properties.Settings.Default.Path_GameDirectory).Length).Substring(1);
227+
string pathTrim = path.Remove(0, Path.GetDirectoryName(Properties.Settings.Default.Path_GameExecutable).Length).Substring(1);
228228
if (combo_System.SelectedIndex == 2) {
229229
if (!pathTrim.Contains("xenon") && !pathTrim.Contains("ps3"))
230230
Directory.CreateDirectory(Path.Combine(newPath, pathTrim));

0 commit comments

Comments
 (0)