Skip to content

Commit c4c5b5b

Browse files
ColoryrColoryr
committed
up
1 parent 712ad4f commit c4c5b5b

10 files changed

Lines changed: 177 additions & 217 deletions

File tree

‎MinecraftSkinRender‎

Submodule MinecraftSkinRender deleted from 35c1532

‎src/ColorMC.Gui/App.axaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<Application.Styles>
2222
<FluentTheme />
2323
<dialog:DialogHostStyles />
24-
<StyleInclude Source="avares://MarkdownAIRender/Index.axaml" />
2524
<StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml" />
2625
<StyleInclude Source="avares://Avalonia.Controls.TreeDataGrid/Themes/Fluent.axaml" />
2726
<StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml" />

‎src/ColorMC.Gui/App.axaml.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
using Avalonia.Controls.ApplicationLifetimes;
66
using Avalonia.Markup.Xaml;
77
using Avalonia.Threading;
8+
using Avalonia.WebView.Core;
89
using ColorMC.Core;
9-
using ColorMC.Core.Objs;
1010
using ColorMC.Core.Utils;
1111
using ColorMC.Gui.Joystick;
1212
using ColorMC.Gui.Manager;
@@ -57,6 +57,12 @@ public override void Initialize()
5757
AvaloniaXamlLoader.Load(this);
5858
}
5959

60+
public override void RegisterServices()
61+
{
62+
base.RegisterServices();
63+
AvaloniaWebViewBuilder.Initialize(default);
64+
}
65+
6066
public override void OnFrameworkInitializationCompleted()
6167
{
6268
base.OnFrameworkInitializationCompleted();

‎src/ColorMC.Gui/ColorMC.Gui.csproj‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -344,33 +344,25 @@
344344
<PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
345345
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
346346
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
347-
<PackageReference Include="Avalonia.HtmlRenderer" Version="11.2.0" />
348347
<PackageReference Include="Avalonia.Skia" Version="$(AvaloniaVersion)" />
349348
<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
350349
<PackageReference Include="Avalonia.AvaloniaEdit" Version="11.3.0" />
351350
<PackageReference Include="Avalonia.Controls.TreeDataGrid" Version="11.1.1" />
352351
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
353352
<PackageReference Include="DialogHost.Avalonia" Version="0.9.3" />
354-
<PackageReference Include="MarkdownAIRender" Version="0.1.16" />
353+
<PackageReference Include="MinecraftSkinRender" Version="1.0.0" />
354+
<PackageReference Include="MinecraftSkinRender.Image" Version="1.0.0" />
355+
<PackageReference Include="MinecraftSkinRender.OpenGL" Version="1.0.0" />
355356
<PackageReference Include="Silk.NET.SDL" Version="2.22.0" />
356357
<PackageReference Include="SkiaSharp" Version="2.88.9" />
357358
<PackageReference Include="DotNetty.Buffers" Version="0.7.6" />
358359
<PackageReference Include="DotNetty.Common" Version="0.7.6" />
359360
<PackageReference Include="DotNetty.Handlers" Version="0.7.6" />
360361
<PackageReference Include="Svg.Controls.Skia.Avalonia" Version="11.3.6.2" />
362+
<PackageReference Include="WebView.Avalonia" Version="11.1.0" />
363+
<PackageReference Include="WebView.Avalonia.Desktop" Version="11.1.0" />
361364
</ItemGroup>
362365
<ItemGroup>
363-
<ProjectReference Include="..\..\MinecraftSkinRender\MinecraftSkinRender.Image\MinecraftSkinRender.Image.csproj" />
364-
<ProjectReference Include="..\..\MinecraftSkinRender\MinecraftSkinRender.OpenGL\MinecraftSkinRender.OpenGL.csproj" />
365-
<ProjectReference Include="..\..\MinecraftSkinRender\MinecraftSkinRender\MinecraftSkinRender.csproj" />
366366
<ProjectReference Include="..\ColorMC.Core\ColorMC.Core.csproj" />
367367
</ItemGroup>
368-
<ItemGroup>
369-
<Compile Update="UI\Controls\Add\AddFileInfoControl.axaml.cs">
370-
<DependentUpon>AddFileInfoControl.axaml</DependentUpon>
371-
</Compile>
372-
<Compile Update="UI\Controls\Add\AddResourceControl.axaml.cs">
373-
<DependentUpon>AddResourceControl.axaml</DependentUpon>
374-
</Compile>
375-
</ItemGroup>
376368
</Project>

‎src/ColorMC.Gui/ColorMCGui.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Avalonia;
99
using Avalonia.Logging;
1010
using Avalonia.Media;
11+
using Avalonia.WebView.Desktop;
1112
using ColorMC.Core;
1213
using ColorMC.Core.Objs;
1314
using ColorMC.Core.Utils;
@@ -349,7 +350,8 @@ public static AppBuilder BuildAvaloniaApp()
349350
#else
350351
.LogToTrace()
351352
#endif
352-
.UsePlatformDetect();
353+
.UsePlatformDetect()
354+
.UseDesktopWebView();
353355

354356
switch (SystemInfo.Os)
355357
{

‎src/ColorMC.Gui/UI/Controls/Add/AddFileInfoControl.axaml‎

Lines changed: 129 additions & 131 deletions
Large diffs are not rendered by default.

‎src/ColorMC.Launcher/ColorMC.Launcher.csproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@
1616
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
1717
<DebugType>embedded</DebugType>
1818
</PropertyGroup>
19-
19+
20+
<PropertyGroup>
21+
<ApplicationManifest>app.manifest</ApplicationManifest>
22+
</PropertyGroup>
23+
2024
<ItemGroup>
2125
<None Remove=".gitignore" />
2226
<None Remove="Resources\MiSans-Regular.ttf" />

‎src/ColorMC.Launcher/app.manifest‎

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+
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
3+
<!-- This manifest is used on Windows only.
4+
Don't remove it as it might cause problems with window transparency and embeded controls.
5+
For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
6+
<assemblyIdentity version="1.0.0.0" name="SampleWebView.Desktop"/>
7+
8+
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
9+
<application>
10+
<!-- A list of the Windows versions that this application has been tested on
11+
and is designed to work with. Uncomment the appropriate elements
12+
and Windows will automatically select the most compatible environment. -->
13+
14+
<!-- Windows 10 -->
15+
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
16+
</application>
17+
</compatibility>
18+
</assembly>

‎src/ColorMC.sln‎

Lines changed: 3 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.4.33015.44
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.0.11205.157
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ColorMC.Gui", "ColorMC.Gui\ColorMC.Gui.csproj", "{90603F2B-466D-46F9-A7B4-DC02352A4951}"
77
EndProject
@@ -15,16 +15,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1515
ProjectSection(SolutionItems) = preProject
1616
.editorconfig = .editorconfig
1717
Directory.Build.props = Directory.Build.props
18+
NuGet.Config = NuGet.Config
1819
EndProjectSection
1920
EndProject
2021
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ColorMC.CustomGui", "ColorMC.CustomGui\ColorMC.CustomGui.csproj", "{8543640C-A015-475F-90A1-CCA2B768C402}"
2122
EndProject
22-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MinecraftSkinRender", "..\MinecraftSkinRender\MinecraftSkinRender\MinecraftSkinRender.csproj", "{00DE6950-DE84-45AD-9FCE-00E2EE64E08D}"
23-
EndProject
24-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MinecraftSkinRender.OpenGL", "..\MinecraftSkinRender\MinecraftSkinRender.OpenGL\MinecraftSkinRender.OpenGL.csproj", "{6750AA9B-DE5A-41B8-B867-05BD9497EDF8}"
25-
EndProject
26-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MinecraftSkinRender.Image", "..\MinecraftSkinRender\MinecraftSkinRender.Image\MinecraftSkinRender.Image.csproj", "{91E55181-A289-3EB5-157E-41873A369DB2}"
27-
EndProject
2823
Global
2924
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3025
Debug|Any CPU = Debug|Any CPU
@@ -139,66 +134,6 @@ Global
139134
{8543640C-A015-475F-90A1-CCA2B768C402}.Release|x64.Build.0 = Release|Any CPU
140135
{8543640C-A015-475F-90A1-CCA2B768C402}.Release|x86.ActiveCfg = Release|Any CPU
141136
{8543640C-A015-475F-90A1-CCA2B768C402}.Release|x86.Build.0 = Release|Any CPU
142-
{00DE6950-DE84-45AD-9FCE-00E2EE64E08D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
143-
{00DE6950-DE84-45AD-9FCE-00E2EE64E08D}.Debug|Any CPU.Build.0 = Debug|Any CPU
144-
{00DE6950-DE84-45AD-9FCE-00E2EE64E08D}.Debug|ARM.ActiveCfg = Debug|Any CPU
145-
{00DE6950-DE84-45AD-9FCE-00E2EE64E08D}.Debug|ARM.Build.0 = Debug|Any CPU
146-
{00DE6950-DE84-45AD-9FCE-00E2EE64E08D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
147-
{00DE6950-DE84-45AD-9FCE-00E2EE64E08D}.Debug|ARM64.Build.0 = Debug|Any CPU
148-
{00DE6950-DE84-45AD-9FCE-00E2EE64E08D}.Debug|x64.ActiveCfg = Debug|Any CPU
149-
{00DE6950-DE84-45AD-9FCE-00E2EE64E08D}.Debug|x64.Build.0 = Debug|Any CPU
150-
{00DE6950-DE84-45AD-9FCE-00E2EE64E08D}.Debug|x86.ActiveCfg = Debug|Any CPU
151-
{00DE6950-DE84-45AD-9FCE-00E2EE64E08D}.Debug|x86.Build.0 = Debug|Any CPU
152-
{00DE6950-DE84-45AD-9FCE-00E2EE64E08D}.Release|Any CPU.ActiveCfg = Release|Any CPU
153-
{00DE6950-DE84-45AD-9FCE-00E2EE64E08D}.Release|Any CPU.Build.0 = Release|Any CPU
154-
{00DE6950-DE84-45AD-9FCE-00E2EE64E08D}.Release|ARM.ActiveCfg = Release|Any CPU
155-
{00DE6950-DE84-45AD-9FCE-00E2EE64E08D}.Release|ARM.Build.0 = Release|Any CPU
156-
{00DE6950-DE84-45AD-9FCE-00E2EE64E08D}.Release|ARM64.ActiveCfg = Release|Any CPU
157-
{00DE6950-DE84-45AD-9FCE-00E2EE64E08D}.Release|ARM64.Build.0 = Release|Any CPU
158-
{00DE6950-DE84-45AD-9FCE-00E2EE64E08D}.Release|x64.ActiveCfg = Release|Any CPU
159-
{00DE6950-DE84-45AD-9FCE-00E2EE64E08D}.Release|x64.Build.0 = Release|Any CPU
160-
{00DE6950-DE84-45AD-9FCE-00E2EE64E08D}.Release|x86.ActiveCfg = Release|Any CPU
161-
{00DE6950-DE84-45AD-9FCE-00E2EE64E08D}.Release|x86.Build.0 = Release|Any CPU
162-
{6750AA9B-DE5A-41B8-B867-05BD9497EDF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
163-
{6750AA9B-DE5A-41B8-B867-05BD9497EDF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
164-
{6750AA9B-DE5A-41B8-B867-05BD9497EDF8}.Debug|ARM.ActiveCfg = Debug|Any CPU
165-
{6750AA9B-DE5A-41B8-B867-05BD9497EDF8}.Debug|ARM.Build.0 = Debug|Any CPU
166-
{6750AA9B-DE5A-41B8-B867-05BD9497EDF8}.Debug|ARM64.ActiveCfg = Debug|Any CPU
167-
{6750AA9B-DE5A-41B8-B867-05BD9497EDF8}.Debug|ARM64.Build.0 = Debug|Any CPU
168-
{6750AA9B-DE5A-41B8-B867-05BD9497EDF8}.Debug|x64.ActiveCfg = Debug|Any CPU
169-
{6750AA9B-DE5A-41B8-B867-05BD9497EDF8}.Debug|x64.Build.0 = Debug|Any CPU
170-
{6750AA9B-DE5A-41B8-B867-05BD9497EDF8}.Debug|x86.ActiveCfg = Debug|Any CPU
171-
{6750AA9B-DE5A-41B8-B867-05BD9497EDF8}.Debug|x86.Build.0 = Debug|Any CPU
172-
{6750AA9B-DE5A-41B8-B867-05BD9497EDF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
173-
{6750AA9B-DE5A-41B8-B867-05BD9497EDF8}.Release|Any CPU.Build.0 = Release|Any CPU
174-
{6750AA9B-DE5A-41B8-B867-05BD9497EDF8}.Release|ARM.ActiveCfg = Release|Any CPU
175-
{6750AA9B-DE5A-41B8-B867-05BD9497EDF8}.Release|ARM.Build.0 = Release|Any CPU
176-
{6750AA9B-DE5A-41B8-B867-05BD9497EDF8}.Release|ARM64.ActiveCfg = Release|Any CPU
177-
{6750AA9B-DE5A-41B8-B867-05BD9497EDF8}.Release|ARM64.Build.0 = Release|Any CPU
178-
{6750AA9B-DE5A-41B8-B867-05BD9497EDF8}.Release|x64.ActiveCfg = Release|Any CPU
179-
{6750AA9B-DE5A-41B8-B867-05BD9497EDF8}.Release|x64.Build.0 = Release|Any CPU
180-
{6750AA9B-DE5A-41B8-B867-05BD9497EDF8}.Release|x86.ActiveCfg = Release|Any CPU
181-
{6750AA9B-DE5A-41B8-B867-05BD9497EDF8}.Release|x86.Build.0 = Release|Any CPU
182-
{91E55181-A289-3EB5-157E-41873A369DB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
183-
{91E55181-A289-3EB5-157E-41873A369DB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
184-
{91E55181-A289-3EB5-157E-41873A369DB2}.Debug|ARM.ActiveCfg = Debug|Any CPU
185-
{91E55181-A289-3EB5-157E-41873A369DB2}.Debug|ARM.Build.0 = Debug|Any CPU
186-
{91E55181-A289-3EB5-157E-41873A369DB2}.Debug|ARM64.ActiveCfg = Debug|Any CPU
187-
{91E55181-A289-3EB5-157E-41873A369DB2}.Debug|ARM64.Build.0 = Debug|Any CPU
188-
{91E55181-A289-3EB5-157E-41873A369DB2}.Debug|x64.ActiveCfg = Debug|Any CPU
189-
{91E55181-A289-3EB5-157E-41873A369DB2}.Debug|x64.Build.0 = Debug|Any CPU
190-
{91E55181-A289-3EB5-157E-41873A369DB2}.Debug|x86.ActiveCfg = Debug|Any CPU
191-
{91E55181-A289-3EB5-157E-41873A369DB2}.Debug|x86.Build.0 = Debug|Any CPU
192-
{91E55181-A289-3EB5-157E-41873A369DB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
193-
{91E55181-A289-3EB5-157E-41873A369DB2}.Release|Any CPU.Build.0 = Release|Any CPU
194-
{91E55181-A289-3EB5-157E-41873A369DB2}.Release|ARM.ActiveCfg = Release|Any CPU
195-
{91E55181-A289-3EB5-157E-41873A369DB2}.Release|ARM.Build.0 = Release|Any CPU
196-
{91E55181-A289-3EB5-157E-41873A369DB2}.Release|ARM64.ActiveCfg = Release|Any CPU
197-
{91E55181-A289-3EB5-157E-41873A369DB2}.Release|ARM64.Build.0 = Release|Any CPU
198-
{91E55181-A289-3EB5-157E-41873A369DB2}.Release|x64.ActiveCfg = Release|Any CPU
199-
{91E55181-A289-3EB5-157E-41873A369DB2}.Release|x64.Build.0 = Release|Any CPU
200-
{91E55181-A289-3EB5-157E-41873A369DB2}.Release|x86.ActiveCfg = Release|Any CPU
201-
{91E55181-A289-3EB5-157E-41873A369DB2}.Release|x86.Build.0 = Release|Any CPU
202137
EndGlobalSection
203138
GlobalSection(SolutionProperties) = preSolution
204139
HideSolutionNode = FALSE

‎src/NuGet.Config‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
5+
<add key="local" value="..\nuget" />
6+
</packageSources>
7+
</configuration>

0 commit comments

Comments
 (0)