diff --git a/Minecraft.Client/Assets/UI/HelpOptions.rcss b/Minecraft.Client/Assets/UI/HelpOptions.rcss index ed66cefe..c0c606b9 100644 --- a/Minecraft.Client/Assets/UI/HelpOptions.rcss +++ b/Minecraft.Client/Assets/UI/HelpOptions.rcss @@ -38,11 +38,19 @@ button line-height: 60dp; cursor: pointer; background: transparent; - decorator: image(images/lce/Button/MainMenuButton_Norm.png); + decorator: image(mainButton); } button:hover { color: #ffff00; - decorator: image(images/lce/Button/MainMenuButton_Over.png); + decorator: image(mainButton_Hover); } + +@spritesheet mainButton +{ + src: "Assets/UI/images/lce/button/main-sheet.png"; + + mainButton: 0px 0px 200px 20px; + mainButton_Hover: 0px 20px 200px 20px; +} \ No newline at end of file diff --git a/Minecraft.Client/Assets/UI/LoadCreateJoinMenu.rcss b/Minecraft.Client/Assets/UI/LoadCreateJoinMenu.rcss index 1188aab8..69876398 100644 --- a/Minecraft.Client/Assets/UI/LoadCreateJoinMenu.rcss +++ b/Minecraft.Client/Assets/UI/LoadCreateJoinMenu.rcss @@ -60,37 +60,37 @@ button.tab.selected button.tab_left { flex: 2; - decorator: image(images/lce/LoadCreateJoinMenu/tab_left.png); + decorator: image(tabLeft); } button.tab_left:hover, button.tab_left.selected { - decorator: image(images/lce/LoadCreateJoinMenu/tab_left_havon.png); + decorator: image(tabLeft_Havon); } button.tab_medium { flex: 2; - decorator: image(images/lce/LoadCreateJoinMenu/tab_medium.png); + decorator: image(tabMiddle); } button.tab_medium:hover, button.tab_medium.selected { - decorator: image(images/lce/LoadCreateJoinMenu/tab_medium_havon.png); + decorator: image(tabMiddle_Havon); } button.tab_right { flex: 2; - decorator: image(images/lce/LoadCreateJoinMenu/tab_right.png); + decorator: image(tabRight); } button.tab_right:hover, button.tab_right.selected { - decorator: image(images/lce/LoadCreateJoinMenu/tab_right_havon.png); + decorator: image(tabRight_Havon); } div#panel_container @@ -98,7 +98,7 @@ div#panel_container width: 100%; height: 100%; flex-grow: 1; - decorator: image(images/lce/LoadCreateJoinMenu/gui_load.png); + decorator: image(background); overflow: hidden; } @@ -128,23 +128,23 @@ scrollbarvertical scrollbarvertical sliderarrowdec { position: fixed; - width: 48dp; + width: 39dp; height: 33dp; right: 100dp; bottom: -40dp; cursor: pointer; - decorator: image(images/lce/scrollUp.png); + decorator: image(scrollUp); } scrollbarvertical sliderarrowinc { position: fixed; - width: 48dp; + width: 39dp; height: 33dp; right: 58dp; bottom: -40dp; cursor: pointer; - decorator: image(images/lce/scrollDown.png); + decorator: image(scrollDown); } div.list_item @@ -177,14 +177,14 @@ div.list_item button background: transparent; border-width: 0px; cursor: pointer; - decorator: image(images/lce/button/ListButton_Norm.png); + decorator: image(listButton); } div.list_item button:hover, div.list_item button.selected { color: #ffff00; - decorator: image(images/lce/button/ListButton_Over.png); + decorator: image(listButton_Hover); } div.list_item button img.thumb @@ -221,3 +221,39 @@ div.size_bar background: rgba(255, 255, 255, 0.2); display: none; } + +@spritesheet background +{ + src: "Assets/UI/images/lce/LoadCreateJoinMenu/background-sheet.png"; + + background: 0px 0px 1860px 1420px; + background_None: 1860px 0px 1860px 1420px; +} + +@spritesheet tab +{ + src: "Assets/UI/images/lce/LoadCreateJoinMenu/tab-sheet.png"; + + tabLeft: 0px 0px 622px 176px; + tabLeft_Havon: 0px 176px 622px 176px; + tabMiddle: 622px 0px 622px 176px; + tabMiddle_Havon: 622px 176px 622px 176px; + tabRight: 1244px 0px 622px 176px; + tabRight_Havon: 1244px 176px 622px 176px; +} + +@spritesheet list +{ + src: "Assets/UI/images/lce/button/list-sheet.png"; + + listButton: 0px 0px 200px 30px; + listButton_Hover: 0px 30px 200px 30px; +} + +@spritesheet scroll +{ + src: "Assets/UI/images/lce/scroll-sheet.png"; + + scrollUp: 0px 0px 13px 11px; + scrollDown: 13px 0px 13px 11px; +} \ No newline at end of file diff --git a/Minecraft.Client/Assets/UI/MessageBox.rcss b/Minecraft.Client/Assets/UI/MessageBox.rcss index 6f50f931..e048172a 100644 --- a/Minecraft.Client/Assets/UI/MessageBox.rcss +++ b/Minecraft.Client/Assets/UI/MessageBox.rcss @@ -66,16 +66,24 @@ button line-height: 60dp; cursor: pointer; background: transparent; - decorator: image(images/lce/Button/MainMenuButton_Norm.png); + decorator: image(mainButton); } button:hover { color: #ffff00; - decorator: image(images/lce/Button/MainMenuButton_Over.png); + decorator: image(mainButton_Hover); } button:last-child { margin-bottom: 0; } + +@spritesheet mainButton +{ + src: "Assets/UI/images/lce/button/main-sheet.png"; + + mainButton: 0px 0px 200px 20px; + mainButton_Hover: 0px 20px 200px 20px; +} \ No newline at end of file diff --git a/Minecraft.Client/Assets/UI/PauseMenu.rcss b/Minecraft.Client/Assets/UI/PauseMenu.rcss index da9f85bb..42885db5 100644 --- a/Minecraft.Client/Assets/UI/PauseMenu.rcss +++ b/Minecraft.Client/Assets/UI/PauseMenu.rcss @@ -38,115 +38,19 @@ button line-height: 60dp; cursor: pointer; background: transparent; - decorator: image(images/lce/Button/MainMenuButton_Norm.png); + decorator: image(mainButton); } button:hover { color: #ffff00; - decorator: image(images/lce/Button/MainMenuButton_Over.png); + decorator: image(mainButton_Hover); } -div#exit_dialog +@spritesheet mainButton { - display: none; - width: 100%; - margin-top: 16dp; - text-align: left; - padding: 24dp 32dp; - decorator: image(images/lce/frame_MessageBox_background.png); -} + src: "Assets/UI/images/lce/button/main-sheet.png"; -p#exit_text -{ - font-effect: none; - color: #333333; - margin-bottom: 23dp; -} - -div#exit_buttons -{ - width: 100%; - display: flex; - flex-direction: column; - align-items: center; -} - -button#exit_cancel, -button#exit_save, -button#exit_nosave -{ - display: block; - width: 600dp; - height: 60dp; - margin-bottom: 7.5dp; - text-align: center; - line-height: 60dp; - cursor: pointer; - background: transparent; - decorator: image(images/lce/Button/MainMenuButton_Norm.png); -} - -button#exit_cancel:hover, -button#exit_save:hover, -button#exit_nosave:hover -{ - color: #ffff00; - decorator: image(images/lce/Button/MainMenuButton_Over.png); -} - -button#exit_nosave -{ - margin-bottom: 0; -} - -div#save_dialog -{ - display: none; - width: 100%; - margin-top: 16dp; - text-align: left; - padding: 24dp 32dp; - decorator: image(images/LCE/frame_MessageBox_background.png); -} - -p#save_text -{ - font-effect: none; - color: #333333; - margin-bottom: 23dp; -} - -div#save_buttons -{ - width: 100%; - display: flex; - flex-direction: column; - align-items: center; -} - -button#save_cancel, -button#save_confirm -{ - display: block; - width: 600dp; - height: 60dp; - margin-bottom: 7.5dp; - text-align: center; - line-height: 60dp; - cursor: pointer; - background: transparent; - decorator: image(images/lce/Button/MainMenuButton_Norm.png); -} - -button#save_cancel:hover, -button#save_confirm:hover -{ - color: #ffff00; - decorator: image(images/lce/Button/MainMenuButton_Over.png); -} - -button#save_confirm -{ - margin-bottom: 0; -} + mainButton: 0px 0px 200px 20px; + mainButton_Hover: 0px 20px 200px 20px; +} \ No newline at end of file diff --git a/Minecraft.Client/Assets/UI/PauseMenu.rml b/Minecraft.Client/Assets/UI/PauseMenu.rml index 8957e66b..f67c5795 100644 --- a/Minecraft.Client/Assets/UI/PauseMenu.rml +++ b/Minecraft.Client/Assets/UI/PauseMenu.rml @@ -11,21 +11,6 @@ -
-

[IDS_CONFIRM_EXIT_GAME]

-
- - - -
-
-
-

[IDS_CONFIRM_SAVE_GAME]

-
- - -
-
diff --git a/Minecraft.Client/Assets/UI/SettingsAudioMenu.rcss b/Minecraft.Client/Assets/UI/SettingsAudioMenu.rcss index 809ae463..6c47ba92 100644 --- a/Minecraft.Client/Assets/UI/SettingsAudioMenu.rcss +++ b/Minecraft.Client/Assets/UI/SettingsAudioMenu.rcss @@ -57,13 +57,13 @@ div#controls display: block; width: 36dp; height: 36dp; - decorator: image(images/lce/Tickbox_Background.png); + decorator: image(tickBox); position: relative; } .toggle_row:hover .toggle_switch { - decorator: image(images/lce/Tickbox_Over.png); + decorator: image(tickBox_Hover); } .toggle_row:hover .toggle_label @@ -75,9 +75,9 @@ div#controls .tick_mark { display: block; - width: 42dp; + width: 36dp; height: 36dp; - decorator: image(images/lce/Tick.png); + decorator: image(tick); } .toggle_row:not(.checked) .tick_mark @@ -116,13 +116,13 @@ div#controls text-align: center; box-sizing: border-box; border: 3dp transparent; - decorator: image(images/lce/Slider_Background.png); + decorator: image(sliderBackground); } .slider_container:hover { border-color: #ffff00; - decorator: image(images/lce/Slider_BackgroundH.png); + decorator: image(sliderBackground_Hover); } .slider_label @@ -158,3 +158,20 @@ div#controls cursor: resize; transform: translateX(-50%); } + +@spritesheet tickbox +{ + src: "Assets/UI/images/lce/tickBox-sheet.png"; + + tickBox: 0px 0px 12px 12px; + tickBox_Hover: 12px 0px 12px 12px; + tick: 24px 0px 12px 12px; +} + +@spritesheet sliderBackground +{ + src: "Assets/UI/images/lce/sliderBackground-sheet.png"; + + sliderBackground: 0px 0px 300px 16px; + sliderBackground_Hover: 0px 16px 300px 16px; +} \ No newline at end of file diff --git a/Minecraft.Client/Assets/UI/SettingsControlMenu.rcss b/Minecraft.Client/Assets/UI/SettingsControlMenu.rcss index 4cd20f36..5040db16 100644 --- a/Minecraft.Client/Assets/UI/SettingsControlMenu.rcss +++ b/Minecraft.Client/Assets/UI/SettingsControlMenu.rcss @@ -57,13 +57,13 @@ div#controls text-align: center; box-sizing: border-box; border: 3dp transparent; - decorator: image(images/lce/Slider_Background.png); + decorator: image(sliderBackground); } .slider_container:hover { border-color: #ffff00; - decorator: image(images/lce/Slider_BackgroundH.png); + decorator: image(sliderBackground_Hover); } .slider_label @@ -98,3 +98,11 @@ div#controls cursor: resize; transform: translateX(-50%); } + +@spritesheet sliderBackground +{ + src: "Assets/UI/images/lce/sliderBackground-sheet.png"; + + sliderBackground: 0px 0px 300px 16px; + sliderBackground_Hover: 0px 16px 300px 16px; +} \ No newline at end of file diff --git a/Minecraft.Client/Assets/UI/SettingsMenu.rcss b/Minecraft.Client/Assets/UI/SettingsMenu.rcss index 29a6f2b1..053db4fe 100644 --- a/Minecraft.Client/Assets/UI/SettingsMenu.rcss +++ b/Minecraft.Client/Assets/UI/SettingsMenu.rcss @@ -38,11 +38,19 @@ button line-height: 60dp; cursor: pointer; background: transparent; - decorator: image(images/lce/Button/MainMenuButton_Norm.png); + decorator: image(mainButton); } button:hover { color: #ffff00; - decorator: image(images/lce/Button/MainMenuButton_Over.png); + decorator: image(mainButton_Hover); +} + +@spritesheet mainButton +{ + src: "Assets/UI/images/lce/button/main-sheet.png"; + + mainButton: 0px 0px 200px 20px; + mainButton_Hover: 0px 20px 200px 20px; } \ No newline at end of file diff --git a/Minecraft.Client/Assets/UI/SettingsUIMenu.rcss b/Minecraft.Client/Assets/UI/SettingsUIMenu.rcss index a6e8a01d..5a607f7f 100644 --- a/Minecraft.Client/Assets/UI/SettingsUIMenu.rcss +++ b/Minecraft.Client/Assets/UI/SettingsUIMenu.rcss @@ -57,13 +57,13 @@ div#controls display: block; width: 36dp; height: 36dp; - decorator: image(images/lce/Tickbox_Background.png); + decorator: image(tickBox); position: relative; } .toggle_row:hover .toggle_switch { - decorator: image(images/lce/Tickbox_Over.png); + decorator: image(tickBox_Hover); } .toggle_row:hover .toggle_label @@ -75,9 +75,9 @@ div#controls .tick_mark { display: block; - width: 42dp; + width: 36dp; height: 36dp; - decorator: image(images/lce/Tick.png); + decorator: image(tick); } .toggle_row:not(.checked) .tick_mark @@ -115,13 +115,13 @@ div#controls text-align: center; box-sizing: border-box; border: 3dp transparent; - decorator: image(images/lce/Slider_Background.png); + decorator: image(sliderBackground); } .slider_container:hover { border-color: #ffff00; - decorator: image(images/lce/Slider_BackgroundH.png); + decorator: image(sliderBackground_Hover); } .slider_label @@ -157,3 +157,20 @@ div#controls cursor: resize; transform: translateX(-50%); } + +@spritesheet tickbox +{ + src: "Assets/UI/images/lce/tickBox-sheet.png"; + + tickBox: 0px 0px 12px 12px; + tickBox_Hover: 12px 0px 12px 12px; + tick: 24px 0px 12px 12px; +} + +@spritesheet sliderBackground +{ + src: "Assets/UI/images/lce/sliderBackground-sheet.png"; + + sliderBackground: 0px 0px 300px 16px; + sliderBackground_Hover: 0px 16px 300px 16px; +} \ No newline at end of file diff --git a/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/background-sheet.png b/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/background-sheet.png new file mode 100644 index 00000000..02ffe89c Binary files /dev/null and b/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/background-sheet.png differ diff --git a/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/gui_load.png b/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/gui_load.png deleted file mode 100644 index 14ae2511..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/gui_load.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/gui_none.png b/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/gui_none.png deleted file mode 100644 index 06302ed8..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/gui_none.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/tab-sheet.png b/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/tab-sheet.png new file mode 100644 index 00000000..b10f6566 Binary files /dev/null and b/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/tab-sheet.png differ diff --git a/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/tab_left.png b/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/tab_left.png deleted file mode 100644 index 1c332565..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/tab_left.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/tab_left_havon.png b/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/tab_left_havon.png deleted file mode 100644 index 0dbce86a..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/tab_left_havon.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/tab_medium.png b/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/tab_medium.png deleted file mode 100644 index 002ae7a1..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/tab_medium.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/tab_medium_havon.png b/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/tab_medium_havon.png deleted file mode 100644 index 9f7e6b31..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/tab_medium_havon.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/tab_right.png b/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/tab_right.png deleted file mode 100644 index 3f659601..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/tab_right.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/tab_right_havon.png b/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/tab_right_havon.png deleted file mode 100644 index c27e7272..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/LoadCreateJoinMenu/tab_right_havon.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/Slider_Background.png b/Minecraft.Client/Assets/UI/images/lce/Slider_Background.png deleted file mode 100644 index 39687608..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/Slider_Background.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/Slider_BackgroundH.png b/Minecraft.Client/Assets/UI/images/lce/Slider_BackgroundH.png deleted file mode 100644 index 577cca9b..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/Slider_BackgroundH.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/Tick.png b/Minecraft.Client/Assets/UI/images/lce/Tick.png deleted file mode 100644 index 492ef391..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/Tick.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/Tickbox_Background.png b/Minecraft.Client/Assets/UI/images/lce/Tickbox_Background.png deleted file mode 100644 index 26961108..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/Tickbox_Background.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/Tickbox_Over.png b/Minecraft.Client/Assets/UI/images/lce/Tickbox_Over.png deleted file mode 100644 index 1f2517ac..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/Tickbox_Over.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/button/LayoutButton_Norm.png b/Minecraft.Client/Assets/UI/images/lce/button/LayoutButton_Norm.png deleted file mode 100644 index b1902f13..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/button/LayoutButton_Norm.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/button/LayoutButton_Over.png b/Minecraft.Client/Assets/UI/images/lce/button/LayoutButton_Over.png deleted file mode 100644 index 727bc28d..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/button/LayoutButton_Over.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/button/LeaderboardButton_Norm.png b/Minecraft.Client/Assets/UI/images/lce/button/LeaderboardButton_Norm.png deleted file mode 100644 index 7a71d62a..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/button/LeaderboardButton_Norm.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/button/LeaderboardButton_Over.png b/Minecraft.Client/Assets/UI/images/lce/button/LeaderboardButton_Over.png deleted file mode 100644 index 30d4b7e4..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/button/LeaderboardButton_Over.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/button/ListButton_Norm.png b/Minecraft.Client/Assets/UI/images/lce/button/ListButton_Norm.png deleted file mode 100644 index 3f44adb9..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/button/ListButton_Norm.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/button/ListButton_Over.png b/Minecraft.Client/Assets/UI/images/lce/button/ListButton_Over.png deleted file mode 100644 index 54240a14..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/button/ListButton_Over.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/button/MainMenuButton_Norm.png b/Minecraft.Client/Assets/UI/images/lce/button/MainMenuButton_Norm.png deleted file mode 100644 index d61e2048..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/button/MainMenuButton_Norm.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/button/MainMenuButton_Over.png b/Minecraft.Client/Assets/UI/images/lce/button/MainMenuButton_Over.png deleted file mode 100644 index 6b6fc595..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/button/MainMenuButton_Over.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/button/layout-sheet.png b/Minecraft.Client/Assets/UI/images/lce/button/layout-sheet.png new file mode 100644 index 00000000..0b60ffff Binary files /dev/null and b/Minecraft.Client/Assets/UI/images/lce/button/layout-sheet.png differ diff --git a/Minecraft.Client/Assets/UI/images/lce/button/leaderboard-sheet.png b/Minecraft.Client/Assets/UI/images/lce/button/leaderboard-sheet.png new file mode 100644 index 00000000..0069dde5 Binary files /dev/null and b/Minecraft.Client/Assets/UI/images/lce/button/leaderboard-sheet.png differ diff --git a/Minecraft.Client/Assets/UI/images/lce/button/list-sheet.png b/Minecraft.Client/Assets/UI/images/lce/button/list-sheet.png new file mode 100644 index 00000000..7e922c16 Binary files /dev/null and b/Minecraft.Client/Assets/UI/images/lce/button/list-sheet.png differ diff --git a/Minecraft.Client/Assets/UI/images/lce/button/main-sheet.png b/Minecraft.Client/Assets/UI/images/lce/button/main-sheet.png new file mode 100644 index 00000000..023aaf4f Binary files /dev/null and b/Minecraft.Client/Assets/UI/images/lce/button/main-sheet.png differ diff --git a/Minecraft.Client/Assets/UI/images/lce/frame_MessageBox_background.png b/Minecraft.Client/Assets/UI/images/lce/frame_MessageBox_background.png index f7553715..e9d28060 100644 Binary files a/Minecraft.Client/Assets/UI/images/lce/frame_MessageBox_background.png and b/Minecraft.Client/Assets/UI/images/lce/frame_MessageBox_background.png differ diff --git a/Minecraft.Client/Assets/UI/images/lce/scroll-sheet.png b/Minecraft.Client/Assets/UI/images/lce/scroll-sheet.png new file mode 100644 index 00000000..936fd255 Binary files /dev/null and b/Minecraft.Client/Assets/UI/images/lce/scroll-sheet.png differ diff --git a/Minecraft.Client/Assets/UI/images/lce/scrollDown.png b/Minecraft.Client/Assets/UI/images/lce/scrollDown.png deleted file mode 100644 index 9ac505f3..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/scrollDown.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/scrollLeft.png b/Minecraft.Client/Assets/UI/images/lce/scrollLeft.png deleted file mode 100644 index 6c547519..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/scrollLeft.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/scrollRight.png b/Minecraft.Client/Assets/UI/images/lce/scrollRight.png deleted file mode 100644 index 65f18f34..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/scrollRight.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/scrollUp.png b/Minecraft.Client/Assets/UI/images/lce/scrollUp.png deleted file mode 100644 index a16e75a3..00000000 Binary files a/Minecraft.Client/Assets/UI/images/lce/scrollUp.png and /dev/null differ diff --git a/Minecraft.Client/Assets/UI/images/lce/sliderBackground-sheet.png b/Minecraft.Client/Assets/UI/images/lce/sliderBackground-sheet.png new file mode 100644 index 00000000..f1be4133 Binary files /dev/null and b/Minecraft.Client/Assets/UI/images/lce/sliderBackground-sheet.png differ diff --git a/Minecraft.Client/Assets/UI/images/lce/tickBox-sheet.png b/Minecraft.Client/Assets/UI/images/lce/tickBox-sheet.png new file mode 100644 index 00000000..169ba195 Binary files /dev/null and b/Minecraft.Client/Assets/UI/images/lce/tickBox-sheet.png differ diff --git a/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp b/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp index 59a2531d..a6a77e1c 100644 --- a/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp +++ b/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp @@ -876,7 +876,7 @@ void CPlatformNetworkManagerStub::SearchForGames() friendsSessions[0].push_back(info); } - if (std::FILE* file = std::fopen("servers.db", "rb")) { + if (std::FILE* file = std::fopen("Data\\servers.db", "rb")) { char magic[4] = {}; if (std::fread(magic, 1, 4, file) == 4 && memcmp(magic, "MCSV", 4) == 0) { diff --git a/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp b/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp index 9d45f50d..2d8da957 100644 --- a/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp @@ -849,7 +849,7 @@ void UIScene_JoinMenu::UpdateServerInFile(const wstring& newIP, const wstring& n struct ServerEntry { std::string ip; uint16_t port; std::string name; }; std::vector entries; - FILE* file = fopen("servers.db", "rb"); + FILE* file = fopen("Data\\servers.db", "rb"); if (file) { char magic[4] = {}; @@ -888,7 +888,7 @@ void UIScene_JoinMenu::UpdateServerInFile(const wstring& newIP, const wstring& n entries[idx].name = std::string(narrowNewName); } - file = fopen("servers.db", "wb"); + file = fopen("Data\\servers.db", "wb"); if (file) { fwrite("MCSV", 1, 4, file); @@ -916,7 +916,7 @@ void UIScene_JoinMenu::RemoveServerFromFile() struct ServerEntry { std::string ip; uint16_t port; std::string name; }; std::vector entries; - FILE* file = fopen("servers.db", "rb"); + FILE* file = fopen("Data\\servers.db", "rb"); if (file) { char magic[4] = {}; @@ -953,7 +953,7 @@ void UIScene_JoinMenu::RemoveServerFromFile() entries.erase(entries.begin() + idx); } - file = fopen("servers.db", "wb"); + file = fopen("Data\\servers.db", "wb"); if (file) { fwrite("MCSV", 1, 4, file); diff --git a/Minecraft.Client/Common/UI/UIScene_LoadCreateJoinMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LoadCreateJoinMenu.cpp index a326c68d..9c339e0a 100644 --- a/Minecraft.Client/Common/UI/UIScene_LoadCreateJoinMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_LoadCreateJoinMenu.cpp @@ -1673,7 +1673,7 @@ void UIScene_LoadCreateJoinMenu::CheckAndJoinGame(int gameIndex) #ifdef _WINDOWS64 { int serverDbCount = 0; - FILE* dbFile = fopen("servers.db", "rb"); + FILE* dbFile = fopen("Data\\servers.db", "rb"); if (dbFile) { char magic[4] = {}; @@ -1867,7 +1867,7 @@ void UIScene_LoadCreateJoinMenu::BeginAddServer() void UIScene_LoadCreateJoinMenu::AppendServerToFile(const wstring& ip, const wstring& port, const wstring& name) { - FILE* f = fopen("servers.db", "ab"); + FILE* f = fopen("Data\\servers.db", "ab"); if (!f) return; uint32_t version = 1; diff --git a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp index 4976b5a1..e07658e9 100644 --- a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp +++ b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp @@ -1190,11 +1190,11 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance, MultiByteToWideChar(CP_ACP, 0, g_Win64Username, -1, g_Win64UsernameW, 17); // convert servers.txt to servers.db - if (GetFileAttributesA("servers.txt") != INVALID_FILE_ATTRIBUTES && - GetFileAttributesA("servers.db") == INVALID_FILE_ATTRIBUTES) + if (GetFileAttributesA("Data\\servers.txt") != INVALID_FILE_ATTRIBUTES && + GetFileAttributesA("Data\\servers.db") == INVALID_FILE_ATTRIBUTES) { FILE* txtFile = nullptr; - if (fopen_s(&txtFile, "servers.txt", "r") == 0 && txtFile) + if (fopen_s(&txtFile, "Data\\servers.txt", "r") == 0 && txtFile) { struct MigEntry { std::string ip; uint16_t port; std::string name; }; std::vector migEntries; @@ -1232,7 +1232,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance, if (!migEntries.empty()) { FILE* dbFile = nullptr; - if (fopen_s(&dbFile, "servers.db", "wb") == 0 && dbFile) + if (fopen_s(&dbFile, "Data\\servers.db", "wb") == 0 && dbFile) { fwrite("MCSV", 1, 4, dbFile); uint32_t ver = 1;