Skip to content

Commit 7027f6f

Browse files
hackthedevhackthedev
committed
fixes
mayn fixes
1 parent 1d1716f commit 7027f6f

File tree

10 files changed

+305
-6
lines changed

10 files changed

+305
-6
lines changed

‎ModLoader/DCTS.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,12 @@
9191
<Generator>SettingsSingleFileGenerator</Generator>
9292
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
9393
</None>
94+
<None Update="unzip.bat">
95+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
96+
</None>
97+
<None Update="version.txt">
98+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
99+
</None>
94100
</ItemGroup>
95101

96102
</Project>

‎ModLoader/Form1.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,6 @@ async void InitializeAsync()
240240

241241
webView.CoreWebView2.NavigationCompleted += WebView_NavigationCompleted;
242242

243-
if (isDebug) webView.CoreWebView2.OpenDevToolsWindow();
244-
245-
246243
await webView.CoreWebView2.Profile.ClearBrowsingDataAsync(
247244
CoreWebView2BrowsingDataKinds.CacheStorage & ~CoreWebView2BrowsingDataKinds.Cookies
248245
);

‎ModLoader/Program.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ static class Program
77
[STAThread]
88
static void Main(string[] args)
99
{
10+
string appPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "dcts");
11+
string settingsDir = Path.Combine(appPath, "data");
12+
if(!Directory.Exists(settingsDir)) Directory.CreateDirectory(settingsDir);
13+
AppDomain.CurrentDomain.SetData("APPDATA", settingsDir);
14+
15+
1016
if (DCTS.Properties.Settings.Default.FirstRunAfterUpgrade)
1117
{
1218
DCTS.Properties.Settings.Default.Upgrade();

‎ModLoader/UpdateForm.Designer.cs‎

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

‎ModLoader/UpdateForm.cs‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.ComponentModel;
4+
using System.Data;
5+
using System.Drawing;
6+
using System.Linq;
7+
using System.Runtime.InteropServices;
8+
using System.Text;
9+
using System.Threading.Tasks;
10+
using System.Windows.Forms;
11+
12+
namespace DCTS
13+
{
14+
public partial class UpdateForm : Form
15+
{
16+
[DllImport("dwmapi.dll", CharSet = CharSet.Auto, SetLastError = true)]
17+
private static extern int DwmSetWindowAttribute(IntPtr hwnd, int attr, ref int attrValue, int attrSize);
18+
19+
const int DWMWA_USE_IMMERSIVE_DARK_MODE = 20;
20+
21+
private void EnableDarkTitlebar(IntPtr handle)
22+
{
23+
int useDark = 1;
24+
DwmSetWindowAttribute(handle, DWMWA_USE_IMMERSIVE_DARK_MODE, ref useDark, sizeof(int));
25+
}
26+
27+
28+
private void UpdateForm_Load(object sender, EventArgs e)
29+
{
30+
31+
}
32+
33+
public UpdateForm()
34+
{
35+
InitializeComponent();
36+
}
37+
}
38+
}

‎ModLoader/UpdateForm.resx‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
</root>

‎ModLoader/Updater.cs‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System;
1+
using ModLoader;
2+
using System;
23
using System.Diagnostics;
34
using System.IO;
45
using System.Net;
@@ -59,20 +60,41 @@ public static async Task CheckAsync(string repo, string currentVersion)
5960
return;
6061
}
6162

63+
64+
UpdateForm updater = new UpdateForm();
65+
updater.Show();
66+
6267
string zipPath = Path.Combine(Application.StartupPath, "update.zip");
6368
string downloadUrl = $"https://github.com/{repo}/releases/latest/download/update.zip";
6469

6570
await client.DownloadFileTaskAsync(downloadUrl, zipPath);
6671

6772
if (File.Exists(zipPath))
6873
{
69-
Process.Start(zipPath);
74+
updater.Close();
75+
76+
MessageBox.Show(
77+
$"The update was downloaded!\n" +
78+
$"Press OK to finish the update",
79+
"DCTS", MessageBoxButtons.OK, MessageBoxIcon.Information);
80+
81+
82+
string bat = Path.Combine(Application.StartupPath, "unzip.bat");
83+
var psi = new ProcessStartInfo("cmd.exe", $"/c \"{bat}\"")
84+
{
85+
UseShellExecute = false,
86+
CreateNoWindow = true,
87+
WindowStyle = ProcessWindowStyle.Hidden
88+
};
89+
90+
Process.Start(psi);
7091

7192
Application.Exit();
7293
}
7394
}
7495
catch (Exception ex)
7596
{
97+
Clipboard.SetText(ex.Message);
7698
MessageBox.Show($"Unable to update client:\n{ex.Message}", "DCTS", MessageBoxButtons.OK, MessageBoxIcon.Error);
7799
}
78100
}

‎ModLoader/unzip.bat‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
@echo off
2+
setlocal
3+
4+
rem aktuelles Verzeichnis holen
5+
set "DIR=%~dp0"
6+
set "ZIP=%DIR%update.zip"
7+
set "EXE=%DIR%DCTS.exe"
8+
9+
echo Unzipping "%ZIP%" to "%DIR%"...
10+
timeout /t 2 /nobreak >nul
11+
12+
if exist "%ZIP%" (
13+
powershell -NoLogo -NoProfile -Command "Expand-Archive -LiteralPath '%ZIP%' -DestinationPath '%DIR%' -Force"
14+
del "%ZIP%"
15+
echo Update extracted.
16+
) else (
17+
echo update.zip not found in "%DIR%"
18+
)
19+
20+
if exist "%EXE%" (
21+
start "" "%EXE%"
22+
echo Restarted "%EXE%"
23+
) else (
24+
echo Could not find "%EXE%" to restart.
25+
)
26+
27+
exit

‎ModLoader/version.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.0.0.4512

‎version.txt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)