diff --git a/GBCLV3.Tests/GBCLV3.Tests.csproj b/GBCLV3.Tests/GBCLV3.Tests.csproj index dd46b05..ccdac8c 100644 --- a/GBCLV3.Tests/GBCLV3.Tests.csproj +++ b/GBCLV3.Tests/GBCLV3.Tests.csproj @@ -47,7 +47,6 @@ - diff --git a/GBCLV3/App.xaml b/GBCLV3/App.xaml index b9fc520..bbfac84 100644 Binary files a/GBCLV3/App.xaml and b/GBCLV3/App.xaml differ diff --git a/GBCLV3/Bootstrapper.cs b/GBCLV3/Bootstrapper.cs index c42c782..451d33b 100644 Binary files a/GBCLV3/Bootstrapper.cs and b/GBCLV3/Bootstrapper.cs differ diff --git a/GBCLV3/Models/Config.cs b/GBCLV3/Models/Config.cs index 21c95e1..23c89b2 100644 --- a/GBCLV3/Models/Config.cs +++ b/GBCLV3/Models/Config.cs @@ -74,7 +74,7 @@ class Config public bool UseSystemColor { get; set; } - public string ThemeColor { get; set; } + public string AccentColor { get; set; } #endregion } diff --git a/GBCLV3/Models/Forge.cs b/GBCLV3/Models/Forge.cs index cf1481a..bb322aa 100644 --- a/GBCLV3/Models/Forge.cs +++ b/GBCLV3/Models/Forge.cs @@ -4,6 +4,8 @@ namespace GBCLV3.Models { class Forge { + public string Version { get; set; } + public int Build { get; set; } public DateTime ReleaseTime { get; set; } @@ -12,6 +14,8 @@ class Forge public string GameVersion { get; set; } - public string Version { get; set; } + public bool IsAutoInstall { get; set; } + + public bool HasSuffix { get; set; } } } diff --git a/GBCLV3/Models/Launcher/Launch.cs b/GBCLV3/Models/Launcher/Launch.cs index 46d7a8d..2da79b0 100644 --- a/GBCLV3/Models/Launcher/Launch.cs +++ b/GBCLV3/Models/Launcher/Launch.cs @@ -64,9 +64,4 @@ class LaunchProfile public string ExtraArgs { get; set; } } - - class LaunchResult - { - public bool IsSuccessful { get; set; } - } } diff --git a/GBCLV3/Properties/AssemblyInfo.cs b/GBCLV3/Properties/AssemblyInfo.cs index c8d64d3..6ddf8ba 100644 --- a/GBCLV3/Properties/AssemblyInfo.cs +++ b/GBCLV3/Properties/AssemblyInfo.cs @@ -11,8 +11,8 @@ [assembly: AssemblyCopyright("Copyright © Goose Bomb 2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.0.2.38")] -[assembly: AssemblyFileVersion("3.0.2.38")] +[assembly: AssemblyVersion("3.0.3.41")] +[assembly: AssemblyFileVersion("3.0.3.41")] [assembly: ComVisible(false)] diff --git a/GBCLV3/Resources/Styles/Icons.xaml b/GBCLV3/Resources/Styles/Icons.xaml index 532b593..35d69ce 100644 --- a/GBCLV3/Resources/Styles/Icons.xaml +++ b/GBCLV3/Resources/Styles/Icons.xaml @@ -2,20 +2,24 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:GBCLV3.Resources.Styles"> - + M511.974 15.759C229.233 15.759 0.007 243.57 0.007 524.59c0 224.8 146.666 415.512 350.136 482.754 25.628 4.711 34.95-10.96 34.95-24.484 0-12.057-0.45-44.031-0.67-86.54-142.426 30.776-172.48-68.219-172.48-68.219-23.285-58.771-56.852-74.403-56.852-74.403-46.487-31.547 3.531-30.931 3.531-30.931 51.379 3.613 78.423 52.414 78.423 52.414 45.66 77.76 119.846 55.257 149.005 42.312 4.632-32.941 17.891-55.315 32.5-68.063-113.673-12.834-233.188-56.485-233.188-251.45 0-55.567 19.938-100.992 52.684-136.569-5.239-12.81-22.843-64.543 5.026-134.628 0 0 42.982-13.667 140.811 52.2 40.816-11.334 84.622-16.997 128.166-17.17 43.483 0.187 87.302 5.836 128.173 17.17 97.76-65.867 140.68-52.2 140.68-52.2 27.938 70.085 10.34 121.819 5.096 134.628 32.813 35.576 52.613 81.002 52.613 136.569 0 195.419-119.688 238.473-233.746 251.021 18.354 15.723 34.736 46.839 34.736 94.317 0 67.98-0.613 122.837-0.613 139.531 0 13.627 9.203 29.479 35.195 24.435 203.246-67.386 349.811-257.956 349.811-482.692C1023.994 243.57 794.762 15.759 511.974 15.759z - + - + M72.81 429.82c-22.296-2.195-27.265-19.923-25.57-43.598 9.177 9.99 18.39 19.894 32.228 22.2-.75-7.84.293-15.77 4-23.815 5.323 7.987 14.75 16.796 29.034 26.567l10.557-28.337c9.917 15.174 21.736 29.49 48.303 41.756l11.9-35.993c7.796 8.075 15.115 16.283 33.035 21.326l24.54-36.55c22.244 9.91 42.094 7.707 58.597-11.042 13.845-17.986 27.5-36.654 38.51-64.19l-8.08-30.04c-.552-12.898 15.98-20.13 26.698-7.09l25.833 49.492c3.972 11.24 4.647 23.27-2.554 37.263l-45.075 68.697c-7.32 5.586-16.634 10.108-35.875 9.198-33.167-3.663-65.717-6.63-91.228-1.006-29.393 3.428-58.757 7.524-88.056 13.206-16.216 4.97-32.058 5.285-46.8-8.046zm49.984-77.64c-7.862 13.362-11.848 26.56-14.065 39.672-19.74-10.725-23.808-22.162-25.76-33.68-7.4 10.894-10.6 21.59-12.304 32.22-16.063-7.584-21.34-18.375-25.577-29.468l-6.842 11.908-13.075-46.97c-4.258-10.16-4.962-20.487 5.36-31.3l33.614-33.91 29.724.024c22.626-17.655 48.995-33.63 78.902-48.084l59.06-68.815c12.993-11.43 26.398-13.64 39.898-13.933l66.047-2.944c5.954 1.975 11.9 4.133 18.015 10 37.572 33.9 59.94 68.483 54.618 104.286l-29.262 40.47-10.446-25.98c-12.92-18.94-28.54-20.093-42.872-14.982-10.078 3.594-11.672 13.897-11.694 21.634l7.862 34.466c-15.49 31.28-31.434 52.496-47.797 64.39-12.758 5.65-25.994.814-39.384-7.746-8.802 15.468-17.78 27.228-26.824 37.08-13.772-6.65-23.61-17.656-31.963-30.238-5.823 18.5-9.486 34.657-12.555 50.154-23.036-15.152-38.753-33.872-42.68-58.25zm-54.668-42.93l26.39-23.344-10.042-12.215-16.517 8.127-13.58 26.978zm146.55-37.028l38.892-4.14 23.205-14.102c7.48-6.71 10.755-13.412 12.553-20.1l-17.082-42.072c-3.296-4.632-7.716-5.748-13.728-2.055l-35.95 35.325-32.36 8.266c-3.713 2.525-5.07 5.6-3.104 9.514l9.595 21.018c3.986 6.115 9.925 8.244 17.978 8.346zm198.178-11.01l11.768-16.41c1.622-16.905-.42-30.83-5.337-43.993 21.267-5.852 48.473 4.256 68.698 25.97 3.597 5.257 1.703 12.092-5.455 14.096-28.087 6.32-45.94 21.194-69.674 20.335zM372.677 131.01c23.153-7.708 46.557-9.977 70.033-10.373 4.09-.053 10.16.33 8.942 7.363-9.41 27.2-25.444 38.73-42.226 51.175-8.48-17.487-21.597-33.22-36.75-48.165zm-27.735-58.017c12.282-3.26 27.412-3.39 25.65 5.873l-26.626 34.195-65.292 2.908c21.253-20.915 38.87-35.64 66.268-42.975z - + - + + M520.015 667.393c-22.061 20.921-44.379 37.328-76.441 51.703-30.436 9.896-66.451 11.333-78.595 6.463-4.483 5.093-1.076 5.789-2.153 9.694-1.076 3.905 5.383 5.79 7.537 12.926 2.153 7.136-3.589 6.507 2.153 11.848 5.742 5.341 11.125 10.457 12.919 15.08 1.795 4.623 26.916 17.279 19.38 26.929-7.536 9.649-6.46 8.617-6.46 8.617s-.359 7.944-4.306 10.771c-3.948 2.828-10.767-9.694-10.767-9.694l-13.996 1.077s-5.024 12.971-9.69 17.234c-4.665 4.264-8.254-8.572-9.69-10.771-1.435-2.199-9.33-6.059-11.842-2.154-2.513 3.904-6.101 12.611-9.69 14.002-3.589 1.392-16.509-16.471-18.303-19.388-1.794-2.917-2.871-17.908 2.153-20.466 5.025-2.558 7.178-4.622 9.69-11.848 2.512-7.226 3.589-17.549-1.077-19.389-4.665-1.84-11.843-6.777-6.459-10.771 5.383-3.995-44.86-49.504-45.219-63.551-.359-14.048-.359-13.24-1.077-20.466-.717-7.226-14.714-5.7-16.149-24.774-7.896-3.277-10.408-11.086-11.843-14.003-1.436-2.917-.718 5.072-2.154 7.54-1.435 2.468-9.689-7.54-9.689-7.54l-6.46 10.771s-2.871-15.035-2.153-19.388c.717-4.354 1.123-5.222-9.69-1.077-9.031 3.461-33.738 14.123-52.62 14.52-7.631.16-2.269 2.476-1.212 7.023 1.256 5.4 15.624 23.504 15.073 31.237-.805 11.295-14.46 40.059-10.766 47.394 4.065 8.074 2.512 17.279 1.076 20.465-1.435 3.187 14.714 20.152 13.997 26.929-.718 6.777 2.512 14.047-2.154 17.234-4.665 3.187-14.733 11.909-24.762 11.849-6.514-.04-27.68-8.36-35.529-5.386-6.408 2.427-29.07 12.97-40.912 7.54-7.178 3.545-11.843 4.308-11.843 4.308l-8.614-3.231s-15.597-2.496-26.915-2.154c-7.822.236-.012-7.688 2.603-9.632l.627-.063c.386-.549.052-.441-.627.063l-10.14 1.015s3.593-8.033 4.936-10.461c.16.263.316.216.447-.311.166-.665-.043-.421-.447.311-.713-1.174-1.51-8.662-.63-8.928 0 0 10.891-5.953 12.92-8.617 3.59-4.713 7.896-6.418 37.683-4.309 13.145.931 16.508-3.904 20.456-8.617 3.947-4.712 8.613-10.008 10.766-18.311 2.153-8.303-19.38-40.931-19.38-40.931s-10.048-20.421-7.536-36.623c2.512-16.202-4.665-4.623-11.843-24.774 13.638-19.434 15.432-19.344 19.38-20.466 5.742-10.457 15.79-30.115 20.456-30.16 1.794-1.66-.18.18-1.077-3.231 1.421-3.536 51.59-51.397 76.326-47.639.548-4.145.14-13.584-2.038-19.144-1.426-.831-6.207.634-8.613 3.232-1.292 12.156-6.101 12.387-19.38 22.619-13.278 10.233-36.244 5.029-46.295 5.386a12.916 12.916 0 0 1-1.963 2.574c-6.399 6.526-18.605 5.762-19.57 6.043-.678.198-7.536 10.413-19.38 14.003-12.02 3.645-13.386 3.94-18.302 5.386-13.278 3.904-13.402-5.388-12.92-6.463 1.228-2.733-17.299-13.96-21.532-16.157-.701-9.447 3.588-31.91 9.69-31.237 6.1.673 1.076-8.617 1.076-8.617s10.049-13.599 15.073-14.003c5.024-.404 30.863 2.199 33.376 5.386 2.512 3.186 19.738-6.418 24.762-2.155 6.819-14.765 22.61-33.346 26.916-32.314-2.871-15.843-2.871-41.963 5.383-48.471 8.255-6.508-4.306-2.109-5.383-12.926-1.076-10.816-2.871-39.091 6.46-44.162 9.331-5.072 13.996-17.235 13.996-17.235l-2.42-7.471c-7.256 1.194-24.219 18.01-32.032 21.474-10.253 4.546-10.766-6.463-10.766-6.463s-6.82-4.622-4.307-8.617c-1.794-5.43 0-9.694 0-9.694l11.843 6.463 1.077-11.849s6.46 3.995 10.766 3.232c4.307-.763 8.613-4.309 8.613-4.309l-1.077-7.54 7.537 5.386 4.306-2.154v-7.54l6.46 2.154h3.23s2.153-15.394-1.076-16.157c-3.23-.763-3.23 0-3.23 0l-2.154 6.463-4.306-4.309-6.46 5.386-1.077 9.694-7.536-5.386-6.46 6.463-2.153 8.617-7.537-6.462-7.536-1.078v8.617s-8.254.763-10.766-7.539c-2.564 1.104-3.091.456-3.2.142l-.03-.142s.001.06.03.142c.247 1.184 1.975 9.963-.03 14.937-2.154 5.341-7.537-7.54-7.537-7.54s-6.819 1.841-9.69 6.463c-2.87 4.623-8.254-33.346-4.306-38.777 3.948-5.43 7.536-9.694 7.536-9.694s-1.794-3.905-1.076-8.617c.718-4.713-4.666-21.498-2.153-23.697 2.512-2.199 2.153-7.854 6.46-14.003 4.306-6.149 2.87 15.843 13.996 23.697 4.665-.718 8.972.404 11.843 1.077 2.87.673 4.665-7.136 13.996-3.231 9.331 3.904 2.153-6.463 2.153-6.463l5.383-3.231s-4.665-16.472-2.153-21.543c-3.948-7.585-17.944-34.065-29.07-40.932-11.124-6.866 8.255-2.827 9.69-3.231 1.436-.404 6.46-5.386 6.46-5.386h8.614c.436.925 2.526-5.305 1.076-16.157-3.926-29.374-29.69-41.118-39.835-47.394-6.572-4.065-18.552-4.515-3.23-6.463 21.342-2.713 35.879 7.568 48.448 20.466 8.765 8.994 10.025 18.881 17.043 36.516 7.009 1.258 9.873-4.202 9.873-4.202s8.254-18.266 19.38-25.851c-.359 10.008 3.229 11.848 3.229 11.848-.247-2.283 40.392-46.484 46.296-40.93 4.665 12.162 5.383 10.77 5.383 10.77s38.759-22.934 46.295-12.925c-.383 15.483-8.589 31.864-6.46 33.391.862.618 29.444 15.388 26.916 22.62-3.581 10.247-4.686 24.196-4.236 24.738 17.381 20.94 19.227 19.166 20.338 21.358 2.904 5.729-7.311 10.512-17.114 29.245-3.13 5.981 12.855 28.064 12.855 28.064s-4.306.763-2.153 9.695c3.127 4.289-1.692 14.98 7.523 14.411 33.759-2.086 60.73 21.521 64.501 40.986.686 3.538 41.678 3.117 49.5 62.346 12.308 20.306 26.551 20.732 27.052 31.979.385 8.648 7.495 21.827 5.29 40.864-1.329 11.478-38.586 47.868-40.819 48.538-4.937 1.483-2.274 3.345-3.529 13.743-1.082 8.958-12.26 19.155-14.774 21.803-5.002 5.27-7.965-1.456-8.613 1.077-.894 3.494-9.584 10.331-10.004 11.172-12.194 16.873-28.121 8.379-37.368 15.757 5.466 11.475-.553 36.86 0 37.699 1.794 2.724 1.037 19.821 0 21.543-2.263 3.757 12.625.298 13.996 3.232l6.46 15.08h12.92s6.101 9.021 7.536 10.771c1.436 1.75 16.15-3.231 16.15-3.231s16.149 13.688 19.379 14.002c3.23.315 7.537-10.367 13.996-10.771 6.46-.404 13.279 5.79 16.15 4.309 2.871-1.482 10.407-14.317 13.996-14.003 3.589.314 8.613 5.43 13.996 4.308 5.384-1.122 9.331-17.548 12.92-14.002 3.589 3.545 8.254 5.789 11.843 4.308 3.589-1.481 7.536-17.907 10.766-16.157 3.23 1.75 9.331 6.508 12.92 5.386 3.589-1.122 1.077-11.445 3.23-10.772s7.293 6.012 8.613 4.309c2.595-3.348 37.682-6.463 40.912-1.077-14.714 9.694-31.94 24.056-49.525 43.085zM341.293 482.125c1.256-2.648 18.124-14.586 19.38-16.157 1.256-1.571 3.409-12.791 1.077-19.388-8.434.583-15.073-7.899-20.457-12.926-6.1 10.772-10.407 25.492-17.226 29.083 1.436 6.822-1.076 15.08-1.076 15.08s2.691 12.701 5.383 8.617c2.691-4.084 11.663-1.661 12.919-4.309z + + + M853.312 1024h-170.624v-170.688H341.312V1024H170.688V512h170.624V341.312h341.376V512h170.624v512zM682.688 0H1024v341.312h-341.312V0zM0 0h341.312v341.312H0V0z - + - - M 911 752.89C 912.106 751.341 919.783 747.265 925 702.89C 918.805 690.278 919 690.89 919 690.89C 919 690.89 911.076 658.797 916 655.89C 920.924 652.983 932.672 649.315 934 644.89C 932.23 638.694 920.469 622.166 926 608.89C 925.336 606.235 922.885 600.898 922 602.89C 921.115 604.881 926.221 581.022 926 585.89C 925.779 590.758 920.066 575.83 932 521.89C 932 521.89 935.761 472.306 932 465.89C 931.767 462.274 929.98 449.851 937 441.89C 933.141 433.663 932.455 422.901 938 415.89C 928.929 405.269 947.481 296.068 955 280.89C 976.237 333.64 999.336 374.331 1015 401.89C 1025.58 436.751 1014.35 459.218 1011 469.89C 1007.65 480.561 1018.12 556.407 1013 578.89C 1007.88 601.373 1003 609.89 1003 609.89C 1003 609.89 998.081 646.168 998 660.89C 998 660.89 1000.61 675.016 1009 682.89C 1015.4 687.224 1021.55 677.647 1041 705.89C 1080.14 725.06 1097.74 718.412 1100 711.89C 1096.44 698.98 1070.56 695.159 1067.87 664.828C 1061.94 642.89 1059.77 618.074 1060 596.89C 1056.69 581.016 1053.45 532.451 1071 494.89C 1077.93 463.745 1075.86 449.837 1078 433.89C 1080.14 417.943 1073.18 401.673 1075 390.89C 1068.41 379.221 1069.11 389.705 1065 362.89C 1061.55 337.845 1042.1 281.051 1039 266.89C 1049.4 262.464 1062.68 266.594 1063 249.89C 1059.56 230.088 1049.82 182.267 1035 169.89C 1038.99 159.062 1032.37 125.966 1038 106.89C 1044.74 132.067 1048.34 136.013 1049 138.89C 1048.11 146.855 1054.9 180.022 1059 191.89C 1063.1 203.757 1064 247.89 1064 247.89L 1068 250.89C 1068 250.89 1069.84 256.961 1072 261.89C 1067.53 269.031 1066.01 269.269 1065 277.89C 1057.57 277.881 1053.74 282.826 1053 284.89C 1052.7 294.476 1054 294.89 1054 294.89L 1067 316.89C 1067 316.89 1066.24 319.024 1066 325.89C 1065.76 332.755 1080.76 362.055 1081 363.89C 1081.24 365.724 1090 376.89 1090 376.89C 1090 376.89 1106.61 371.621 1103 369.89C 1101.6 366.388 1098.09 350.901 1089 334.89L 1100 329.89C 1100 329.89 1098.82 323.159 1097 317.89C 1100.71 310.85 1115.13 309.516 1115 300.89C 1113.55 292.928 1115.46 281.582 1104 268.89C 1091.87 258.631 1096.58 261.565 1094 256.89C 1103.37 242.7 1089.7 125.523 1080 106.89C 1075.61 99.3196 1079.92 77.1471 1074 64.8898C 1076.71 51.7475 1073 49.8898 1073 49.8898C 1073 49.8898 1069.66 44.2853 1077 25.8898C 1077.48 9.26434 1077.44 7.96167 1077 -1.11023C 1069.7 -11.2885 1023.71 -24.3551 1009 -31.1102C 1004.91 -36.0952 999.22 -40.4497 992 -50.1102C 992 -50.1102 984.213 -51.3401 982 -53.1102C 979.787 -54.8803 977.229 -62.1019 982 -72.1102L 982 -86.1102L 988 -86.1102L 988 -89.1102L 990 -90.1102C 990 -90.1102 986.574 -97.2943 988 -99.1102C 989.426 -100.926 995 -101.11 995 -101.11C 995 -101.11 984.105 -107.329 984 -108.11C 983.895 -108.892 991 -109.11 991 -109.11L 984 -116.11C 984 -116.11 985.255 -123.84 989 -124.11C 989 -124.11 983.141 -125.372 975 -122.11C 966.859 -118.849 979 -129.11 979 -129.11L 963 -128.11L 964 -141.11C 964 -141.11 950.134 -124.317 945 -128.11L 952 -137.11C 952 -137.11 938.346 -130.521 938 -129.11C 937.654 -127.699 936 -141.11 936 -141.11C 936 -141.11 929.4 -126.521 927 -127.11C 924.6 -127.699 928 -136.11 928 -136.11C 928 -136.11 919.382 -126.036 920 -122.11C 920.618 -118.185 917 -129.11 917 -129.11C 917 -129.11 912.684 -110.197 913 -107.11C 913.316 -104.024 910 -114.11 910 -114.11C 910 -114.11 907.994 -110.553 908 -97.1102C 908 -97.1102 904.188 -94.0933 903 -87.1102L 907 -89.1102L 905 -83.1102L 912 -82.1102C 912 -82.1102 910.171 -77.191 904 -77.1102C 904 -77.1102 914.515 -66.9095 920 -65.1102C 920 -65.1102 919.894 -60.6419 921 -55.1102C 922.106 -48.4722 881.146 -73.3521 874 -68.1102C 866.412 -63.7534 865.571 -63.7171 864 -54.1102C 851.367 -55.7879 859.39 -55.6591 847 -54.1102C 834.168 -62.0758 823.859 -62.7827 817 -64.1102C 809.256 -68.3143 816.315 -73.4037 804 -74.1102C 804.96 -86.9865 804.155 -110.139 805 -126.11C 814.695 -141.639 812 -153.11 812 -153.11C 812 -153.11 811.336 -159.472 812 -166.11C 817.974 -166.774 822.809 -169.4 825 -173.11C 828.518 -179.697 828.712 -177.477 830 -186.11C 831.731 -194.301 830 -203.11 830 -203.11C 830 -203.11 829.323 -205.503 824 -203.11C 823.766 -209.347 827.579 -218.437 827 -228.11C 818.235 -226.942 820.097 -215.774 817 -215.11C 813.903 -214.446 801.74 -211.167 795 -205.11C 789.145 -202.151 787.183 -184.233 787 -174.11C 788.366 -169.961 788.749 -167.799 789 -167.11C 785.49 -160.004 784.466 -166.794 780 -153.11C 777.082 -151.817 774 -152.11 774 -152.11C 766.92 -133.745 768.804 -93.2402 760 -65.1102C 757.391 -51.5838 758.626 -58.5333 760 -43.1102C 764.914 -38.7504 770.263 -37.3926 775 -29.1102C 779.958 -27.9083 784 -28.1102 784 -28.1102C 784 -28.1102 861.719 15.2737 860 22.8898C 858.281 30.5059 878 77.8898 878 77.8898C 878 77.8898 873.312 91.6351 870 102.89C 860.493 112.817 824.217 176.907 822 189.89C 819.12 205.085 818.88 205.18 819 209.89C 822.217 212.829 836.657 228.16 853 231.89C 855.183 231.858 857.329 229.054 864 232.89C 868.679 233.628 872 233.89 872 233.89C 871.357 236.272 874.771 344.459 878 352.89C 881.512 357.316 880.037 387.265 880 387.89C 879.963 388.514 882.471 411.897 880 421.89C 877.529 431.883 884.232 423.575 879 441.89C 880.406 456.886 884.531 457.916 879 463.89C 873.469 469.864 873.399 527.315 880 540.89C 881.733 555.792 883.586 584.85 881 592.89C 878.857 599.381 874.514 601.599 881 610.89C 879.078 623.942 878.479 631.95 879 640.89C 879.742 651.6 878.488 675.961 880 689.89C 876.866 704.925 876.037 700.277 878 712.89C 879.963 725.503 891.018 748.464 895 752.89C 902.08 756.651 909.894 754.439 911 752.89z - + + M 223.251 828.517C 224.306 827.037 231.631 823.144 236.608 780.755C 230.697 768.708 230.883 769.293 230.883 769.293C 230.883 769.293 223.323 738.637 228.021 735.86C 232.719 733.083 243.928 729.58 245.194 725.352C 243.506 719.434 232.285 703.646 237.562 690.964C 236.928 688.428 234.59 683.331 233.745 685.233C 232.901 687.135 237.773 664.344 237.562 668.994C 237.351 673.644 231.9 659.385 243.286 607.86C 243.286 607.86 246.875 560.497 243.286 554.367C 243.064 550.914 241.359 539.047 248.056 531.442C 244.374 523.583 243.72 513.303 249.011 506.606C 240.356 496.461 258.056 392.149 265.23 377.651C 285.491 428.04 307.529 466.908 322.473 493.233C 332.563 526.533 321.85 547.995 318.657 558.188C 315.465 568.382 325.455 640.832 320.565 662.308C 315.676 683.784 311.025 691.92 311.025 691.92C 311.025 691.92 306.332 726.573 306.254 740.636C 306.254 740.636 308.746 754.129 316.749 761.651C 322.853 765.791 328.725 756.643 347.279 783.621C 384.62 801.933 401.41 795.582 403.569 789.352C 400.171 777.02 375.477 773.37 372.913 744.397C 367.26 723.442 365.191 699.737 365.406 679.502C 362.244 664.339 359.161 617.948 375.901 582.069C 382.509 552.319 380.539 539.033 382.579 523.8C 384.62 508.567 377.981 493.026 379.717 482.726C 373.432 471.58 374.098 481.594 370.177 455.979C 366.888 432.055 348.326 377.805 345.371 364.278C 355.292 360.051 367.96 363.995 368.268 348.039C 364.989 329.124 355.694 283.444 341.555 271.621C 345.358 261.278 339.043 229.664 344.417 211.442C 350.846 235.492 354.278 239.261 354.911 242.009C 354.067 249.618 360.539 281.3 364.452 292.636C 368.366 303.972 369.223 346.128 369.223 346.128L 373.039 348.994C 373.039 348.994 374.79 354.794 376.855 359.502C 372.587 366.323 371.143 366.55 370.177 374.785C 363.089 374.777 359.433 379.501 358.728 381.472C 358.445 390.629 359.682 391.024 359.682 391.024L 372.085 412.039C 372.085 412.039 371.362 414.078 371.131 420.636C 370.899 427.194 385.208 455.182 385.442 456.934C 385.675 458.687 394.028 469.352 394.028 469.352C 394.028 469.352 409.878 464.32 406.431 462.666C 405.095 459.321 401.748 444.527 393.074 429.233L 403.569 424.457C 403.569 424.457 402.44 418.028 400.707 412.994C 404.25 406.27 418 404.995 417.88 396.755C 416.493 389.15 418.322 378.312 407.385 366.188C 395.815 356.389 400.304 359.191 397.844 354.726C 406.784 341.171 393.745 229.241 384.488 211.442C 380.296 204.211 384.407 183.031 378.763 171.323C 381.352 158.769 377.809 156.994 377.809 156.994C 377.809 156.994 374.621 151.641 381.625 134.069C 382.086 118.188 382.048 116.943 381.625 108.278C 374.659 98.5553 330.78 86.0737 316.749 79.6211C 312.85 74.8593 307.418 70.6996 300.53 61.4719C 300.53 61.4719 293.1 60.297 290.989 58.6061C 288.878 56.9153 286.437 50.0171 290.989 40.4568L 290.989 27.0837L 296.714 27.0837L 296.714 24.2181L 298.622 23.2628C 298.622 23.2628 295.353 16.4005 296.714 14.6658C 298.074 12.9312 303.392 12.7554 303.392 12.7554C 303.392 12.7554 292.998 6.81537 292.897 6.06879C 292.797 5.32227 299.576 5.11365 299.576 5.11365L 292.897 -1.57294C 292.897 -1.57294 294.095 -8.9566 297.668 -9.21472C 297.668 -9.21472 292.078 -10.4198 284.311 -7.30432C 276.544 -4.18884 288.127 -13.9908 288.127 -13.9908L 272.862 -13.0356L 273.816 -25.4536C 273.816 -25.4536 260.587 -9.41223 255.689 -13.0356L 262.367 -21.6326C 262.367 -21.6326 249.341 -15.3385 249.011 -13.9908C 248.68 -12.6432 247.102 -25.4536 247.102 -25.4536C 247.102 -25.4536 240.805 -11.5176 238.516 -12.0805C 236.226 -12.6432 239.47 -20.6774 239.47 -20.6774C 239.47 -20.6774 231.248 -11.0538 231.837 -7.30432C 232.427 -3.55481 228.975 -13.9908 228.975 -13.9908C 228.975 -13.9908 224.857 4.07587 225.159 7.02405C 225.461 9.97217 222.297 0.337463 222.297 0.337463C 222.297 0.337463 220.382 3.73535 220.389 16.5763C 220.389 16.5763 216.752 19.4582 215.618 26.1285L 219.434 24.2181L 217.526 29.9495L 224.205 30.9045C 224.205 30.9045 222.46 35.6036 216.572 35.6808C 216.572 35.6808 226.604 45.4247 231.837 47.1435C 231.837 47.1435 231.736 51.4117 232.791 56.6957C 233.847 63.0365 194.768 39.2707 187.95 44.2778C 180.711 48.4394 179.908 48.4742 178.41 57.6509C 166.357 56.0484 174.012 56.1714 162.191 57.6509C 149.948 50.042 140.113 49.3669 133.569 48.0987C 126.181 44.0829 132.915 39.2214 121.166 38.5464C 122.082 26.2468 121.314 4.13104 122.12 -11.1252C 131.369 -25.9588 128.798 -36.9163 128.798 -36.9163C 128.798 -36.9163 128.165 -42.9934 128.798 -49.3341C 134.498 -49.9682 139.111 -52.4766 141.201 -56.0208C 144.558 -62.3125 144.743 -60.1924 145.972 -68.4387C 147.623 -76.2621 145.972 -84.6774 145.972 -84.6774C 145.972 -84.6774 145.326 -86.9633 140.247 -84.6774C 140.024 -90.6345 143.662 -99.3178 143.109 -108.558C 134.747 -107.442 136.524 -96.7742 133.569 -96.1401C 130.614 -95.506 119.01 -92.3735 112.579 -86.5878C 106.993 -83.7614 105.121 -66.6459 104.947 -56.976C 106.25 -53.0128 106.616 -50.9478 106.855 -50.2894C 103.506 -43.5015 102.53 -49.9872 98.2685 -36.9163C 95.4848 -35.6813 92.5441 -35.9611 92.5441 -35.9611C 85.7894 -18.4182 87.5866 20.2731 79.1872 47.1435C 76.6982 60.0641 77.8767 53.4258 79.1872 68.1584C 83.875 72.323 88.9785 73.62 93.4982 81.5315C 98.2289 82.6796 102.085 82.4868 102.085 82.4868C 102.085 82.4868 176.234 123.928 174.594 131.203C 172.953 138.478 191.767 183.74 191.767 183.74C 191.767 183.74 187.294 196.87 184.134 207.621C 175.064 217.104 140.454 278.324 138.339 290.726C 135.591 305.24 135.363 305.331 135.477 309.83C 138.546 312.638 152.323 327.282 167.915 330.845C 169.998 330.815 172.046 328.136 178.41 331.8C 182.874 332.505 186.042 332.755 186.042 332.755C 185.429 335.031 188.686 438.373 191.767 446.427C 195.117 450.655 193.71 479.263 193.675 479.86C 193.64 480.457 196.032 502.792 193.675 512.338C 191.318 521.883 197.712 513.947 192.721 531.442C 194.062 545.766 197.998 546.75 192.721 552.457C 187.444 558.164 187.378 613.043 193.675 626.009C 195.328 640.244 197.096 668.001 194.629 675.681C 192.584 681.881 188.441 684 194.629 692.875C 192.795 705.342 192.224 712.992 192.721 721.531C 193.429 731.762 192.232 755.032 193.675 768.337C 190.684 782.7 189.894 778.259 191.767 790.308C 193.64 802.356 204.186 824.289 207.986 828.517C 214.741 832.11 222.195 829.996 223.251 828.517z + \ No newline at end of file diff --git a/GBCLV3/Resources/Styles/TabControlStyle.xaml b/GBCLV3/Resources/Styles/TabControlStyle.xaml index 03c4193..7f9dbab 100644 --- a/GBCLV3/Resources/Styles/TabControlStyle.xaml +++ b/GBCLV3/Resources/Styles/TabControlStyle.xaml @@ -18,12 +18,12 @@ + Background="{DynamicResource LightTranslucentBrush}"/> - + @@ -69,7 +69,8 @@ - + diff --git a/GBCLV3/Services/DownloadService.cs b/GBCLV3/Services/DownloadService.cs index 2355761..62a0316 100644 --- a/GBCLV3/Services/DownloadService.cs +++ b/GBCLV3/Services/DownloadService.cs @@ -174,7 +174,7 @@ private void DownloadTask(DownloadItem item) try { - using (var fs = File.OpenWrite(item.Path)) + using (var fs = new FileStream(item.Path, FileMode.OpenOrCreate, FileAccess.Write, FileShare.Write)) { var waitResponceTask = _client.GetStreamAsync(item.Url); diff --git a/GBCLV3/Services/ForgeInstallService.cs b/GBCLV3/Services/ForgeInstallService.cs index 0fad3f2..a663524 100644 --- a/GBCLV3/Services/ForgeInstallService.cs +++ b/GBCLV3/Services/ForgeInstallService.cs @@ -7,6 +7,7 @@ using System.Net.Http; using System.Text; using System.Text.Json; +using System.Text.RegularExpressions; using System.Threading.Tasks; using GBCLV3.Models; using GBCLV3.Models.JsonClasses; @@ -57,14 +58,33 @@ public async Task> GetDownloadListAsync(string id) string json = await _client.GetStringAsync(FORGE_LIST_URL + id); var forgeList = JsonSerializer.Deserialize>(json); + var nums = id.Split('.') + .Select(numStr => + { + if (int.TryParse(numStr, out int num)) + { + return num; + } + else + { + return -1; + } + }) + .ToArray(); + + bool hasSuffix = ((nums[1] == 7 || nums[1] == 8) && nums[2] != 2); + bool isAutoInstall = (nums[1] < 13); + return forgeList.Select(jforge => new Forge { + Version = jforge.version, Build = jforge.build, ReleaseTime = jforge.modified, Branch = jforge.branch, GameVersion = jforge.mcversion, - Version = jforge.version, + HasSuffix = hasSuffix, + IsAutoInstall = isAutoInstall, } ).OrderByDescending(forge => forge.Build); } @@ -81,19 +101,19 @@ public async Task> GetDownloadListAsync(string id) } } - public IEnumerable GetDownload(Forge forge, bool isAutoInstall) + public IEnumerable GetDownload(Forge forge) { - string fullName = $"{forge.GameVersion}-{forge.Version}"; + string fullName = $"{forge.GameVersion}-{forge.Version}" + (forge.HasSuffix ? $"-{forge.GameVersion}" : null); var item = new DownloadItem { Name = $"Forge-{fullName}", - Path = isAutoInstall ? $"{_gamePathService.ForgeLibDir}/{fullName}/forge-{fullName}.jar" - : $"{_gamePathService.RootDir}/{fullName}-installer.jar", + Path = forge.IsAutoInstall ? $"{_gamePathService.ForgeLibDir}/{fullName}/forge-{fullName}.jar" + : $"{_gamePathService.RootDir}/{fullName}-installer.jar", - Url = isAutoInstall ? $"{_urlService.Base.Forge}{fullName}/forge-{fullName}-universal.jar" - : $"{_urlService.Base.Forge}{fullName}/forge-{fullName}-installer.jar", + Url = forge.IsAutoInstall ? $"{_urlService.Base.Forge}{fullName}/forge-{fullName}-universal.jar" + : $"{_urlService.Base.Forge}{fullName}/forge-{fullName}-installer.jar", IsCompleted = false, DownloadedBytes = 0, @@ -132,7 +152,7 @@ public async Task ManualInstall(Forge forge) public Version AutoInstall(Forge forge) { - string fullName = $"{forge.GameVersion}-{forge.Version}"; + string fullName = $"{forge.GameVersion}-{forge.Version}" + (forge.HasSuffix ? $"-{forge.GameVersion}" : null); string jarPath = $"{_gamePathService.ForgeLibDir}/{fullName}/forge-{fullName}.jar"; if (!File.Exists(jarPath)) @@ -146,12 +166,15 @@ public Version AutoInstall(Forge forge) using (var reader = new StreamReader(entry.Open(), Encoding.UTF8)) { - return _versionService.AddNew(reader.ReadToEnd()); + string json = reader.ReadToEnd(); + string versionID = $"{forge.GameVersion}-forge-{forge.Version}"; + + json = Regex.Replace(json, "\"id\":\\s\".*\"", $"\"id\": \"{versionID}\""); + return _versionService.AddNew(json); } } } #endregion - } } diff --git a/GBCLV3/Services/Launcher/GamePathService.cs b/GBCLV3/Services/Launcher/GamePathService.cs index 1997310..360f5bc 100644 --- a/GBCLV3/Services/Launcher/GamePathService.cs +++ b/GBCLV3/Services/Launcher/GamePathService.cs @@ -27,7 +27,7 @@ class GamePathService public string SavesDir => WorkingDir + "/saves"; - public string LogDir => WorkingDir + "/logs"; + public string LogsDir => WorkingDir + "/logs"; public string JreExecutablePath => _config.JreDir + (_config.JavaDebugMode ? "/java.exe" : "/javaw.exe"); diff --git a/GBCLV3/Services/Launcher/LaunchService.cs b/GBCLV3/Services/Launcher/LaunchService.cs index d7062a5..235d49a 100644 --- a/GBCLV3/Services/Launcher/LaunchService.cs +++ b/GBCLV3/Services/Launcher/LaunchService.cs @@ -2,6 +2,7 @@ using System.Diagnostics; using System.Linq; using System.Text; +using System.Threading; using System.Threading.Tasks; using GBCLV3.Models.Launcher; using GBCLV3.Utils; @@ -43,7 +44,7 @@ public LaunchService(GamePathService gamePathService) #region Public Methods - public async Task LaunchGameAsync(LaunchProfile profile, Version version) + public async Task LaunchGameAsync(LaunchProfile profile, Version version) { bool isDebugMode = _gamePathService.JreExecutablePath.EndsWith("java.exe"); @@ -74,10 +75,13 @@ public async Task LaunchGameAsync(LaunchProfile profile, Version v _gameProcess.OutputDataReceived += (s, e) => LogReceived?.Invoke(e.Data); _gameProcess.BeginOutputReadLine(); - await Task.Run(() => _gameProcess.WaitForInputIdle()); + if (!_gameProcess.HasExited) + { + await Task.Run(() => _gameProcess.WaitForInputIdle()); + } } - return new LaunchResult { IsSuccessful = true }; + return !_gameProcess.HasExited; } #endregion diff --git a/GBCLV3/Services/Launcher/VersionService.cs b/GBCLV3/Services/Launcher/VersionService.cs index 0557ad9..36b5530 100644 --- a/GBCLV3/Services/Launcher/VersionService.cs +++ b/GBCLV3/Services/Launcher/VersionService.cs @@ -299,8 +299,13 @@ private static Version Load(string json) if (args.Any(arg => arg.Contains("fml"))) { - // Invalid forge version - if (version.InheritsFrom == null) return null; + if (version.InheritsFrom == null) + { + // For 1.7.2 and earlier forge version, there's no 'inheritsFrom' property + // So it needs to be assigned in order to launch correctly + version.InheritsFrom = version.ID.Split('-')[0]; + } + string[] idNums = version.InheritsFrom.Split('.'); version.Type = (int.Parse(idNums[1]) >= 13) ? VersionType.NewForge : VersionType.Forge; } @@ -438,7 +443,7 @@ private void InheritParentProperties(Version version) } } - version.Libraries = parent.Libraries.Union(version.Libraries).ToList(); + version.Libraries = version.Libraries.Union(parent.Libraries).ToList(); version.AssetsInfo = parent.AssetsInfo; version.Size = parent.Size; version.SHA1 = parent.SHA1; diff --git a/GBCLV3/Services/ThemeService.cs b/GBCLV3/Services/ThemeService.cs index a486f0f..72abf28 100644 --- a/GBCLV3/Services/ThemeService.cs +++ b/GBCLV3/Services/ThemeService.cs @@ -1,11 +1,14 @@ using System; using System.IO; using System.Linq; +using System.Runtime.InteropServices; +using System.Runtime.Versioning; using System.Windows; using System.Windows.Markup; using System.Windows.Media; using System.Windows.Media.Imaging; using GBCLV3.Models; +using GBCLV3.Utils; using Stylet; using StyletIoC; @@ -13,10 +16,12 @@ namespace GBCLV3.Services { class ThemeService : PropertyChangedBase { - #region Properties + #region Binding Properties public BitmapImage BackgroundImage { get; private set; } + public StreamGeometry BackgroundIcon { get; private set; } + public string FontFamily { get => _config.FontFamily; @@ -33,7 +38,15 @@ public string FontWeight #region Private Members + private const string ICONS_SOURCE = "/GBCL;component/Resources/Styles/Icons.xaml"; private const string DEFAULT_BACKGROUND_IMAGE = "pack://application:,,,/Resources/Images/default_background.png"; + + private static readonly Color REF_COLOR_SPIKE = Color.FromRgb(15, 105, 200); + private static readonly Color REF_COLOR_BULLZEYE = Color.FromRgb(115, 25, 10); + private static readonly Color REF_COLOR_TBONE = Color.FromRgb(165, 125, 10); + private static readonly Color REF_COLOR_STEGZ = Color.FromRgb(105, 175, 5); + private const float COLOR_L2_THRESHOLD = 0.0075f; + private readonly Config _config; #endregion @@ -96,10 +109,6 @@ public void UpdateBackgroundImage() BackgroundImage.Freeze(); } - #endregion - - #region Public Methods - public string[] GetSystemFontNames() { return Fonts.SystemFontFamilies.Select(fontFamily => @@ -137,6 +146,40 @@ public string[] GetFontWeights() return fontWeights.Select(weight => weight.ToString()).ToArray(); } + public void LoadBackgroundIcon(Color accentColor) + { + ResourceDictionary iconsDict = null; + foreach (var dict in Application.Current.Resources.MergedDictionaries) + { + if (dict.Source?.ToString() == ICONS_SOURCE) + { + iconsDict = dict; + break; + } + } + + if (ColorUtil.CalcL2Norm(accentColor, REF_COLOR_SPIKE) < COLOR_L2_THRESHOLD) + { + BackgroundIcon = iconsDict["Spike"] as StreamGeometry; + } + //else if (ColorUtil.CalcL2Norm(accentColor, REF_COLOR_BULLZEYE) < COLOR_L2_THRESHOLD) + //{ + // BackgorundIcon = iconsDict["Bullzeye"] as StreamGeometry; + //} + //else if (ColorUtil.CalcL2Norm(accentColor, REF_COLOR_TBONE) < COLOR_L2_THRESHOLD) + //{ + // BackgorundIcon = iconsDict["TBone"] as StreamGeometry; + //} + //else if (ColorUtil.CalcL2Norm(accentColor, REF_COLOR_STEGZ) < COLOR_L2_THRESHOLD) + //{ + // BackgorundIcon = iconsDict["Stegz"] as StreamGeometry; + //} + else + { + BackgroundIcon = iconsDict["DragonIcon"] as StreamGeometry; + } + } + #endregion } } diff --git a/GBCLV3/Utils/ColorUtil.cs b/GBCLV3/Utils/ColorUtil.cs index 8afb594..e339884 100644 --- a/GBCLV3/Utils/ColorUtil.cs +++ b/GBCLV3/Utils/ColorUtil.cs @@ -20,5 +20,14 @@ public static Color LuminanceGamma(Color color, double gamma) return color; } + + public static float CalcL2Norm(Color a, Color b) + { + float dR = a.ScR - b.ScR; + float dG = a.ScG - b.ScG; + float dB = a.ScB - b.ScB; + + return (dR * dR + dG * dG + dB * dB) / 3.0f; + } } } diff --git a/GBCLV3/ViewModels/ForgeInstallViewModel.cs b/GBCLV3/ViewModels/ForgeInstallViewModel.cs index 37d9e76..8a7e4ad 100644 --- a/GBCLV3/ViewModels/ForgeInstallViewModel.cs +++ b/GBCLV3/ViewModels/ForgeInstallViewModel.cs @@ -77,9 +77,7 @@ public async void InstallSelectedForge(Forge forge) } Status = ForgeInstallStatus.DownloadingInstaller; - bool isAutoInstall = IsAutoInsatllSupported(); - - var download = _forgeInstallService.GetDownload(forge, isAutoInstall); + var download = _forgeInstallService.GetDownload(forge); if (!await StartDownloadAsync(DownloadType.InstallForge, download)) { @@ -90,10 +88,17 @@ public async void InstallSelectedForge(Forge forge) return; } - if (!isAutoInstall) Status = ForgeInstallStatus.ManualInstalling; + Version version = null; - var version = isAutoInstall ? _forgeInstallService.AutoInstall(forge) - : await _forgeInstallService.ManualInstall(forge); + if (forge.IsAutoInstall) + { + version = _forgeInstallService.AutoInstall(forge); + } + else + { + Status = ForgeInstallStatus.ManualInstalling; + version = await _forgeInstallService.ManualInstall(forge); + } if (version == null) { @@ -127,17 +132,6 @@ public async void InstallSelectedForge(Forge forge) #region Private Methods - // Auto forge install only support 1.12.2 and earlier versions - private bool IsAutoInsatllSupported() - { - string[] versionCode = GameVersion.Split('.'); - if (versionCode.Length >= 2 && int.TryParse(versionCode[1], out int midCode)) - { - return midCode <= 12; - } - return false; - } - private async Task StartDownloadAsync(DownloadType type, IEnumerable items) { using (var downloadService = new DownloadService(items)) diff --git a/GBCLV3/ViewModels/Pages/LaunchViewModel.cs b/GBCLV3/ViewModels/Pages/LaunchViewModel.cs index 0f7367a..d46fe0f 100644 --- a/GBCLV3/ViewModels/Pages/LaunchViewModel.cs +++ b/GBCLV3/ViewModels/Pages/LaunchViewModel.cs @@ -44,6 +44,7 @@ public LaunchViewModel( IEventAggregator eventAggregator, ConfigService configService, + ThemeService themeService, VersionService versionService, LibraryService libraryService, AssetService assetService, @@ -117,13 +118,15 @@ public LaunchViewModel( _errorReportVM = errorReportVM; _statusVM.Closed += (sender, e) => OnLaunchCompleted(); + + ThemeService = themeService; } #endregion #region Bindings - public bool IsBackgroundIconVisible => !_config.UseBackgroundImage; + public ThemeService ThemeService { get; private set; } public BindableCollection Versions { get; private set; } @@ -268,11 +271,10 @@ public async void Launch() void UpdateLogDisplay(string logMessage) => _statusVM.GameOutputLog = logMessage; _launchService.LogReceived += UpdateLogDisplay; - var result = await _launchService.LaunchGameAsync(proile, launchVersion); - - if (!result.IsSuccessful) + if (!await _launchService.LaunchGameAsync(proile, launchVersion)) { _statusVM.Status = LaunchStatus.Failed; + _launchService.LogReceived -= UpdateLogDisplay; return; } @@ -359,7 +361,6 @@ private void OnGameExited(int exitCode) protected override void OnViewLoaded() { if (_statusVM.Status == LaunchStatus.Failed) CanLaunch = true; - NotifyOfPropertyChange(nameof(IsBackgroundIconVisible)); } #endregion diff --git a/GBCLV3/Views/DownloadView.xaml b/GBCLV3/Views/DownloadView.xaml index b6c59ab..76c93e2 100644 --- a/GBCLV3/Views/DownloadView.xaml +++ b/GBCLV3/Views/DownloadView.xaml @@ -7,7 +7,7 @@ xmlns:adonisUI="clr-namespace:AdonisUI;assembly=AdonisUI" xmlns:adonisExtensions="clr-namespace:AdonisUI.Extensions;assembly=AdonisUI" mc:Ignorable="d" d:DesignWidth="540" - Background="#80FFFFFF"> + Background="{DynamicResource LightTranslucentBrush}"> diff --git a/GBCLV3/Views/ForgeInstallView.xaml b/GBCLV3/Views/ForgeInstallView.xaml index 257d44b..a091a45 100644 --- a/GBCLV3/Views/ForgeInstallView.xaml +++ b/GBCLV3/Views/ForgeInstallView.xaml @@ -15,7 +15,7 @@ diff --git a/GBCLV3/Views/GameInstallView.xaml b/GBCLV3/Views/GameInstallView.xaml index 111a6fb..fda6414 100644 --- a/GBCLV3/Views/GameInstallView.xaml +++ b/GBCLV3/Views/GameInstallView.xaml @@ -15,7 +15,7 @@ diff --git a/GBCLV3/Views/LaunchStatusView.xaml b/GBCLV3/Views/LaunchStatusView.xaml index f081cfc..4a22965 100644 --- a/GBCLV3/Views/LaunchStatusView.xaml +++ b/GBCLV3/Views/LaunchStatusView.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="https://github.com/canton7/Stylet" xmlns:adonisUI="clr-namespace:AdonisUI;assembly=AdonisUI" - Background="#80FFFFFF" + Background="{DynamicResource LightTranslucentBrush}" Visibility="Hidden" Focusable="False"> diff --git a/GBCLV3/Views/ModView.xaml b/GBCLV3/Views/ModView.xaml index e4df590..b9e5cca 100644 --- a/GBCLV3/Views/ModView.xaml +++ b/GBCLV3/Views/ModView.xaml @@ -14,6 +14,7 @@ + diff --git a/GBCLV3/Views/Pages/AboutView.xaml b/GBCLV3/Views/Pages/AboutView.xaml index a81c4b2..0998c03 100644 --- a/GBCLV3/Views/Pages/AboutView.xaml +++ b/GBCLV3/Views/Pages/AboutView.xaml @@ -41,7 +41,7 @@ - + diff --git a/GBCLV3/Views/Pages/LaunchView.xaml b/GBCLV3/Views/Pages/LaunchView.xaml index 9f694d2..d0c7c13 100644 --- a/GBCLV3/Views/Pages/LaunchView.xaml +++ b/GBCLV3/Views/Pages/LaunchView.xaml @@ -24,15 +24,15 @@ + Visibility="{Binding ThemeService.BackgroundImage, Mode=OneWay, + Converter={x:Static s:BoolToVisibilityConverter.InverseInstance}}"/> @@ -40,7 +40,7 @@