patch

SkyblockClient · Nov 26, 2020 · 0ffc172 · 0ffc172
1 parent 6ce5b7b
commit 0ffc172
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 9 deletions.
diff --git a/SkyblockClient/Config/ModConfigWorkers.cs b/SkyblockClient/Config/ModConfigWorkers.cs
@@ -47,11 +47,11 @@ public override async Task Work()
 			string source = await helper.DownloadFileByte("mainmenu.json");
 			helper.Move(source, Path.Combine(Globals.skyblockConfigLocation, "CustomMainMenu/mainmenu.json"));
 
-			string[] files = new string[] { "background.png", "discord.png", "discordbutton.png", "skyclient.png" };
+			string[] files = new string[] { "background.png", "skyclient.png", "bg_menu.png" };
 			foreach (var file in files)
 			{
 				source = await helper.DownloadFileByte(file);
-				helper.Move(source, Path.Combine(Globals.skyblockConfigLocation, $"CustomMainMenu/{file}"));
+				helper.Move(source, Path.Combine(Globals.gameDirectory, "resources", "mainmenu", file));
 			}
 		}
 	}

diff --git a/SkyblockClient/Json/LauncherProfiles.cs b/SkyblockClient/Json/LauncherProfiles.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
+namespace SkyblockClient.Json
+{
+	class LauncherProfiles
+	{
+		public ProfilesJson profiles { get; set; }
+	}
+}
diff --git a/SkyblockClient/Json/ProfilesJson.cs b/SkyblockClient/Json/ProfilesJson.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SkyblockClient.Json
+{
+	class ProfilesJson
+	{
+
+	}
+}
diff --git a/SkyblockClient/MainWindow.xaml.cs b/SkyblockClient/MainWindow.xaml.cs
@@ -9,6 +9,8 @@
 using System.Windows;
 using System.Windows.Controls;
 using SkyblockClient.Option;
+using Newtonsoft.Json;
+using SkyblockClient.Json;
 
 namespace SkyblockClient
 {
@@ -63,6 +65,14 @@ public MainWindow()
 		{
 			InitializeComponent();
 			PostConstruct();
+
+
+			if (Globals.isDebugEnabled)
+			{
+				string text = File.ReadAllText(Path.Combine(Globals.minecraftRootLocation, "launcher_profiles.json"));
+				var launcherProfiles = JsonConvert.DeserializeObject<LauncherProfiles>(text);
+
+			}
 		}
 
 		public async void PostConstruct()

diff --git a/SkyblockClient/Properties/AssemblyInfo.cs b/SkyblockClient/Properties/AssemblyInfo.cs
@@ -8,13 +8,7 @@
 // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
 // die einer Assembly zugeordnet sind.
 [assembly: AssemblyTitle("SkyblockClient")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("SkyblockClient")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
 // für COM-Komponenten unsichtbar.  Wenn Sie auf einen Typ in dieser Assembly von

diff --git a/SkyblockClient/SkyblockClient.csproj b/SkyblockClient/SkyblockClient.csproj
@@ -8,7 +8,7 @@
     <ProjectGuid>{2DEA9CD8-419E-4F59-82D9-D089DC282BB7}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>SkyblockClient</RootNamespace>
-    <AssemblyName>SkyblockClient-0.7.6.3</AssemblyName>
+    <AssemblyName>SkyblockClient-0.7.6.4</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -54,6 +54,9 @@
     <Reference Include="Microsoft.WindowsAPICodePack.ShellExtensions, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.WindowsAPICodePack-Shell.1.1.0.0\lib\Microsoft.WindowsAPICodePack.ShellExtensions.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Numerics" />
@@ -105,6 +108,8 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Globals.cs" />
+    <Compile Include="Json\LauncherProfiles.cs" />
+    <Compile Include="Json\ProfilesJson.cs" />
     <Compile Include="MainWindow.triggers.cs" />
     <Compile Include="Option\IOption.cs" />
     <Compile Include="Option\OptionHelper.cs" />