backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-24 21:23:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #33 from tropicaaal/fix/minecraft-world-linkage

Browse source 
fix: link `Minecraft.World` to `Minecraft.Client` on linux
This commit is contained in:
DecalOverdose 2026-03-05 08:26:40 +04:00 committed by GitHub
parent 78fce1e561 0c31a7a943
commit 35e524d146
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
34 changed files with 282 additions and 274 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

468
Minecraft.Client/CMakeLists.txt
View file

@ -313,8 +313,8 @@ set(Common__Source_Files__UI
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"
@ -1099,6 +1099,14 @@ set(PS3__Source_Files__Social
)
source_group("PS3\\Source Files\\Social" FILES ${PS3__Source_Files__Social})
set(Linux
"Linux/Linux_UIController.cpp"
"Linux/Linux_Minecraft.cpp"
"Linux/Linux_App.cpp"
)
source_group("Linux" FILES ${Linux})
set(PSVita
# "PSVita/PSVita_App.cpp"
"PSVita/PSVita_App.h"
@ -1226,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"
@ -1294,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})
@ -1716,8 +1724,8 @@ set(net__minecraft__client
"Lighting.h"
"MemoryTracker.cpp"
"MemoryTracker.h"
# "Minecraft.cpp"
# "Minecraft.h"
"Minecraft.cpp"
"Minecraft.h"
"Options.cpp"
"Options.h"
"ProgressRenderer.cpp"
@ -1794,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})
@ -1916,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})
@ -2003,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"
)
@ -2230,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"
@ -2281,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"
)
@ -2369,6 +2377,7 @@ set(ALL_FILES
${PS3__Source_Files__Network}
${PS3__Source_Files__Sentient}
${PS3__Source_Files__Social}
${Linux}
${PSVita}
${PSVita__4JLibs__inc}
${PSVita__GameConfig}
@ -2452,9 +2461,6 @@ set(ALL_FILES
${net__minecraft__server__level}
${net__minecraft__server__network}
${net__minecraft__stats}
Linux/Linux_UIController.cpp
Linux/Linux_Minecraft.cpp
Linux/Linux_App.cpp
)
################################################################################
@ -3986,6 +3992,8 @@ if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Durango")
">"
"xaudio2"
)
elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Linux")
set(ADDITIONAL_LIBRARY_DEPENDENCIES "Minecraft.World")
elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "ORBIS")
set(ADDITIONAL_LIBRARY_DEPENDENCIES
"$<$<CONFIG:CONTENTPACKAGE_SYMBOLS>:"

3
Minecraft.Client/Common/Consoles_App.cpp
View file

@ -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)

2
Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp
View file

@ -6,6 +6,8 @@
#include "../../MultiPlayerLocalPlayer.h"
#include "../../../Minecraft.World/StringHelpers.h"
#include <iterator>
UIControl_EnchantmentButton::UIControl_EnchantmentButton()
{
m_index = 0;

2
Minecraft.Client/Common/UI/UIScene_Credits.h
View file

@ -18,7 +18,7 @@
#elif defined(_DURANGO) || defined _WIN64
#define MAX_CREDIT_STRINGS (XBOXONE_CREDITS_COUNT + MILES_AND_IGGY_CREDITS_COUNT)
#elif defined (__linux__)
#define MAX_CREDIT_STRINGS
#define MAX_CREDIT_STRINGS (XBOXONE_CREDITS_COUNT + MILES_AND_IGGY_CREDITS_COUNT)
#elif defined(__PSVITA__)
#define MAX_CREDIT_STRINGS (PSVITA_CREDITS_COUNT + MILES_AND_IGGY_CREDITS_COUNT + DYNAMODE_FONT_CREDITS_COUNT)
#endif

2
Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
View file

@ -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;

2
Minecraft.Client/Common/UI/UIScene_Intro.cpp
View file

@ -18,7 +18,7 @@ UIScene_Intro::UIScene_Intro(int iPad, void *initData, UILayer *parentLayer) : U
#endif
// 4J Stu - These map to values in the Actionscript
#ifdef _WINDOWS64
#if defined(_WINDOWS64) || defined(__linux__)
int platformIdx = 0;
#elif defined(_XBOX)
int platformIdx = 1;

2
Minecraft.Client/Linux/Linux_Minecraft.cpp
View file

@ -19,7 +19,7 @@
#include "../../Minecraft.World/Vec3.h"
#include "../../Minecraft.World/Level.h"
#include "../../Minecraft.World/net.minecraft.world.level.tile.h"
#include "../../Minecraft.Client/Windows64Media/strings.h"
#include "../../Minecraft.Client/OrbisMedia/strings.h"
#include "../ClientConnection.h"
#include "../User.h"

26
Minecraft.Client/Linux/Stubs/winapi_stubs.h
View file

@ -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

6
Minecraft.Client/LocalPlayer.cpp
View file

@ -33,9 +33,9 @@
#include "CritParticle.h"
// 4J : WESTY : Added for new achievements.
#include "../Minecraft.World/item.h"
#include "../Minecraft.World/mapitem.h"
#include "../Minecraft.World/tile.h"
#include "../Minecraft.World/Item.h"
#include "../Minecraft.World/MapItem.h"
#include "../Minecraft.World/Tile.h"
// 4J Stu - Added for tutorial callbacks
#include "Minecraft.h"

2
Minecraft.Client/Textures.cpp
View file

@ -1312,7 +1312,7 @@ TEXTURE_NAME TUImages[] =
};
// This is for any TU textures that aren't part of our enum indexed preload set
wchar_t *TUImagePaths[] =
const wchar_t *TUImagePaths[] =
{
L"font/Default",
L"font/Mojangles_7",

2
Minecraft.Client/stdafx.h
View file

@ -297,7 +297,7 @@ typedef XUID GameSessionUID;
#elif defined __linux__
// FIXME: Make Linux/ versions of all of these
// #include "Windows64/Sentient/MinecraftTelemetry.h" // conflicts with Common/Telemetry/TelemetryManager.h, no idea whats up with that
#include "Windows64Media/strings.h"
#include "OrbisMedia/strings.h" // using Orbis or Vita strings because IDS_CONTENT_RESTRICTION exists
#include "Windows64/Windows64_App.h"
#include "Windows64/Sentient/DynamicConfigurations.h"
#include "Windows64/Sentient/SentientTelemetryCommon.h"

2
Minecraft.World/BlockRegionUpdatePacket.cpp
View file

@ -10,8 +10,6 @@
#include "DataLayer.h"
#include "Dimension.h"
#include "../Minecraft.Client/Windows64/Windows64_App.h"
BlockRegionUpdatePacket::~BlockRegionUpdatePacket()
{
delete [] buffer.data;

1
Minecraft.World/CommandDispatcher.cpp
View file

@ -1,7 +1,6 @@
#include "stdafx.h"
#include "net.minecraft.commands.h"
#include "CommandDispatcher.h"
#include "../Minecraft.Client/Windows64/Windows64_App.h"
void CommandDispatcher::performCommand(shared_ptr<CommandSender> sender, EGameCommand command, byteArray commandData)
{

2
Minecraft.World/CustomPayloadPacket.cpp
View file

@ -3,7 +3,7 @@
#include "PacketListener.h"
#include "BasicTypeContainers.h"
#include "CustomPayloadPacket.h"
#include "../Minecraft.Client/Windows64/Windows64_App.h"
// Mojang-defined custom packets
const wstring CustomPayloadPacket::CUSTOM_BOOK_PACKET = L"MC|BEdit";
const wstring CustomPayloadPacket::CUSTOM_BOOK_SIGN_PACKET = L"MC|BSign";

2
Minecraft.World/EnderDragon.cpp
View file

@ -13,8 +13,6 @@
#include "SharedConstants.h"
#include "EnderDragon.h"
#include "../Minecraft.Client/Windows64/Windows64_App.h"
#define PRINT_DRAGON_STATE_CHANGE_MESSAGES 1

1
Minecraft.World/EnderMan.cpp
View file

@ -9,7 +9,6 @@
#include "com.mojang.nbt.h"
#include "../Minecraft.Client/Textures.h"
#include "EnderMan.h"
#include "../Minecraft.Client/Windows64/Windows64_App.h"
bool EnderMan::MAY_TAKE[256];

3
Minecraft.World/Entity.cpp
View file

@ -21,13 +21,10 @@
#include "../Minecraft.Client/MinecraftServer.h"
#include "../Minecraft.Client/MultiPlayerLevel.h"
#include "../Minecraft.Client/MultiPlayerLocalPlayer.h"
#include "../Minecraft.Client/Windows64/Windows64_App.h"
int Entity::entityCounter = 2048; // 4J - changed initialiser to 2048, as we are using range 0 - 2047 as special unique smaller ids for things that need network tracked
#ifdef _WIN32
DWORD Entity::tlsIdx = TlsAlloc();
#endif // _WIN32
// 4J - added getSmallId & freeSmallId methods
unsigned int Entity::entityIdUsedFlags[2048/32] = {0};

2
Minecraft.World/FileHeader.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h"
#include "FileHeader.h"
#include "../Minecraft.Client/Windows64/Windows64_App.cpp"
//#define _DEBUG_FILE_HEADER
extern CConsoleMinecraftApp app;

1
Minecraft.World/FileInputStream.cpp
View file

@ -2,7 +2,6 @@
#include "File.h"
#include "FileInputStream.h"
#include "../Minecraft.Client/Windows64/Windows64_App.h"
#include <fcntl.h>
#include <unistd.h> // for close()

1
Minecraft.World/Fireball.cpp
View file

@ -9,7 +9,6 @@
#include "Fireball.h"
#include "net.minecraft.world.level.dimension.h"
#include "SharedConstants.h"
#include "../Minecraft.Client/Windows64/Windows64_App.h"
// 4J - added common ctor code.

1
Minecraft.World/GameCommandPacket.cpp
View file

@ -3,7 +3,6 @@
#include "PacketListener.h"
#include "BasicTypeContainers.h"
#include "GameCommandPacket.h"
#include "../Minecraft.Client/Windows64/Windows64_App.h"
GameCommandPacket::GameCommandPacket()
{

2
Minecraft.World/Item.cpp
View file

@ -950,7 +950,7 @@ void Item::registerIcons(IconRegister *iconRegister)
4J: These are necesary on the PS3.
(and 4 and Vita).
*/
#if (defined __PS3__ || defined __ORBIS__ || defined __PSVITA__)
#if (defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ || defined __linux__)
const int Item::shovel_iron_Id ;
const int Item::pickAxe_iron_Id ;
const int Item::hatchet_iron_Id ;

1
Minecraft.World/LoginPacket.cpp
View file

@ -5,7 +5,6 @@
#include "PacketListener.h"
#include "LoginPacket.h"
#include "LevelType.h"
#include "../Minecraft.Client/Windows64/Windows64_App.h"
LoginPacket::LoginPacket()

1
Minecraft.World/MobEffectInstance.cpp
View file

@ -1,6 +1,5 @@
#include "stdafx.h"
#include "net.minecraft.world.effect.h"
#include "../Minecraft.Client/Windows64/Windows64_App.h"
void MobEffectInstance::_init(int id, int duration, int amplifier)
{

1
Minecraft.World/Monster.cpp
View file

@ -7,7 +7,6 @@
#include "net.minecraft.world.effect.h"
#include "net.minecraft.world.item.enchantment.h"
#include "Monster.h"
#include "../Minecraft.Client/Windows64/Windows64_App.h"
#include "../Minecraft.Client/Minecraft.h"

1
Minecraft.World/Packet.cpp
View file

@ -6,7 +6,6 @@
#include "PacketListener.h"
#include "Packet.h"
#include "com.mojang.nbt.h"
#include "../Minecraft.Client/Windows64/Windows64_App.h"
#ifndef _CONTENT_PACKAGE
#include "../Minecraft.Client/Minecraft.h"

2
Minecraft.World/PreLoginPacket.cpp
View file

@ -3,8 +3,6 @@
#include "PacketListener.h"
#include "PreLoginPacket.h"
#include "InputOutputStream.h"
#include "../Minecraft.Client/Windows64/Windows64_App.h"
PreLoginPacket::PreLoginPacket()
{

1
Minecraft.World/RespawnPacket.cpp
View file

@ -4,7 +4,6 @@
#include "PacketListener.h"
#include "RespawnPacket.h"
#include "LevelType.h"
#include "../Minecraft.Client/Windows64/Windows64_App.h"
RespawnPacket::RespawnPacket()
{

3
Minecraft.World/Silverfish.cpp
View file

@ -7,9 +7,6 @@
#include "../Minecraft.Client/Textures.h"
#include "Silverfish.h"
#include "SoundTypes.h"
#include "../Minecraft.Client/Windows64/Windows64_App.h"
Silverfish::Silverfish(Level *level) : Monster( level )
{

2
Minecraft.World/Stat.h
View file

@ -4,8 +4,6 @@ using namespace std;
#include "StatFormatter.h"
#include "GenericStats.h"
#include "../Minecraft.Client/Windows64/Windows64_App.h"
class DecimalFormat;
class Stat

2
Minecraft.World/SynchedEntityData.cpp
View file

@ -7,8 +7,6 @@
#include "net.minecraft.world.item.h"
#include "SynchedEntityData.h"
#include "../Minecraft.Client/Windows64/Windows64_App.h"
SynchedEntityData::SynchedEntityData()
{
m_isDirty = false;

1
Minecraft.World/Tag.cpp
View file

@ -11,7 +11,6 @@
#include "StringTag.h"
#include "ListTag.h"
#include "CompoundTag.h"
#include "../Minecraft.Client/Windows64/Windows64_App.h"
Tag::Tag(const wstring &name)
{

2
Minecraft.World/Tile.cpp
View file

@ -1481,7 +1481,7 @@ int Tile::SoundType::getPlaceSound() const
4J: These are necessary on the PS3.
(and 4 and Vita).
*/
#if (defined __PS3__ || defined __ORBIS__ || defined __PSVITA__)
#if (defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ || defined __linux__)
const int Tile::rock_Id;
const int Tile::grass_Id;
const int Tile::dirt_Id;

4
Minecraft.World/stdafx.h
View file

@ -241,8 +241,8 @@ void MemSect(int sect);
#include "../Minecraft.Client/PSVita/Sentient/MinecraftTelemetry.h"
#elif defined(__linux__)
// FIXME: Move and port to ../Minecraft.Client/Linux
#include "../Minecraft.Client/Windows64/Windows64_App.h"
#include "../Minecraft.Client/Windows64Media/strings.h"
#include "../Minecraft.Client/Linux/Linux_App.h"
#include "../Minecraft.Client/OrbisMedia/strings.h"
#include "../Minecraft.Client/Windows64/Sentient/SentientTelemetryCommon.h"
// #include "../Minecraft.Client/Windows64/Sentient/MinecraftTelemetry.h"
#else