From 0c31a7a943df5fa8b903eb671fd097049ba22cb4 Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Wed, 4 Mar 2026 19:40:23 -0600 Subject: [PATCH] fix: include all missing files in `Common` This resolves all non-C4J linker errors. --- Minecraft.Client/CMakeLists.txt | 480 +++++++++--------- Minecraft.Client/Common/Consoles_App.cpp | 3 +- .../Common/UI/UIControl_EnchantmentButton.cpp | 2 + .../Common/UI/UIScene_DLCOffersMenu.cpp | 2 +- Minecraft.Client/Linux/Stubs/winapi_stubs.h | 26 +- 5 files changed, 270 insertions(+), 243 deletions(-) diff --git a/Minecraft.Client/CMakeLists.txt b/Minecraft.Client/CMakeLists.txt index cb2b18152..24dab0d39 100644 --- a/Minecraft.Client/CMakeLists.txt +++ b/Minecraft.Client/CMakeLists.txt @@ -294,27 +294,27 @@ set(Common__Source_Files__Tutorial__Tasks source_group("Common\\Source Files\\Tutorial\\Tasks" FILES ${Common__Source_Files__Tutorial__Tasks}) set(Common__Source_Files__UI -# "Common/UI/UI.h" -# "Common/UI/UIBitmapFont.cpp" -# "Common/UI/UIBitmapFont.h" -# "Common/UI/UIController.cpp" -# "Common/UI/UIController.h" -# "Common/UI/UIFontData.cpp" -# "Common/UI/UIFontData.h" -# "Common/UI/UIGroup.cpp" -# "Common/UI/UIGroup.h" -# "Common/UI/UILayer.cpp" -# "Common/UI/UILayer.h" -# "Common/UI/UIScene.cpp" -# "Common/UI/UIScene.h" -# "Common/UI/UITTFFont.cpp" -# "Common/UI/UITTFFont.h" + "Common/UI/UI.h" + "Common/UI/UIBitmapFont.cpp" + "Common/UI/UIBitmapFont.h" + "Common/UI/UIController.cpp" + "Common/UI/UIController.h" + "Common/UI/UIFontData.cpp" + "Common/UI/UIFontData.h" + "Common/UI/UIGroup.cpp" + "Common/UI/UIGroup.h" + "Common/UI/UILayer.cpp" + "Common/UI/UILayer.h" + "Common/UI/UIScene.cpp" + "Common/UI/UIScene.h" + "Common/UI/UITTFFont.cpp" + "Common/UI/UITTFFont.h" ) source_group("Common\\Source Files\\UI" FILES ${Common__Source_Files__UI}) set(Common__Source_Files__UI__All_Platforms -# "ArchiveFile.cpp" -# "ArchiveFile.h" + "ArchiveFile.cpp" + "ArchiveFile.h" "Common/UI/IUIController.h" "Common/UI/IUIScene_AbstractContainerMenu.cpp" "Common/UI/IUIScene_AbstractContainerMenu.h" @@ -340,224 +340,224 @@ set(Common__Source_Files__UI__All_Platforms "Common/UI/IUIScene_PauseMenu.h" "Common/UI/IUIScene_TradingMenu.cpp" "Common/UI/IUIScene_TradingMenu.h" -# "Common/UI/UIEnums.h" + "Common/UI/UIEnums.h" "Common/UI/UIStructs.h" ) source_group("Common\\Source Files\\UI\\All Platforms" FILES ${Common__Source_Files__UI__All_Platforms}) set(Common__Source_Files__UI__Components -# "Common/UI/UIComponent_Chat.cpp" -# "Common/UI/UIComponent_Chat.h" -# "Common/UI/UIComponent_DebugUIConsole.cpp" -# "Common/UI/UIComponent_DebugUIConsole.h" -# "Common/UI/UIComponent_DebugUIMarketingGuide.cpp" -# "Common/UI/UIComponent_DebugUIMarketingGuide.h" -# "Common/UI/UIComponent_Logo.cpp" -# "Common/UI/UIComponent_Logo.h" -# "Common/UI/UIComponent_MenuBackground.cpp" -# "Common/UI/UIComponent_MenuBackground.h" -# "Common/UI/UIComponent_Panorama.cpp" -# "Common/UI/UIComponent_Panorama.h" -# "Common/UI/UIComponent_PressStartToPlay.cpp" -# "Common/UI/UIComponent_PressStartToPlay.h" -# "Common/UI/UIComponent_Tooltips.cpp" -# "Common/UI/UIComponent_Tooltips.h" -# "Common/UI/UIComponent_TutorialPopup.cpp" -# "Common/UI/UIComponent_TutorialPopup.h" -# "Common/UI/UIScene_HUD.cpp" -# "Common/UI/UIScene_HUD.h" + "Common/UI/UIComponent_Chat.cpp" + "Common/UI/UIComponent_Chat.h" + "Common/UI/UIComponent_DebugUIConsole.cpp" + "Common/UI/UIComponent_DebugUIConsole.h" + "Common/UI/UIComponent_DebugUIMarketingGuide.cpp" + "Common/UI/UIComponent_DebugUIMarketingGuide.h" + "Common/UI/UIComponent_Logo.cpp" + "Common/UI/UIComponent_Logo.h" + "Common/UI/UIComponent_MenuBackground.cpp" + "Common/UI/UIComponent_MenuBackground.h" + "Common/UI/UIComponent_Panorama.cpp" + "Common/UI/UIComponent_Panorama.h" + "Common/UI/UIComponent_PressStartToPlay.cpp" + "Common/UI/UIComponent_PressStartToPlay.h" + "Common/UI/UIComponent_Tooltips.cpp" + "Common/UI/UIComponent_Tooltips.h" + "Common/UI/UIComponent_TutorialPopup.cpp" + "Common/UI/UIComponent_TutorialPopup.h" + "Common/UI/UIScene_HUD.cpp" + "Common/UI/UIScene_HUD.h" ) source_group("Common\\Source Files\\UI\\Components" FILES ${Common__Source_Files__UI__Components}) set(Common__Source_Files__UI__Controls -# "Common/UI/UIControl.cpp" -# "Common/UI/UIControl.h" -# "Common/UI/UIControl_Base.cpp" -# "Common/UI/UIControl_Base.h" -# "Common/UI/UIControl_BitmapIcon.cpp" -# "Common/UI/UIControl_BitmapIcon.h" -# "Common/UI/UIControl_Button.cpp" -# "Common/UI/UIControl_Button.h" -# "Common/UI/UIControl_ButtonList.cpp" -# "Common/UI/UIControl_ButtonList.h" -# "Common/UI/UIControl_CheckBox.cpp" -# "Common/UI/UIControl_CheckBox.h" -# "Common/UI/UIControl_Cursor.cpp" -# "Common/UI/UIControl_Cursor.h" -# "Common/UI/UIControl_DLCList.cpp" -# "Common/UI/UIControl_DLCList.h" -# "Common/UI/UIControl_DynamicLabel.cpp" -# "Common/UI/UIControl_DynamicLabel.h" -# "Common/UI/UIControl_EnchantmentBook.cpp" -# "Common/UI/UIControl_EnchantmentBook.h" -# "Common/UI/UIControl_EnchantmentButton.cpp" -# "Common/UI/UIControl_EnchantmentButton.h" -# "Common/UI/UIControl_HTMLLabel.cpp" -# "Common/UI/UIControl_HTMLLabel.h" -# "Common/UI/UIControl_Label.cpp" -# "Common/UI/UIControl_Label.h" -# "Common/UI/UIControl_LeaderboardList.cpp" -# "Common/UI/UIControl_LeaderboardList.h" -# "Common/UI/UIControl_MinecraftPlayer.cpp" -# "Common/UI/UIControl_MinecraftPlayer.h" -# "Common/UI/UIControl_PlayerList.cpp" -# "Common/UI/UIControl_PlayerList.h" -# "Common/UI/UIControl_PlayerSkinPreview.cpp" -# "Common/UI/UIControl_PlayerSkinPreview.h" -# "Common/UI/UIControl_Progress.cpp" -# "Common/UI/UIControl_Progress.h" -# "Common/UI/UIControl_SaveList.cpp" -# "Common/UI/UIControl_SaveList.h" -# "Common/UI/UIControl_Slider.cpp" -# "Common/UI/UIControl_Slider.h" -# "Common/UI/UIControl_SlotList.cpp" -# "Common/UI/UIControl_SlotList.h" -# "Common/UI/UIControl_SpaceIndicatorBar.cpp" -# "Common/UI/UIControl_SpaceIndicatorBar.h" -# "Common/UI/UIControl_TextInput.cpp" -# "Common/UI/UIControl_TextInput.h" -# "Common/UI/UIControl_TexturePackList.cpp" -# "Common/UI/UIControl_TexturePackList.h" + "Common/UI/UIControl.cpp" + "Common/UI/UIControl.h" + "Common/UI/UIControl_Base.cpp" + "Common/UI/UIControl_Base.h" + "Common/UI/UIControl_BitmapIcon.cpp" + "Common/UI/UIControl_BitmapIcon.h" + "Common/UI/UIControl_Button.cpp" + "Common/UI/UIControl_Button.h" + "Common/UI/UIControl_ButtonList.cpp" + "Common/UI/UIControl_ButtonList.h" + "Common/UI/UIControl_CheckBox.cpp" + "Common/UI/UIControl_CheckBox.h" + "Common/UI/UIControl_Cursor.cpp" + "Common/UI/UIControl_Cursor.h" + "Common/UI/UIControl_DLCList.cpp" + "Common/UI/UIControl_DLCList.h" + "Common/UI/UIControl_DynamicLabel.cpp" + "Common/UI/UIControl_DynamicLabel.h" + "Common/UI/UIControl_EnchantmentBook.cpp" + "Common/UI/UIControl_EnchantmentBook.h" + "Common/UI/UIControl_EnchantmentButton.cpp" + "Common/UI/UIControl_EnchantmentButton.h" + "Common/UI/UIControl_HTMLLabel.cpp" + "Common/UI/UIControl_HTMLLabel.h" + "Common/UI/UIControl_Label.cpp" + "Common/UI/UIControl_Label.h" + "Common/UI/UIControl_LeaderboardList.cpp" + "Common/UI/UIControl_LeaderboardList.h" + "Common/UI/UIControl_MinecraftPlayer.cpp" + "Common/UI/UIControl_MinecraftPlayer.h" + "Common/UI/UIControl_PlayerList.cpp" + "Common/UI/UIControl_PlayerList.h" + "Common/UI/UIControl_PlayerSkinPreview.cpp" + "Common/UI/UIControl_PlayerSkinPreview.h" + "Common/UI/UIControl_Progress.cpp" + "Common/UI/UIControl_Progress.h" + "Common/UI/UIControl_SaveList.cpp" + "Common/UI/UIControl_SaveList.h" + "Common/UI/UIControl_Slider.cpp" + "Common/UI/UIControl_Slider.h" + "Common/UI/UIControl_SlotList.cpp" + "Common/UI/UIControl_SlotList.h" + "Common/UI/UIControl_SpaceIndicatorBar.cpp" + "Common/UI/UIControl_SpaceIndicatorBar.h" + "Common/UI/UIControl_TextInput.cpp" + "Common/UI/UIControl_TextInput.h" + "Common/UI/UIControl_TexturePackList.cpp" + "Common/UI/UIControl_TexturePackList.h" # "Common/UI/UIControl_Touch.cpp" # "Common/UI/UIControl_Touch.h" ) source_group("Common\\Source Files\\UI\\Controls" FILES ${Common__Source_Files__UI__Controls}) set(Common__Source_Files__UI__Scenes -# "Common/UI/UIScene_ConnectingProgress.cpp" -# "Common/UI/UIScene_ConnectingProgress.h" -# "Common/UI/UIScene_FullscreenProgress.cpp" -# "Common/UI/UIScene_FullscreenProgress.h" -# "Common/UI/UIScene_Keyboard.cpp" -# "Common/UI/UIScene_Keyboard.h" -# "Common/UI/UIScene_MessageBox.cpp" -# "Common/UI/UIScene_MessageBox.h" -# "Common/UI/UIScene_QuadrantSignin.cpp" -# "Common/UI/UIScene_QuadrantSignin.h" -# "Common/UI/UIScene_Timer.cpp" -# "Common/UI/UIScene_Timer.h" + "Common/UI/UIScene_ConnectingProgress.cpp" + "Common/UI/UIScene_ConnectingProgress.h" + "Common/UI/UIScene_FullscreenProgress.cpp" + "Common/UI/UIScene_FullscreenProgress.h" + "Common/UI/UIScene_Keyboard.cpp" + "Common/UI/UIScene_Keyboard.h" + "Common/UI/UIScene_MessageBox.cpp" + "Common/UI/UIScene_MessageBox.h" + "Common/UI/UIScene_QuadrantSignin.cpp" + "Common/UI/UIScene_QuadrantSignin.h" + "Common/UI/UIScene_Timer.cpp" + "Common/UI/UIScene_Timer.h" ) source_group("Common\\Source Files\\UI\\Scenes" FILES ${Common__Source_Files__UI__Scenes}) set(Common__Source_Files__UI__Scenes__Debug -# "Common/UI/UIScene_DebugCreateSchematic.cpp" -# "Common/UI/UIScene_DebugCreateSchematic.h" -# "Common/UI/UIScene_DebugOptions.cpp" -# "Common/UI/UIScene_DebugOptions.h" -# "Common/UI/UIScene_DebugOverlay.cpp" -# "Common/UI/UIScene_DebugOverlay.h" -# "Common/UI/UIScene_DebugSetCamera.cpp" -# "Common/UI/UIScene_DebugSetCamera.h" + "Common/UI/UIScene_DebugCreateSchematic.cpp" + "Common/UI/UIScene_DebugCreateSchematic.h" + "Common/UI/UIScene_DebugOptions.cpp" + "Common/UI/UIScene_DebugOptions.h" + "Common/UI/UIScene_DebugOverlay.cpp" + "Common/UI/UIScene_DebugOverlay.h" + "Common/UI/UIScene_DebugSetCamera.cpp" + "Common/UI/UIScene_DebugSetCamera.h" ) source_group("Common\\Source Files\\UI\\Scenes\\Debug" FILES ${Common__Source_Files__UI__Scenes__Debug}) set(Common__Source_Files__UI__Scenes__Frontend_Menu_screens -# "Common/UI/IUIScene_StartGame.cpp" -# "Common/UI/IUIScene_StartGame.h" -# "Common/UI/UIScene_CreateWorldMenu.cpp" -# "Common/UI/UIScene_CreateWorldMenu.h" -# "Common/UI/UIScene_DLCMainMenu.cpp" -# "Common/UI/UIScene_DLCMainMenu.h" -# "Common/UI/UIScene_DLCOffersMenu.cpp" -# "Common/UI/UIScene_DLCOffersMenu.h" -# "Common/UI/UIScene_EULA.cpp" -# "Common/UI/UIScene_EULA.h" -# "Common/UI/UIScene_Intro.cpp" -# "Common/UI/UIScene_Intro.h" -# "Common/UI/UIScene_JoinMenu.cpp" -# "Common/UI/UIScene_JoinMenu.h" -# "Common/UI/UIScene_LaunchMoreOptionsMenu.cpp" -# "Common/UI/UIScene_LaunchMoreOptionsMenu.h" -# "Common/UI/UIScene_LeaderboardsMenu.cpp" -# "Common/UI/UIScene_LeaderboardsMenu.h" -# "Common/UI/UIScene_LoadMenu.cpp" -# "Common/UI/UIScene_LoadMenu.h" -# "Common/UI/UIScene_LoadOrJoinMenu.cpp" -# "Common/UI/UIScene_LoadOrJoinMenu.h" -# "Common/UI/UIScene_MainMenu.cpp" -# "Common/UI/UIScene_MainMenu.h" -# "Common/UI/UIScene_SaveMessage.cpp" -# "Common/UI/UIScene_SaveMessage.h" -# "Common/UI/UIScene_TrialExitUpsell.cpp" -# "Common/UI/UIScene_TrialExitUpsell.h" + "Common/UI/IUIScene_StartGame.cpp" + "Common/UI/IUIScene_StartGame.h" + "Common/UI/UIScene_CreateWorldMenu.cpp" + "Common/UI/UIScene_CreateWorldMenu.h" + "Common/UI/UIScene_DLCMainMenu.cpp" + "Common/UI/UIScene_DLCMainMenu.h" + "Common/UI/UIScene_DLCOffersMenu.cpp" + "Common/UI/UIScene_DLCOffersMenu.h" + "Common/UI/UIScene_EULA.cpp" + "Common/UI/UIScene_EULA.h" + "Common/UI/UIScene_Intro.cpp" + "Common/UI/UIScene_Intro.h" + "Common/UI/UIScene_JoinMenu.cpp" + "Common/UI/UIScene_JoinMenu.h" + "Common/UI/UIScene_LaunchMoreOptionsMenu.cpp" + "Common/UI/UIScene_LaunchMoreOptionsMenu.h" + "Common/UI/UIScene_LeaderboardsMenu.cpp" + "Common/UI/UIScene_LeaderboardsMenu.h" + "Common/UI/UIScene_LoadMenu.cpp" + "Common/UI/UIScene_LoadMenu.h" + "Common/UI/UIScene_LoadOrJoinMenu.cpp" + "Common/UI/UIScene_LoadOrJoinMenu.h" + "Common/UI/UIScene_MainMenu.cpp" + "Common/UI/UIScene_MainMenu.h" + "Common/UI/UIScene_SaveMessage.cpp" + "Common/UI/UIScene_SaveMessage.h" + "Common/UI/UIScene_TrialExitUpsell.cpp" + "Common/UI/UIScene_TrialExitUpsell.h" ) source_group("Common\\Source Files\\UI\\Scenes\\Frontend Menu screens" FILES ${Common__Source_Files__UI__Scenes__Frontend_Menu_screens}) set(Common__Source_Files__UI__Scenes__Help__Options -# "Common/UI/UIScene_ControlsMenu.cpp" -# "Common/UI/UIScene_ControlsMenu.h" -# "Common/UI/UIScene_Credits.cpp" -# "Common/UI/UIScene_Credits.h" -# "Common/UI/UIScene_HelpAndOptionsMenu.cpp" -# "Common/UI/UIScene_HelpAndOptionsMenu.h" -# "Common/UI/UIScene_HowToPlay.cpp" -# "Common/UI/UIScene_HowToPlay.h" -# "Common/UI/UIScene_HowToPlayMenu.cpp" -# "Common/UI/UIScene_HowToPlayMenu.h" -# "Common/UI/UIScene_ReinstallMenu.cpp" -# "Common/UI/UIScene_ReinstallMenu.h" -# "Common/UI/UIScene_SettingsAudioMenu.cpp" -# "Common/UI/UIScene_SettingsAudioMenu.h" -# "Common/UI/UIScene_SettingsControlMenu.cpp" -# "Common/UI/UIScene_SettingsControlMenu.h" -# "Common/UI/UIScene_SettingsGraphicsMenu.cpp" -# "Common/UI/UIScene_SettingsGraphicsMenu.h" -# "Common/UI/UIScene_SettingsMenu.cpp" -# "Common/UI/UIScene_SettingsMenu.h" -# "Common/UI/UIScene_SettingsOptionsMenu.cpp" -# "Common/UI/UIScene_SettingsOptionsMenu.h" -# "Common/UI/UIScene_SettingsUIMenu.cpp" -# "Common/UI/UIScene_SettingsUIMenu.h" -# "Common/UI/UIScene_SkinSelectMenu.cpp" -# "Common/UI/UIScene_SkinSelectMenu.h" + "Common/UI/UIScene_ControlsMenu.cpp" + "Common/UI/UIScene_ControlsMenu.h" + "Common/UI/UIScene_Credits.cpp" + "Common/UI/UIScene_Credits.h" + "Common/UI/UIScene_HelpAndOptionsMenu.cpp" + "Common/UI/UIScene_HelpAndOptionsMenu.h" + "Common/UI/UIScene_HowToPlay.cpp" + "Common/UI/UIScene_HowToPlay.h" + "Common/UI/UIScene_HowToPlayMenu.cpp" + "Common/UI/UIScene_HowToPlayMenu.h" + "Common/UI/UIScene_ReinstallMenu.cpp" + "Common/UI/UIScene_ReinstallMenu.h" + "Common/UI/UIScene_SettingsAudioMenu.cpp" + "Common/UI/UIScene_SettingsAudioMenu.h" + "Common/UI/UIScene_SettingsControlMenu.cpp" + "Common/UI/UIScene_SettingsControlMenu.h" + "Common/UI/UIScene_SettingsGraphicsMenu.cpp" + "Common/UI/UIScene_SettingsGraphicsMenu.h" + "Common/UI/UIScene_SettingsMenu.cpp" + "Common/UI/UIScene_SettingsMenu.h" + "Common/UI/UIScene_SettingsOptionsMenu.cpp" + "Common/UI/UIScene_SettingsOptionsMenu.h" + "Common/UI/UIScene_SettingsUIMenu.cpp" + "Common/UI/UIScene_SettingsUIMenu.h" + "Common/UI/UIScene_SkinSelectMenu.cpp" + "Common/UI/UIScene_SkinSelectMenu.h" ) source_group("Common\\Source Files\\UI\\Scenes\\Help & Options" FILES ${Common__Source_Files__UI__Scenes__Help__Options}) set(Common__Source_Files__UI__Scenes__In-Game_Menu_Screens -# "Common/UI/UIScene_CraftingMenu.cpp" -# "Common/UI/UIScene_CraftingMenu.h" -# "Common/UI/UIScene_DeathMenu.cpp" -# "Common/UI/UIScene_DeathMenu.h" -# "Common/UI/UIScene_EndPoem.cpp" -# "Common/UI/UIScene_EndPoem.h" -# "Common/UI/UIScene_InGameHostOptionsMenu.cpp" -# "Common/UI/UIScene_InGameHostOptionsMenu.h" -# "Common/UI/UIScene_InGameInfoMenu.cpp" -# "Common/UI/UIScene_InGameInfoMenu.h" -# "Common/UI/UIScene_InGamePlayerOptionsMenu.cpp" -# "Common/UI/UIScene_InGamePlayerOptionsMenu.h" + "Common/UI/UIScene_CraftingMenu.cpp" + "Common/UI/UIScene_CraftingMenu.h" + "Common/UI/UIScene_DeathMenu.cpp" + "Common/UI/UIScene_DeathMenu.h" + "Common/UI/UIScene_EndPoem.cpp" + "Common/UI/UIScene_EndPoem.h" + "Common/UI/UIScene_InGameHostOptionsMenu.cpp" + "Common/UI/UIScene_InGameHostOptionsMenu.h" + "Common/UI/UIScene_InGameInfoMenu.cpp" + "Common/UI/UIScene_InGameInfoMenu.h" + "Common/UI/UIScene_InGamePlayerOptionsMenu.cpp" + "Common/UI/UIScene_InGamePlayerOptionsMenu.h" # "Common/UI/UIScene_InGameSaveManagementMenu.cpp" # "Common/UI/UIScene_InGameSaveManagementMenu.h" -# "Common/UI/UIScene_PauseMenu.cpp" -# "Common/UI/UIScene_PauseMenu.h" -# "Common/UI/UIScene_SignEntryMenu.cpp" -# "Common/UI/UIScene_SignEntryMenu.h" -# "Common/UI/UIScene_TeleportMenu.cpp" -# "Common/UI/UIScene_TeleportMenu.h" + "Common/UI/UIScene_PauseMenu.cpp" + "Common/UI/UIScene_PauseMenu.h" + "Common/UI/UIScene_SignEntryMenu.cpp" + "Common/UI/UIScene_SignEntryMenu.h" + "Common/UI/UIScene_TeleportMenu.cpp" + "Common/UI/UIScene_TeleportMenu.h" ) source_group("Common\\Source Files\\UI\\Scenes\\In-Game Menu Screens" FILES ${Common__Source_Files__UI__Scenes__In-Game_Menu_Screens}) set(Common__Source_Files__UI__Scenes__In-Game_Menu_Screens__Containers -# "Common/UI/UIScene_AbstractContainerMenu.cpp" -# "Common/UI/UIScene_AbstractContainerMenu.h" -# "Common/UI/UIScene_AnvilMenu.cpp" -# "Common/UI/UIScene_AnvilMenu.h" -# "Common/UI/UIScene_BrewingStandMenu.cpp" -# "Common/UI/UIScene_BrewingStandMenu.h" -# "Common/UI/UIScene_ContainerMenu.cpp" -# "Common/UI/UIScene_ContainerMenu.h" -# "Common/UI/UIScene_CreativeMenu.cpp" -# "Common/UI/UIScene_CreativeMenu.h" -# "Common/UI/UIScene_DispenserMenu.cpp" -# "Common/UI/UIScene_DispenserMenu.h" -# "Common/UI/UIScene_EnchantingMenu.cpp" -# "Common/UI/UIScene_EnchantingMenu.h" -# "Common/UI/UIScene_FurnaceMenu.cpp" -# "Common/UI/UIScene_FurnaceMenu.h" -# "Common/UI/UIScene_InventoryMenu.cpp" -# "Common/UI/UIScene_InventoryMenu.h" -# "Common/UI/UIScene_TradingMenu.cpp" -# "Common/UI/UIScene_TradingMenu.h" + "Common/UI/UIScene_AbstractContainerMenu.cpp" + "Common/UI/UIScene_AbstractContainerMenu.h" + "Common/UI/UIScene_AnvilMenu.cpp" + "Common/UI/UIScene_AnvilMenu.h" + "Common/UI/UIScene_BrewingStandMenu.cpp" + "Common/UI/UIScene_BrewingStandMenu.h" + "Common/UI/UIScene_ContainerMenu.cpp" + "Common/UI/UIScene_ContainerMenu.h" + "Common/UI/UIScene_CreativeMenu.cpp" + "Common/UI/UIScene_CreativeMenu.h" + "Common/UI/UIScene_DispenserMenu.cpp" + "Common/UI/UIScene_DispenserMenu.h" + "Common/UI/UIScene_EnchantingMenu.cpp" + "Common/UI/UIScene_EnchantingMenu.h" + "Common/UI/UIScene_FurnaceMenu.cpp" + "Common/UI/UIScene_FurnaceMenu.h" + "Common/UI/UIScene_InventoryMenu.cpp" + "Common/UI/UIScene_InventoryMenu.h" + "Common/UI/UIScene_TradingMenu.cpp" + "Common/UI/UIScene_TradingMenu.h" ) source_group("Common\\Source Files\\UI\\Scenes\\In-Game Menu Screens\\Containers" FILES ${Common__Source_Files__UI__Scenes__In-Game_Menu_Screens__Containers}) @@ -1041,8 +1041,8 @@ set(PS3__PS3Extras # "PS3/PS3Extras/Ps3Stubs.cpp" # "PS3/PS3Extras/Ps3Stubs.h" # "PS3/PS3Extras/Ps3Types.h" -# "PS3/PS3Extras/ShutdownManager.cpp" -# "PS3/PS3Extras/ShutdownManager.h" + "PS3/PS3Extras/ShutdownManager.cpp" + "PS3/PS3Extras/ShutdownManager.h" # "PS3/PS3Extras/TLSStorage.cpp" # "PS3/PS3Extras/TLSStorage.h" # "PS3/PS3Extras/winerror.h" @@ -1234,7 +1234,7 @@ source_group("PSVita\\XML" FILES ${PSVita__XML}) set(Source_Files "BufferedImage.cpp" -# "Extrax64Stubs.cpp" + "Extrax64Stubs.cpp" "glWrapper.cpp" "stdafx.cpp" "stubs.cpp" @@ -1302,8 +1302,8 @@ set(Windows64__Source_Files source_group("Windows64\\Source Files" FILES ${Windows64__Source_Files}) set(Windows64__Source_Files__Leaderboards -# "Windows64/Leaderboards/WindowsLeaderboardManager.cpp" -# "Windows64/Leaderboards/WindowsLeaderboardManager.h" + "Windows64/Leaderboards/WindowsLeaderboardManager.cpp" + "Windows64/Leaderboards/WindowsLeaderboardManager.h" ) source_group("Windows64\\Source Files\\Leaderboards" FILES ${Windows64__Source_Files__Leaderboards}) @@ -1802,20 +1802,20 @@ set(net__minecraft__client__gui__achievement source_group("net\\minecraft\\client\\gui\\achievement" FILES ${net__minecraft__client__gui__achievement}) set(net__minecraft__client__gui__inventory -# "AbstractContainerScreen.cpp" -# "AbstractContainerScreen.h" -# "ContainerScreen.cpp" -# "ContainerScreen.h" -# "CraftingScreen.cpp" -# "CraftingScreen.h" -# "FurnaceScreen.cpp" -# "FurnaceScreen.h" -# "InventoryScreen.cpp" -# "InventoryScreen.h" -# "TextEditScreen.cpp" -# "TextEditScreen.h" -# "TrapScreen.cpp" -# "TrapScreen.h" + "AbstractContainerScreen.cpp" + "AbstractContainerScreen.h" + "ContainerScreen.cpp" + "ContainerScreen.h" + "CraftingScreen.cpp" + "CraftingScreen.h" + "FurnaceScreen.cpp" + "FurnaceScreen.h" + "InventoryScreen.cpp" + "InventoryScreen.h" + "TextEditScreen.cpp" + "TextEditScreen.h" + "TrapScreen.cpp" + "TrapScreen.h" ) source_group("net\\minecraft\\client\\gui\\inventory" FILES ${net__minecraft__client__gui__inventory}) @@ -1924,23 +1924,23 @@ set(net__minecraft__client__model__geom source_group("net\\minecraft\\client\\model\\geom" FILES ${net__minecraft__client__model__geom}) set(net__minecraft__client__multiplayer -# "ClientConnection.cpp" -# "ClientConnection.h" -# "ConnectScreen.cpp" -# "ConnectScreen.h" -# "DisconnectedScreen.cpp" -# "DisconnectedScreen.h" -# "MultiPlayerChunkCache.cpp" -# "MultiPlayerChunkCache.h" -# "MultiPlayerGameMode.cpp" -# "MultiPlayerGameMode.h" -# "MultiPlayerLevel.cpp" -# "MultiPlayerLevel.h" -# "MultiPlayerLocalPlayer.cpp" -# "MultiPlayerLocalPlayer.h" -# "PlayerInfo.h" -# "ReceivingLevelScreen.cpp" -# "ReceivingLevelScreen.h" + "ClientConnection.cpp" + "ClientConnection.h" + "ConnectScreen.cpp" + "ConnectScreen.h" + "DisconnectedScreen.cpp" + "DisconnectedScreen.h" + "MultiPlayerChunkCache.cpp" + "MultiPlayerChunkCache.h" + "MultiPlayerGameMode.cpp" + "MultiPlayerGameMode.h" + "MultiPlayerLevel.cpp" + "MultiPlayerLevel.h" + "MultiPlayerLocalPlayer.cpp" + "MultiPlayerLocalPlayer.h" + "PlayerInfo.h" + "ReceivingLevelScreen.cpp" + "ReceivingLevelScreen.h" ) source_group("net\\minecraft\\client\\multiplayer" FILES ${net__minecraft__client__multiplayer}) @@ -2011,8 +2011,8 @@ source_group("net\\minecraft\\client\\particle" FILES ${net__minecraft__client__ set(net__minecraft__client__player "Input.cpp" "Input.h" -# "LocalPlayer.cpp" -# "LocalPlayer.h" + "LocalPlayer.cpp" + "LocalPlayer.h" "RemotePlayer.cpp" "RemotePlayer.h" ) @@ -2238,8 +2238,8 @@ set(net__minecraft__server "ConsoleInput.cpp" "ConsoleInput.h" "ConsoleInputSource.h" -# "MinecraftServer.cpp" -# "MinecraftServer.h" + "MinecraftServer.cpp" + "MinecraftServer.h" "PlayerList.cpp" "PlayerList.h" "ServerInterface.h" @@ -2289,8 +2289,8 @@ set(net__minecraft__server__network source_group("net\\minecraft\\server\\network" FILES ${net__minecraft__server__network}) set(net__minecraft__stats -# "StatsCounter.cpp" -# "StatsCounter.h" + "StatsCounter.cpp" + "StatsCounter.h" "StatsSyncher.cpp" "StatsSyncher.h" ) diff --git a/Minecraft.Client/Common/Consoles_App.cpp b/Minecraft.Client/Common/Consoles_App.cpp index ce0359f90..0ceb05c5e 100644 --- a/Minecraft.Client/Common/Consoles_App.cpp +++ b/Minecraft.Client/Common/Consoles_App.cpp @@ -6647,7 +6647,8 @@ HRESULT CMinecraftApp::RegisterDLCData(eDLCContentType eType, WCHAR *pwchBannerN #elif defined(__linux__) HRESULT CMinecraftApp::RegisterDLCData(WCHAR *pType, WCHAR *pBannerName, int iGender, __uint64 ullOfferID_Full, __uint64 ullOfferID_Trial, WCHAR *pFirstSkin, unsigned int uiSortIndex, int iConfig, WCHAR *pDataFile) { - // TODO + fprintf(stderr, "warning: CMinecraftApp::RegisterDLCData unimplemented for platform `__linux__`\n"); + return S_OK; } #else HRESULT CMinecraftApp::RegisterDLCData(char *pchDLCName, unsigned int uiSortIndex,char *pchImageURL) diff --git a/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp b/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp index 0de2f0098..bac5f91ae 100644 --- a/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp +++ b/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp @@ -6,6 +6,8 @@ #include "../../MultiPlayerLocalPlayer.h" #include "../../../Minecraft.World/StringHelpers.h" +#include + UIControl_EnchantmentButton::UIControl_EnchantmentButton() { m_index = 0; diff --git a/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp index 0d2e3aff4..e3ddd3abe 100644 --- a/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp @@ -269,7 +269,7 @@ void UIScene_DLCOffersMenu::handlePress(F64 controlId, F64 childId) ULONGLONG ullIndexA[1]; ullIndexA[0]=StorageManager.GetOffer(iIndex).qwOfferID; - StorageManager.InstallOffer(1,ullIndexA,NULL,NULL); + StorageManager.InstallOffer(1,(__uint64*)ullIndexA,NULL,NULL); #endif } break; diff --git a/Minecraft.Client/Linux/Stubs/winapi_stubs.h b/Minecraft.Client/Linux/Stubs/winapi_stubs.h index 00c7c54b5..0d5c41486 100644 --- a/Minecraft.Client/Linux/Stubs/winapi_stubs.h +++ b/Minecraft.Client/Linux/Stubs/winapi_stubs.h @@ -57,7 +57,7 @@ typedef struct { typedef long long LONGLONG; typedef size_t SIZE_T; -typedef std::wstring LPWSTR; +typedef WCHAR *LPWSTR, *PWSTR; typedef unsigned char boolean; // java brainrot #define __debugbreak() #define __int32 int @@ -147,6 +147,30 @@ typedef float FLOAT; #define MEM_HEAP 0x40000000 #define MEM_16MB_PAGES 0x80000000 +#define THREAD_BASE_PRIORITY_LOWRT 15 // value that gets a thread to LowRealtime-1 +#define THREAD_BASE_PRIORITY_MAX 2 // maximum thread base priority boost +#define THREAD_BASE_PRIORITY_MIN -2 // minimum thread base priority boost +#define THREAD_BASE_PRIORITY_IDLE -15 // value that gets a thread to idle + +#define THREAD_PRIORITY_LOWEST THREAD_BASE_PRIORITY_MIN +#define THREAD_PRIORITY_BELOW_NORMAL (THREAD_PRIORITY_LOWEST+1) +#define THREAD_PRIORITY_NORMAL 0 +#define THREAD_PRIORITY_HIGHEST THREAD_BASE_PRIORITY_MAX +#define THREAD_PRIORITY_ABOVE_NORMAL (THREAD_PRIORITY_HIGHEST-1) +#define THREAD_PRIORITY_ERROR_RETURN (MAXLONG) + +#define THREAD_PRIORITY_TIME_CRITICAL THREAD_BASE_PRIORITY_LOWRT +#define THREAD_PRIORITY_IDLE THREAD_BASE_PRIORITY_IDLE + +#define IGNORE 0 // Ignore signal +#define INFINITE 0xFFFFFFFF // Infinite timeout +#define WAIT_FAILED ((DWORD)0xFFFFFFFF) +#define STATUS_WAIT_0 ((DWORD )0x00000000L) +#define WAIT_OBJECT_0 ((STATUS_WAIT_0 ) + 0 ) +#define STATUS_PENDING ((DWORD )0x00000103L) +#define STILL_ACTIVE STATUS_PENDING + + #define INVALID_HANDLE_VALUE ((HANDLE)(ULONG_PTR)-1) // https://learn.microsoft.com/en-us/windows/win32/api/minwinbase/ns-minwinbase-filetime