Skip to content

Commit 76bf7ae

Browse files
TomasMahdalTomasMahdal
authored
Merge pull request #3 from TomasMahdal/SCS-Archive-Packer
Replaced 7-Zip with SCS Archive Packer
2 parents dc43ad6 + d805af6 commit 76bf7ae

20 files changed

+347
-214
lines changed

‎AMP4SCS/AMP4SCS.csproj‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net5.0-windows</TargetFramework>
4+
<TargetFramework>net8.0-windows</TargetFramework>
65
<UseWindowsForms>true</UseWindowsForms>
76
<AssemblyName>AdvancedModPackerforSCSGames</AssemblyName>
87
<RootNamespace>AdvancedETS2Packer</RootNamespace>
9-
<Version>1.0.2</Version>
8+
<Version>2.0.0</Version>
109
</PropertyGroup>
11-
1210
<ItemGroup>
1311
<None Remove="about.txt" />
1412
<None Remove="templateExportBat.txt" />
1513
</ItemGroup>
16-
1714
<ItemGroup>
1815
<EmbeddedResource Include="about.txt" />
1916
<EmbeddedResource Include="templateExportBat.txt" />
2017
</ItemGroup>
21-
2218
<ItemGroup>
2319
<Compile Update="Languages\Export.Designer.cs">
2420
<DesignTime>True</DesignTime>
@@ -41,7 +37,6 @@
4137
<DependentUpon>Form1.resx</DependentUpon>
4238
</Compile>
4339
</ItemGroup>
44-
4540
<ItemGroup>
4641
<EmbeddedResource Update="Languages\Export.resx">
4742
<Generator>ResXFileCodeGenerator</Generator>
@@ -56,12 +51,10 @@
5651
<LastGenOutput>Form1.Designer.cs</LastGenOutput>
5752
</EmbeddedResource>
5853
</ItemGroup>
59-
6054
<ItemGroup>
6155
<None Update="Properties\Settings.settings">
6256
<Generator>SettingsSingleFileGenerator</Generator>
6357
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
6458
</None>
6559
</ItemGroup>
66-
6760
</Project>

‎AMP4SCS/App.config‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration>
3+
<configSections>
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
5+
<section name="AdvancedETS2Packer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
6+
</sectionGroup>
7+
</configSections>
8+
<userSettings>
9+
<AdvancedETS2Packer.Properties.Settings>
10+
<setting name="SCSArchiverPath" serializeAs="String">
11+
<value />
12+
</setting>
13+
<setting name="Language" serializeAs="String">
14+
<value>-1</value>
15+
</setting>
16+
</AdvancedETS2Packer.Properties.Settings>
17+
</userSettings>
18+
</configuration>

‎AMP4SCS/Exporter.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,14 @@ public void ExportMod(string templateName, bool silentPackaging = false)
147147
// export of Steam version
148148
if (Directory.Exists(template.SteamPath))
149149
{
150-
// vygeneruje bat soubor s příkazy pro export
150+
// generate bat
151151
pd.UpdateStatus("dialog_PackagingSteam");
152152
Assembly assembly = Assembly.GetExecutingAssembly();
153153
StreamReader reader = new StreamReader(assembly.GetManifestResourceStream("AdvancedETS2Packer.templateExportBat.txt"));
154154
string bat = reader.ReadToEnd();
155-
bat = bat.Replace("%cache%", Environment.CurrentDirectory + "\\_cache\\data\\");
156-
bat = bat.Replace("%7z%", Properties.Settings.Default.SevenZip_path);
157-
bat = bat.Replace("%export%", template.SteamPath + "\\" + template.ZipName + "_s.zip");
155+
bat = bat.Replace("%cache%", Environment.CurrentDirectory + "\\_cache\\");
156+
bat = bat.Replace("%packer%", Properties.Settings.Default.SCSArchiverPath);
157+
bat = bat.Replace("%export%", template.SteamPath + "\\" + template.ZipName + "_s.scs");
158158
bat = bat.Replace("%modname%", template.Name);
159159
bat = bat.Replace("%steam%", "");
160160
bat = bat.Replace("%logpath%", Environment.CurrentDirectory + "\\log_Steam.txt");
@@ -187,9 +187,9 @@ public void ExportMod(string templateName, bool silentPackaging = false)
187187
Assembly assembly = Assembly.GetExecutingAssembly();
188188
StreamReader reader = new StreamReader(assembly.GetManifestResourceStream("AdvancedETS2Packer.templateExportBat.txt"));
189189
string bat = reader.ReadToEnd();
190-
bat = bat.Replace("%cache%", Environment.CurrentDirectory + "\\_cache\\data\\");
191-
bat = bat.Replace("%7z%", Properties.Settings.Default.SevenZip_path);
192-
bat = bat.Replace("%export%", template.NonSteamPath + "\\" + template.ZipName + ".zip");
190+
bat = bat.Replace("%cache%", Environment.CurrentDirectory + "\\_cache\\");
191+
bat = bat.Replace("%packer%", Properties.Settings.Default.SCSArchiverPath);
192+
bat = bat.Replace("%export%", template.NonSteamPath + "\\" + template.ZipName + ".scs");
193193
bat = bat.Replace("%modname%", template.Name);
194194
bat = bat.Replace("%steam%", "non ");
195195
bat = bat.Replace("%logpath%", Environment.CurrentDirectory + "\\log_nonSteam.txt");
@@ -210,7 +210,7 @@ public void ExportMod(string templateName, bool silentPackaging = false)
210210

211211
// close "Packing..." dialog
212212
if (pd.Visible) {
213-
pd.Invoke((MethodInvoker)delegate
213+
pd.Invoke((System.Windows.Forms.MethodInvoker)delegate
214214
{
215215
pd.Close();
216216
});

‎AMP4SCS/Form1.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ public Form1()
2626
Languages.CultureGenerator.SetCultureFromProperties();
2727

2828
// verify, if exists settings
29-
if (Properties.Settings.Default.SevenZip_path == "" || File.Exists(Properties.Settings.Default.SevenZip_path) == false)
29+
if (Properties.Settings.Default.SCSArchiverPath == "" || File.Exists(Properties.Settings.Default.SCSArchiverPath) == false)
3030
{
3131
Options options = new Options();
3232
options.ShowDialog();
3333

3434
// Was set? No? Then exit application!
35-
if (Properties.Settings.Default.SevenZip_path == "")
35+
if (Properties.Settings.Default.SCSArchiverPath == "")
3636
{
37-
MessageBox.Show("7z not selected, app will close.", "7z not selected", MessageBoxButtons.OK, MessageBoxIcon.Error);
37+
MessageBox.Show("SCS Archiver not selected, app will close.", "SCS Archiver not selected", MessageBoxButtons.OK, MessageBoxIcon.Error);
3838
Environment.Exit(0);
3939
}
4040
}

‎AMP4SCS/Languages/Export.Designer.cs‎

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

‎AMP4SCS/Languages/Export.cs-CZ.resx‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@
112112
<value>2.0</value>
113113
</resheader>
114114
<resheader name="reader">
115-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116
</resheader>
117117
<resheader name="writer">
118-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120120
<data name="dialog_Cleanup" xml:space="preserve">
121121
<value>Čistění cache...</value>
@@ -150,19 +150,22 @@
150150
<data name="Packaging..." xml:space="preserve">
151151
<value>Balení...</value>
152152
</data>
153-
<data name="PackagingGroupCompleted" xml:space="preserve">
154-
<value>Zabalení skupiny modů proběhlo úspěšně!</value>
155-
</data>
156153
<data name="PackingCompleted" xml:space="preserve">
157154
<value>Zabalení modu proběhlo úspěšně!</value>
158155
</data>
159156
<data name="PackingCompleted2" xml:space="preserve">
160157
<value>Zabalení módu {0} proběhlo úspěšně! Podrobnosti najdeš v logu, který je ve složce s programem.</value>
161158
</data>
159+
<data name="PackingGroupCompleted" xml:space="preserve">
160+
<value>Zabalení skupiny módů proběhlo úspěšně!</value>
161+
</data>
162162
<data name="PackingGroupCompleted2" xml:space="preserve">
163163
<value>Zabalení skupiny módů {0} proběhlo úspěšně! Podrobnosti najdeš v logu, který je ve složce s programem.</value>
164164
</data>
165165
<data name="ProblemWithPackaging" xml:space="preserve">
166166
<value>Problém při balení módu</value>
167167
</data>
168+
<data name="PackagingGroupCompleted" xml:space="preserve">
169+
<value>Zabalení skupiny modů proběhlo úspěšně!</value>
170+
</data>
168171
</root>

‎AMP4SCS/Languages/Export.resx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@
112112
<value>2.0</value>
113113
</resheader>
114114
<resheader name="reader">
115-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116
</resheader>
117117
<resheader name="writer">
118-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120120
<data name="dialog_Cleanup" xml:space="preserve">
121121
<value>Cleaning cache...</value>
@@ -165,4 +165,7 @@
165165
<data name="ProblemWithPackaging" xml:space="preserve">
166166
<value>Problem with packing of mod</value>
167167
</data>
168+
<data name="PackagingGroupCompleted" xml:space="preserve">
169+
<value>Packing completed successfully!</value>
170+
</data>
168171
</root>

‎AMP4SCS/Languages/Options.Designer.cs‎

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

‎AMP4SCS/Languages/Options.cs-CZ.resx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@
112112
<value>2.0</value>
113113
</resheader>
114114
<resheader name="reader">
115-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116
</resheader>
117117
<resheader name="writer">
118-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120120
<data name="Close" xml:space="preserve">
121121
<value>Zavřít</value>
@@ -126,8 +126,8 @@
126126
<data name="languageOfApp" xml:space="preserve">
127127
<value>Jazyk aplikace:</value>
128128
</data>
129-
<data name="PathToConsole7zip" xml:space="preserve">
130-
<value>Cesta ke konzolové verzi 7zipu:</value>
129+
<data name="PathToArchiver" xml:space="preserve">
130+
<value>Cesta k SCS Packeru:</value>
131131
</data>
132132
<data name="Save" xml:space="preserve">
133133
<value>Uložit</value>

‎AMP4SCS/Languages/Options.resx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@
112112
<value>2.0</value>
113113
</resheader>
114114
<resheader name="reader">
115-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116
</resheader>
117117
<resheader name="writer">
118-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120120
<data name="Close" xml:space="preserve">
121121
<value>Close</value>
@@ -126,8 +126,8 @@
126126
<data name="languageOfApp" xml:space="preserve">
127127
<value>Application language:</value>
128128
</data>
129-
<data name="PathToConsole7zip" xml:space="preserve">
130-
<value>Path to the console version of 7zip:</value>
129+
<data name="PathToArchiver" xml:space="preserve">
130+
<value>Path to the SCS Packer:</value>
131131
</data>
132132
<data name="Save" xml:space="preserve">
133133
<value>Save</value>

0 commit comments

Comments
 (0)