Skip to content

Commit 18a3d18

Browse files
Hill23333Hill23333
authored
Merge pull request #55 from PCL-Community/revert-47-main
Revert "重构部分代码"
2 parents 1c974d0 + 80a068e commit 18a3d18

File tree

14 files changed

+264
-528
lines changed

14 files changed

+264
-528
lines changed

‎PCL2.Neo.sln‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ VisualStudioVersion = 17.12.35527.113
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PCL2.Neo", "PCL2.Neo\PCL2.Neo.csproj", "{AF527853-D92E-44CE-A3EB-1E308C4FBFE2}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCL2.NeoTests", "PCL2.NeoTests\PCL2.NeoTests.csproj", "{04D722EF-BBE3-4572-AF9E-1E692F850C12}"
9-
EndProject
108
Global
119
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1210
Debug|Any CPU = Debug|Any CPU
@@ -17,10 +15,6 @@ Global
1715
{AF527853-D92E-44CE-A3EB-1E308C4FBFE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
1816
{AF527853-D92E-44CE-A3EB-1E308C4FBFE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
1917
{AF527853-D92E-44CE-A3EB-1E308C4FBFE2}.Release|Any CPU.Build.0 = Release|Any CPU
20-
{04D722EF-BBE3-4572-AF9E-1E692F850C12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21-
{04D722EF-BBE3-4572-AF9E-1E692F850C12}.Debug|Any CPU.Build.0 = Debug|Any CPU
22-
{04D722EF-BBE3-4572-AF9E-1E692F850C12}.Release|Any CPU.ActiveCfg = Release|Any CPU
23-
{04D722EF-BBE3-4572-AF9E-1E692F850C12}.Release|Any CPU.Build.0 = Release|Any CPU
2418
EndGlobalSection
2519
GlobalSection(SolutionProperties) = preSolution
2620
HideSolutionNode = FALSE

‎PCL2.Neo.sln.DotSettings.user‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,4 @@
2929
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Ffe877ad5dc9742caa5e7dfcad5831d581e2200_003F82_003F21113a39_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
3030
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATransitionBase_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Ffe877ad5dc9742caa5e7dfcad5831d581e2200_003F01_003Fa44768fa_003FTransitionBase_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
3131
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATransition_00601_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Ffe877ad5dc9742caa5e7dfcad5831d581e2200_003F62_003F990aa4ca_003FTransition_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
32-
<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=c5802d4c_002D1f9b_002D4bd8_002Da087_002D0035332caf40/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="ConvertHslToRgbTest" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
33-
&lt;TestAncestor&gt;&#xD;
34-
&lt;TestId&gt;MSTest::04D722EF-BBE3-4572-AF9E-1E692F850C12::net9.0::PCL2.Neo.Models.Tests.MyColorTests.ConvertHslToRgbTest&lt;/TestId&gt;&#xD;
35-
&lt;/TestAncestor&gt;&#xD;
36-
&lt;/SessionState&gt;</s:String>
37-
<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=d0ef7641_002D239c_002D4bff_002Da782_002Dc0a706747836/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="ConvertHslToRgbTest #2" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
38-
&lt;TestAncestor&gt;&#xD;
39-
&lt;TestId&gt;MSTest::04D722EF-BBE3-4572-AF9E-1E692F850C12::net9.0::PCL2.Neo.Models.Tests.MainTests&lt;/TestId&gt;&#xD;
40-
&lt;/TestAncestor&gt;&#xD;
41-
&lt;/SessionState&gt;</s:String>
4232
</wpf:ResourceDictionary>

‎PCL2.Neo/Helpers/ThemeHelper.cs‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,17 @@ public void Refresh(ThemeVariant themeVariant)
5555
brushTitle.GradientStops.Add(new GradientStop
5656
{
5757
Offset = 0,
58-
Color = MyColor.FromHsl2(_colorHue - _colorHueTopbarDelta, _colorSat,
59-
48 + _colorLightAdjust)
58+
Color = new MyColor().FromHsl2(_colorHue - _colorHueTopbarDelta, _colorSat, 48 + _colorLightAdjust)
6059
});
6160
brushTitle.GradientStops.Add(new GradientStop
6261
{
63-
Offset = 0.5, Color = MyColor.FromHsl2(_colorHue, _colorSat, 54 + _colorLightAdjust)
62+
Offset = 0.5,
63+
Color = new MyColor().FromHsl2(_colorHue, _colorSat, 54 + _colorLightAdjust)
6464
});
6565
brushTitle.GradientStops.Add(new GradientStop
6666
{
6767
Offset = 1,
68-
Color = MyColor.FromHsl2(_colorHue + _colorHueTopbarDelta, _colorSat,
69-
48 + _colorLightAdjust)
68+
Color = new MyColor().FromHsl2(_colorHue + _colorHueTopbarDelta, _colorSat, 48 + _colorLightAdjust)
7069
});
7170

7271
_mainWindow.NavBackgroundBorder.Background = brushTitle;
@@ -91,20 +90,19 @@ public void Refresh(ThemeVariant themeVariant)
9190
brushBackground.GradientStops.Add(new GradientStop
9291
{
9392
Offset = -0.1,
94-
Color = MyColor.FromHsl2(_colorHue - 20, Math.Min(60, _colorSat) * 0.5f,
95-
80 * lightAdjust)
93+
Color = new MyColor().FromHsl2(_colorHue - 20, Math.Min(60, _colorSat) * 0.5, 80 * lightAdjust)
9694
});
9795
brushBackground.GradientStops.Add(new GradientStop
9896
{
99-
Offset = 0.4, Color = MyColor.FromHsl2(_colorHue, _colorSat * 0.9f, 90 * lightAdjust)
97+
Offset = 0.4,
98+
Color = new MyColor().FromHsl2(_colorHue, _colorSat * 0.9, 90 * lightAdjust)
10099
});
101100
brushBackground.GradientStops.Add(new GradientStop
102101
{
103102
Offset = 1.1,
104-
Color = MyColor.FromHsl2(_colorHue + 20, Math.Min(60, _colorSat) * 0.5f,
105-
80 * lightAdjust)
103+
Color = new MyColor().FromHsl2(_colorHue + 20, Math.Min(60, _colorSat) * 0.5, 80 * lightAdjust)
106104
});
107105

108106
_mainWindow.MainBorder.Background = brushBackground;
109107
}
110-
}
108+
}

‎PCL2.Neo/Models/Minecraft/Java.cs‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Threading.Tasks;
4+
using PCL2.Neo.Models.Minecraft.JavaSearcher;
5+
6+
namespace PCL2.Neo.Models.Minecraft
7+
{
8+
/// <summary>
9+
/// 测试
10+
/// </summary>
11+
public class Java
12+
{
13+
public static async Task<List<JavaEntity>> SearchJava()
14+
{
15+
var javaList = new List<JavaEntity>();
16+
17+
switch (Environment.OSVersion.Platform)
18+
{
19+
case PlatformID.Win32NT:
20+
javaList.AddRange(await PCL2.Neo.Models.Minecraft.JavaSearcher.Windows.SearchJava());
21+
break;
22+
case PlatformID.Unix:
23+
javaList.AddRange(Unix.SerachJava());
24+
break;
25+
default:
26+
throw new PlatformNotSupportedException();
27+
}
28+
29+
return javaList;
30+
}
31+
}
32+
}

‎PCL2.Neo/Models/Minecraft/Java/Java.cs‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎PCL2.Neo/Models/Minecraft/Java/Unix.cs‎

Lines changed: 0 additions & 124 deletions
This file was deleted.

0 commit comments

Comments
 (0)