Skip to content
This repository has been archived by the owner on Aug 24, 2023. It is now read-only.

Commit

Permalink
[!] MINOR v3.4.0 (Temporary fix for "session expired error")
Browse files Browse the repository at this point in the history
  • Loading branch information
@weedeej
weedeej committed Sep 10, 2022
1 parent acb1821 commit bf7274a
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 18 deletions.
3 changes: 1 addition & 2 deletions ValorantCC/SubWindow/src/CreateRender.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static async Task<UIElement> GenerateRender(this ProfilesWindow profilesW
Border template = new Border()
{
Background = RandomBGC,
CornerRadius = new CornerRadius(7, 7, 25, 25),
CornerRadius = new CornerRadius(7, 7, 0, 0),
MinHeight = 95,
MaxHeight = 95,
MinWidth = 300,
Expand All @@ -68,7 +68,6 @@ public static async Task<UIElement> GenerateRender(this ProfilesWindow profilesW
Border rect = new()
{
Background = (Brush)bc.ConvertFromString("#282A36"),
CornerRadius = new CornerRadius(0, 0, 7, 7),
MinWidth = 300,
MaxWidth = 300,
MinHeight = 27,
Expand Down
2 changes: 1 addition & 1 deletion ValorantCC/ValorantCC.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<AssemblyVersion></AssemblyVersion>
<FileVersion></FileVersion>
<Version>3.3</Version>
<Version>3.4</Version>
<SignAssembly>true</SignAssembly>
<AssemblyName>$(MSBuildProjectName)</AssemblyName>
</PropertyGroup>
Expand Down
24 changes: 14 additions & 10 deletions ValorantCC/src/Crosshair/CrosshairMain.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ public static Data ChangeInActiveProfile(List<Color> Colors, int SelectedIndex,
var SelectedProfile = FetchedProfiles.Profiles[SelectedIndex];
if (!SelectedProfile.bUseAdvancedOptions) SelectedProfile.bUseAdvancedOptions = true;
SelectedProfile.Primary.bUseCustomColor = true;
//SelectedProfile.Primary.Color.R = Colors[0].R; SelectedProfile.Primary.Color.G = Colors[0].G; SelectedProfile.Primary.Color.B = Colors[0].B; SelectedProfile.Primary.Color.A = Colors[0].A;
SelectedProfile.Primary.Color.R = Colors[0].R; SelectedProfile.Primary.Color.G = Colors[0].G; SelectedProfile.Primary.Color.B = Colors[0].B; SelectedProfile.Primary.Color.A = Colors[0].A;
SelectedProfile.Primary.colorCustom.R = Colors[0].R; SelectedProfile.Primary.colorCustom.G = Colors[0].G; SelectedProfile.Primary.colorCustom.B = Colors[0].B; SelectedProfile.Primary.colorCustom.A = Colors[0].A;
SelectedProfile.Primary.OutlineColor.R = Colors[1].R; SelectedProfile.Primary.OutlineColor.G = Colors[1].G; SelectedProfile.Primary.OutlineColor.B = Colors[1].B; SelectedProfile.Primary.OutlineColor.A = Colors[1].A;
SelectedProfile.aDS.bUseCustomColor = true;
//SelectedProfile.aDS.Color.R = Colors[2].R; SelectedProfile.aDS.Color.G = Colors[2].G; SelectedProfile.aDS.Color.B = Colors[2].B; SelectedProfile.aDS.Color.A = Colors[2].A;
SelectedProfile.aDS.Color.R = Colors[2].R; SelectedProfile.aDS.Color.G = Colors[2].G; SelectedProfile.aDS.Color.B = Colors[2].B; SelectedProfile.aDS.Color.A = Colors[2].A;
SelectedProfile.aDS.colorCustom.R = Colors[2].R; SelectedProfile.aDS.colorCustom.G = Colors[2].G; SelectedProfile.aDS.colorCustom.B = Colors[2].B; SelectedProfile.aDS.colorCustom.A = Colors[2].A;
SelectedProfile.aDS.OutlineColor.R = Colors[3].R; SelectedProfile.aDS.OutlineColor.G = Colors[3].G; SelectedProfile.aDS.OutlineColor.B = Colors[3].B; SelectedProfile.aDS.OutlineColor.A = Colors[3].A;
SelectedProfile.Sniper.bUseCustomCenterDotColor = true;
//SelectedProfile.Sniper.CenterDotColor.R = Colors[4].R; SelectedProfile.Sniper.CenterDotColor.G = Colors[4].G; SelectedProfile.Sniper.CenterDotColor.B = Colors[4].B; SelectedProfile.Sniper.CenterDotColor.A = Colors[4].A;
SelectedProfile.Sniper.CenterDotColor.R = Colors[4].R; SelectedProfile.Sniper.CenterDotColor.G = Colors[4].G; SelectedProfile.Sniper.CenterDotColor.B = Colors[4].B; SelectedProfile.Sniper.CenterDotColor.A = Colors[4].A;
SelectedProfile.Sniper.centerDotColorCustom.R = Colors[4].R; SelectedProfile.Sniper.centerDotColorCustom.G = Colors[4].G; SelectedProfile.Sniper.centerDotColorCustom.B = Colors[4].B; SelectedProfile.Sniper.centerDotColorCustom.A = Colors[4].A;
return UserSettings;
}
Expand All @@ -48,40 +48,44 @@ public static Data ChangeActiveProfile(List<Color> Colors, int SelectedIndex, Da
var SelectedProfile = FetchedProfiles.Profiles[SelectedIndex];
if (!SelectedProfile.bUseAdvancedOptions) SelectedProfile.bUseAdvancedOptions = true;
Utilities.Utils.Log("Removing Old colors.");
UserSettings.stringSettings.RemoveAll(setting => setting.settingEnum == "EAresStringSettingName::CrosshairColor");
UserSettings.stringSettings.RemoveAll(setting => setting.settingEnum == "EAresStringSettingName::CrosshairColorCustom");
UserSettings.stringSettings.RemoveAll(setting => setting.settingEnum == "EAresStringSettingName::CrosshairOutlineColor");
//UserSettings.stringSettings.RemoveAll(setting => setting.settingEnum == "EAresStringSettingName::CrosshairADSColor");
UserSettings.stringSettings.RemoveAll(setting => setting.settingEnum == "EAresStringSettingName::CrosshairADSColor");
UserSettings.stringSettings.RemoveAll(setting => setting.settingEnum == "EAresStringSettingName::CrosshairADSColorCustom");
UserSettings.stringSettings.RemoveAll(setting => setting.settingEnum == "EAresStringSettingName::CrosshairADSOutlineColor");
//UserSettings.stringSettings.RemoveAll(setting => setting.settingEnum == "EAresStringSettingName::CrosshairSniperCenterDotColor");
UserSettings.stringSettings.RemoveAll(setting => setting.settingEnum == "EAresStringSettingName::CrosshairSniperCenterDotColor");
UserSettings.stringSettings.RemoveAll(setting => setting.settingEnum == "EAresStringSettingName::CrosshairSniperCenterDotColorCustom");

UserSettings.boolSettings.RemoveAll(setting => setting.settingEnum == "EAresBoolSettingName::CrosshairUseCustomColor");
UserSettings.boolSettings.RemoveAll(setting => setting.settingEnum == "EAresBoolSettingName::CrosshairADSUseCustomColor");
UserSettings.boolSettings.RemoveAll(setting => setting.settingEnum == "EAresBoolSettingName::CrosshairSniperUseCustomColor");
Utilities.Utils.Log("Appending new colors.");
UserSettings.stringSettings.Add(new Stringsetting { settingEnum = "EAresStringSettingName::CrosshairColor", value = Utilities.Utils.ColorToString(Colors[0]) });
UserSettings.stringSettings.Add(new Stringsetting { settingEnum = "EAresStringSettingName::CrosshairColorCustom", value = Utilities.Utils.ColorToString(Colors[0]) });
UserSettings.stringSettings.Add(new Stringsetting { settingEnum = "EAresStringSettingName::CrosshairOutlineColor", value = Utilities.Utils.ColorToString(Colors[1]) });
//UserSettings.stringSettings.Add(new Stringsetting { settingEnum = "EAresStringSettingName::CrosshairADSColor", value = Utilities.Utils.ColorToString(Colors[2]) });

UserSettings.stringSettings.Add(new Stringsetting { settingEnum = "EAresStringSettingName::CrosshairADSColor", value = Utilities.Utils.ColorToString(Colors[2]) });
UserSettings.stringSettings.Add(new Stringsetting { settingEnum = "EAresStringSettingName::CrosshairADSColorCustom", value = Utilities.Utils.ColorToString(Colors[2]) });
UserSettings.stringSettings.Add(new Stringsetting { settingEnum = "EAresStringSettingName::CrosshairADSOutlineColor", value = Utilities.Utils.ColorToString(Colors[3]) });
//UserSettings.stringSettings.Add(new Stringsetting { settingEnum = "EAresStringSettingName::CrosshairSniperCenterDotColor", value = Utilities.Utils.ColorToString(Colors[4]) });

UserSettings.stringSettings.Add(new Stringsetting { settingEnum = "EAresStringSettingName::CrosshairSniperCenterDotColor", value = Utilities.Utils.ColorToString(Colors[4]) });
UserSettings.stringSettings.Add(new Stringsetting { settingEnum = "EAresStringSettingName::CrosshairSniperCenterDotColorCustom", value = Utilities.Utils.ColorToString(Colors[4]) });

UserSettings.boolSettings.Add(new Boolsetting { settingEnum = "EAresBoolSettingName::CrosshairUseCustomColor", value = true });
UserSettings.boolSettings.Add(new Boolsetting { settingEnum = "EAresBoolSettingName::CrosshairADSUseCustomColor", value = true });
UserSettings.boolSettings.Add(new Boolsetting { settingEnum = "EAresBoolSettingName::CrosshairSniperUseCustomColor", value = true });
Utilities.Utils.Log("Modifying profile colors.");
SelectedProfile.Primary.bUseCustomColor = true;
//SelectedProfile.Primary.Color.R = Colors[0].R; SelectedProfile.Primary.Color.G = Colors[0].G; SelectedProfile.Primary.Color.B = Colors[0].B; SelectedProfile.Primary.Color.A = Colors[0].A;
SelectedProfile.Primary.Color.R = Colors[0].R; SelectedProfile.Primary.Color.G = Colors[0].G; SelectedProfile.Primary.Color.B = Colors[0].B; SelectedProfile.Primary.Color.A = Colors[0].A;
SelectedProfile.Primary.colorCustom.R = Colors[0].R; SelectedProfile.Primary.colorCustom.G = Colors[0].G; SelectedProfile.Primary.colorCustom.B = Colors[0].B; SelectedProfile.Primary.colorCustom.A = Colors[0].A;
SelectedProfile.Primary.OutlineColor.R = Colors[1].R; SelectedProfile.Primary.OutlineColor.G = Colors[1].G; SelectedProfile.Primary.OutlineColor.B = Colors[1].B; SelectedProfile.Primary.OutlineColor.A = Colors[1].A;
SelectedProfile.aDS.bUseCustomColor = true;
//SelectedProfile.aDS.Color.R = Colors[2].R; SelectedProfile.aDS.Color.G = Colors[2].G; SelectedProfile.aDS.Color.B = Colors[2].B; SelectedProfile.aDS.Color.A = Colors[2].A;
SelectedProfile.aDS.Color.R = Colors[2].R; SelectedProfile.aDS.Color.G = Colors[2].G; SelectedProfile.aDS.Color.B = Colors[2].B; SelectedProfile.aDS.Color.A = Colors[2].A;
SelectedProfile.aDS.colorCustom.R = Colors[2].R; SelectedProfile.aDS.colorCustom.G = Colors[2].G; SelectedProfile.aDS.colorCustom.B = Colors[2].B; SelectedProfile.aDS.colorCustom.A = Colors[2].A;
SelectedProfile.aDS.OutlineColor.R = Colors[3].R; SelectedProfile.aDS.OutlineColor.G = Colors[3].G; SelectedProfile.aDS.OutlineColor.B = Colors[3].B; SelectedProfile.aDS.OutlineColor.A = Colors[3].A;
SelectedProfile.Sniper.bUseCustomCenterDotColor = true;
//SelectedProfile.Sniper.CenterDotColor.R = Colors[4].R; SelectedProfile.Sniper.CenterDotColor.G = Colors[4].G; SelectedProfile.Sniper.CenterDotColor.B = Colors[4].B; SelectedProfile.Sniper.CenterDotColor.A = Colors[4].A;
SelectedProfile.Sniper.CenterDotColor.R = Colors[4].R; SelectedProfile.Sniper.CenterDotColor.G = Colors[4].G; SelectedProfile.Sniper.CenterDotColor.B = Colors[4].B; SelectedProfile.Sniper.CenterDotColor.A = Colors[4].A;
SelectedProfile.Sniper.centerDotColorCustom.R = Colors[4].R; SelectedProfile.Sniper.centerDotColorCustom.G = Colors[4].G; SelectedProfile.Sniper.centerDotColorCustom.B = Colors[4].B; SelectedProfile.Sniper.centerDotColorCustom.A = Colors[4].A;
}
return UserSettings;
Expand Down
11 changes: 6 additions & 5 deletions ValorantCC/src/Processor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,21 +220,21 @@ private async Task<bool> putUserSettings(Data newData)
return false;
}


#nullable enable
private ProfileList FetchProfiles(string SettingValue, string? PrimOutlineColor, string? ADSColorValue, string? ADSOutlineColor, string? SniperCenterdotColor)
{
string DefaultUserSettings = JsonConvert.SerializeObject(UserSettings);
Utilities.Utils.Log("Fetching/Creating Profile/s");
Utilities.Utils.Log($"Setting Value: {DefaultUserSettings}");
if (ProfileListed) return JsonConvert.DeserializeObject<ProfileList>(SettingValue);
if (ProfileListed) return JsonConvert.DeserializeObject<ProfileList>(SettingValue)!;
CrosshairColor PrimaryColor = Utilities.Utils.parseCrosshairColor(SettingValue);
#nullable enable

CrosshairColor PrimaryOutlineColor = Utilities.Utils.parseCrosshairColor(PrimOutlineColor);
CrosshairColor ADSColor = Utilities.Utils.parseCrosshairColor(ADSColorValue);
CrosshairColor aDSOutlineColor = Utilities.Utils.parseCrosshairColor(ADSOutlineColor);
CrosshairColor sniperCenterdotColor = Utilities.Utils.parseCrosshairColor(SniperCenterdotColor);
#nullable disable
string profileName = UserSettings.stringSettings.FirstOrDefault(setting => setting.settingEnum == "EAresStringSettingName::CrosshairProfileName").value;

string profileName = UserSettings.stringSettings.FirstOrDefault(setting => setting.settingEnum == "EAresStringSettingName::CrosshairProfileName")!.value;

return new ProfileList
{
Expand All @@ -252,6 +252,7 @@ private ProfileList FetchProfiles(string SettingValue, string? PrimOutlineColor,
}
};
}
#nullable disable


private List<string> FetchProfileNames(ProfileList ProfileList)
Expand Down
1 change: 1 addition & 0 deletions ValorantCC/src/Utils.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ public static string ColorToString(Color Color)
{
Log("Constructing Headers");
Dictionary<string, string> headers = new Dictionary<string, string>();
headers.Add("Content-Type", "application/json");
headers.Add("Authorization", $"Bearer {auth.AuthTokens.AccessToken}");
headers.Add("X-Riot-Entitlements-JWT", auth.AuthTokens.Token);
headers.Add("X-Riot-ClientVersion", auth.Version);
Expand Down

0 comments on commit bf7274a

Please sign in to comment.