refactor: prune Minecraft.Client stdafx includes
Some checks are pending
Build (Linux, x86-64) / build-linux (push) Waiting to run
Format Check / clang-format (push) Waiting to run

This commit is contained in:
Tropical 2026-03-31 18:45:34 -05:00
parent 0958c5bb78
commit 70194c6a3b
104 changed files with 240 additions and 215 deletions

View file

@ -1,4 +1,5 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.World/Header Files/compression.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
#include "java/File.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include <fstream>
#include <filesystem>

View file

@ -1,9 +1,10 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include <thread>
#include <chrono>
#include <fstream>
#include <filesystem>
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
#include "Minecraft.World/net/minecraft/world/phys/AABB.h"
#include "Minecraft.World/net/minecraft/world/phys/Vec3.h"

View file

@ -1,4 +1,7 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "4J.Common/4J_InputActions.h"
#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"
#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"
#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h"
#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"

View file

@ -1,6 +1,8 @@
#pragma once
#include "UIEnums.h"
#include "UIStructs.h"
#include "4J_Storage.h"
#include "Minecraft.World/Header Files/SoundTypes.h"
// 4J Stu - An interface class that defines all the public functions that we use

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "IUIScene_AbstractContainerMenu.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "IUIScene_AnvilMenu.h"
#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h"
#include "java/InputOutputStream/InputOutputStream.h"

View file

@ -1,4 +1,6 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "4J.Common/4J_InputActions.h"
#include "Minecraft.World/net/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h"
#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "IUIScene_CreativeMenu.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"

View file

@ -1,7 +1,7 @@
#include <thread>
#include <chrono>
#include "Minecraft.Client/Header Files/stdafx.h"
#include "IUIScene_PauseMenu.h"
#include "Minecraft.Client/Common/Source Files/UI/UIScene.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.World/net/minecraft/world/item/trading/net.minecraft.world.item.trading.h"
#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h"
#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h"

View file

@ -1,4 +1,5 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIComponent_PressStartToPlay.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"

View file

@ -1,4 +1,5 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIComponent_TutorialPopup.h"
#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_HUD.h"
#include "Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_CreateWorldMenu.h"
#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"

View file

@ -1,6 +1,7 @@
#pragma once
#include "IUIScene_StartGame.h"
#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h"
class UIScene_CreateWorldMenu : public IUIScene_StartGame {
private:

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_DLCMainMenu.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_DLCOffersMenu.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_EULA.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_JoinMenu.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"

View file

@ -1,4 +1,5 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
#include "UIScene_LaunchMoreOptionsMenu.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_LeaderboardsMenu.h"
#include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_LoadMenu.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"

View file

@ -3,6 +3,7 @@
#include <cstdint>
#include "IUIScene_StartGame.h"
#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h"
class UIScene_LoadMenu : public IUIScene_StartGame {
private:

View file

@ -1,7 +1,7 @@
#include <thread>
#include <chrono>
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_LoadOrJoinMenu.h"

View file

@ -1,5 +1,6 @@
#pragma once
#include "java/File.h"
#include "Minecraft.Client/Common/Source Files/UI/UIScene.h"
class LevelGenerationOptions;

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.World/net/minecraft/util/Mth.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
#include "java/Random.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_NewUpdateMessage.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_SaveMessage.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_TrialExitUpsell.h"

View file

@ -1,4 +1,5 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_ControlsMenu.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
#include "UIScene_Credits.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_HelpAndOptionsMenu.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_HowToPlay.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_HowToPlayMenu.h"

View file

@ -1,32 +1,35 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_LanguageSelector.h"
// strings for buttons in the list
const unsigned int UIScene_LanguageSelector::m_uiHTPButtonNameA[] = {
HAS_LANGUAGE_SYSTEM(IDS_LANG_SYSTEM) HAS_LANGUAGE_EN_US(
IDS_LANG_ENGLISH) HAS_LANGUAGE_DE_DE(IDS_LANG_GERMAN)
HAS_LANGUAGE_ES_ES(IDS_LANG_SPANISH_SPAIN) HAS_LANGUAGE_ES_MX(
IDS_LANG_SPANISH_LATIN_AMERICA) HAS_LANGUAGE_FR_FR(IDS_LANG_FRENCH)
HAS_LANGUAGE_IT_IT(IDS_LANG_ITALIAN) HAS_LANGUAGE_PT_PT(
IDS_LANG_PORTUGUESE_PORTUGAL)
HAS_LANGUAGE_PT_BR(IDS_LANG_PORTUGUESE_BRAZIL) HAS_LANGUAGE_JA_JP(
IDS_LANG_JAPANESE) HAS_LANGUAGE_KO_KR(IDS_LANG_KOREAN)
HAS_LANGUAGE_CN_TW(IDS_LANG_CHINESE_TRADITIONAL) HAS_LANGUAGE_CN_CN(
IDS_LANG_CHINESE_SIMPLIFIED)
HAS_LANGUAGE_DA_DK(IDS_LANG_DANISH) HAS_LANGUAGE_FI_FI(
IDS_LANG_FINISH) HAS_LANGUAGE_NL_NL(IDS_LANG_DUTCH)
HAS_LANGUAGE_PL_PL(IDS_LANG_POLISH)
HAS_LANGUAGE_RU_RU(IDS_LANG_RUSSIAN)
HAS_LANGUAGE_SV_SE(IDS_LANG_SWEDISH)
HAS_LANGUAGE_NB_NO(IDS_LANG_NORWEGIAN)
HAS_LANGUAGE_SK_SK(IDS_LANG_SLOVAK)
HAS_LANGUAGE_CZ_CZ(
IDS_LANG_CZECH)
HAS_LANGUAGE_EL_GR(
IDS_LANG_GREEK)
HAS_LANGUAGE_TR_TR(
IDS_LANG_TURKISH)};
const unsigned int UIScene_LanguageSelector::m_uiHTPButtonNameA[]=
{
IDS_LANG_SYSTEM,
IDS_LANG_ENGLISH,
IDS_LANG_GERMAN,
IDS_LANG_SPANISH_SPAIN,
IDS_LANG_SPANISH_LATIN_AMERICA,
IDS_LANG_FRENCH,
IDS_LANG_ITALIAN,
IDS_LANG_PORTUGUESE_PORTUGAL,
IDS_LANG_PORTUGUESE_BRAZIL,
IDS_LANG_JAPANESE,
IDS_LANG_KOREAN,
IDS_LANG_CHINESE_TRADITIONAL,
IDS_LANG_CHINESE_SIMPLIFIED,
IDS_LANG_DANISH,
IDS_LANG_FINISH,
IDS_LANG_DUTCH,
IDS_LANG_POLISH,
IDS_LANG_RUSSIAN,
IDS_LANG_SWEDISH,
IDS_LANG_NORWEGIAN,
// IDS_LANG_SLOVAK,
// IDS_LANG_CZECH,
IDS_LANG_GREEK,
IDS_LANG_TURKISH,
};
UIScene_LanguageSelector::UIScene_LanguageSelector(int iPad, void* initData,
UILayer* parentLayer)

View file

@ -1,68 +1,40 @@
#pragma once
#include "Minecraft.Client/Common/Source Files/UI/UIScene.h"
#define HAS_LANGUAGE_SYSTEM(exp) exp,
#define HAS_LANGUAGE_EN_US(exp) exp,
#define HAS_LANGUAGE_DE_DE(exp) exp,
#define HAS_LANGUAGE_ES_ES(exp) exp,
#define HAS_LANGUAGE_ES_MX(exp) exp,
#define HAS_LANGUAGE_FR_FR(exp) exp,
#define HAS_LANGUAGE_IT_IT(exp) exp,
#define HAS_LANGUAGE_PT_PT(exp) exp,
#define HAS_LANGUAGE_PT_BR(exp) exp,
#define HAS_LANGUAGE_JA_JP(exp) exp,
#define HAS_LANGUAGE_KO_KR(exp) exp,
#define HAS_LANGUAGE_CN_TW(exp) exp,
#define HAS_LANGUAGE_CN_CN(exp)
#define HAS_LANGUAGE_SK_SK(exp)
#define HAS_LANGUAGE_CZ_CZ(exp)
#define HAS_LANGUAGE_DA_DK(exp) exp,
#define HAS_LANGUAGE_FI_FI(exp) exp,
#define HAS_LANGUAGE_NL_NL(exp) exp,
#define HAS_LANGUAGE_PL_PL(exp) exp,
#define HAS_LANGUAGE_RU_RU(exp) exp,
#define HAS_LANGUAGE_SV_SE(exp) exp,
#define HAS_LANGUAGE_NB_NO(exp) exp,
#define HAS_LANGUAGE_EL_GR(exp) exp,
#define HAS_LANGUAGE_TR_TR(exp)
#include "Minecraft.Client/Common/App_Defines.h"
#include "Minecraft.World/x64headers/extraX64.h"
class UIScene_LanguageSelector : public UIScene {
public:
enum ELangButtons {
eLanguageSelector_LabelNone = -1,
HAS_LANGUAGE_SYSTEM(eLanguageSelector_system) HAS_LANGUAGE_EN_US(
eLanguageSelector_EN_US) HAS_LANGUAGE_DE_DE(eLanguageSelector_DE_DE)
HAS_LANGUAGE_ES_ES(eLanguageSelector_ES_ES) HAS_LANGUAGE_ES_MX(
eLanguageSelector_ES_MX) HAS_LANGUAGE_FR_FR(eLanguageSelector_FR_FR)
HAS_LANGUAGE_IT_IT(eLanguageSelector_IT_IT) HAS_LANGUAGE_PT_PT(
eLanguageSelector_PT_PT) HAS_LANGUAGE_PT_BR(eLanguageSelector_PT_BR)
HAS_LANGUAGE_JA_JP(eLanguageSelector_JA_JP) HAS_LANGUAGE_KO_KR(
eLanguageSelector_KO_KR) HAS_LANGUAGE_CN_TW(eLanguageSelector_CN_TW)
HAS_LANGUAGE_CN_CN(eLanguageSelector_CN_CN) HAS_LANGUAGE_DA_DK(
eLanguageSelector_DA_DK)
HAS_LANGUAGE_FI_FI(eLanguageSelector_FI_FI) HAS_LANGUAGE_NL_NL(
eLanguageSelector_NL_NL)
HAS_LANGUAGE_PL_PL(eLanguageSelector_PL_PL)
HAS_LANGUAGE_RU_RU(eLanguageSelector_RU_RU)
HAS_LANGUAGE_SV_SE(
eLanguageSelector_SV_SE)
HAS_LANGUAGE_NB_NO(
eLanguageSelector_NB_NO)
HAS_LANGUAGE_SK_SK(
eLanguageSelector_SK_SK)
HAS_LANGUAGE_CZ_CZ(
eLanguageSelector_CZ_CZ)
HAS_LANGUAGE_EL_GR(
eLanguageSelector_EL_GR)
HAS_LANGUAGE_TR_TR(
eLanguageSelector_TR_TR)
eLanguageSelector_MAX
};
enum ELangButtons
{
eLanguageSelector_LabelNone = -1,
eLanguageSelector_system,
eLanguageSelector_EN_US,
eLanguageSelector_DE_DE,
eLanguageSelector_ES_ES,
eLanguageSelector_ES_MX,
eLanguageSelector_FR_FR,
eLanguageSelector_IT_IT,
eLanguageSelector_PT_PT,
eLanguageSelector_PT_BR,
eLanguageSelector_JA_JP,
eLanguageSelector_KO_KR,
eLanguageSelector_CN_TW,
eLanguageSelector_CN_CN,
eLanguageSelector_DA_DK,
eLanguageSelector_FI_FI,
eLanguageSelector_NL_NL,
eLanguageSelector_PL_PL,
eLanguageSelector_RU_RU,
eLanguageSelector_SV_SE,
eLanguageSelector_NB_NO,
eLanguageSelector_SK_SK,
eLanguageSelector_CZ_CZ,
eLanguageSelector_EL_GR,
eLanguageSelector_TR_TR,
eLanguageSelector_MAX
};
private:
enum EControls {
@ -99,54 +71,58 @@ protected:
void handlePress(F64 controlId, F64 childId);
};
const int uiLangMap[UIScene_LanguageSelector::eLanguageSelector_MAX] = {
HAS_LANGUAGE_SYSTEM(MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_EN_US(
XC_LANGUAGE_ENGLISH) HAS_LANGUAGE_DE_DE(XC_LANGUAGE_GERMAN)
HAS_LANGUAGE_ES_ES(XC_LANGUAGE_SPANISH) HAS_LANGUAGE_ES_MX(
XC_LANGUAGE_SPANISH) HAS_LANGUAGE_FR_FR(XC_LANGUAGE_FRENCH)
HAS_LANGUAGE_IT_IT(XC_LANGUAGE_ITALIAN) HAS_LANGUAGE_PT_PT(
XC_LANGUAGE_PORTUGUESE) HAS_LANGUAGE_PT_BR(XC_LANGUAGE_PORTUGUESE)
HAS_LANGUAGE_JA_JP(XC_LANGUAGE_JAPANESE) HAS_LANGUAGE_KO_KR(
XC_LANGUAGE_KOREAN) HAS_LANGUAGE_CN_TW(XC_LANGUAGE_TCHINESE)
HAS_LANGUAGE_CN_CN(XC_LANGUAGE_SCHINESE) HAS_LANGUAGE_DA_DK(
XC_LANGUAGE_DANISH) HAS_LANGUAGE_FI_FI(XC_LANGUAGE_FINISH)
HAS_LANGUAGE_NL_NL(XC_LANGUAGE_DUTCH) HAS_LANGUAGE_PL_PL(
XC_LANGUAGE_POLISH)
HAS_LANGUAGE_RU_RU(XC_LANGUAGE_RUSSIAN)
HAS_LANGUAGE_SV_SE(XC_LANGUAGE_SWEDISH)
HAS_LANGUAGE_NB_NO(XC_LANGUAGE_BNORWEGIAN)
HAS_LANGUAGE_SK_SK(XC_LANGUAGE_SLOVAK)
HAS_LANGUAGE_CZ_CZ(
XC_LANGUAGE_CZECH)
HAS_LANGUAGE_EL_GR(
XC_LANGUAGE_GREEK)
HAS_LANGUAGE_TR_TR(
XC_LANGUAGE_TURKISH)};
const int uiLangMap[UIScene_LanguageSelector::eLanguageSelector_MAX] =
{
MINECRAFT_LANGUAGE_DEFAULT,
XC_LANGUAGE_ENGLISH,
XC_LANGUAGE_GERMAN,
XC_LANGUAGE_SPANISH,
XC_LANGUAGE_SPANISH,
XC_LANGUAGE_FRENCH,
XC_LANGUAGE_ITALIAN,
XC_LANGUAGE_PORTUGUESE,
XC_LANGUAGE_PORTUGUESE,
XC_LANGUAGE_JAPANESE,
XC_LANGUAGE_KOREAN,
XC_LANGUAGE_TCHINESE,
XC_LANGUAGE_SCHINESE,
XC_LANGUAGE_DANISH,
XC_LANGUAGE_FINISH,
XC_LANGUAGE_DUTCH,
XC_LANGUAGE_POLISH,
XC_LANGUAGE_RUSSIAN,
XC_LANGUAGE_SWEDISH,
XC_LANGUAGE_BNORWEGIAN,
XC_LANGUAGE_SLOVAK,
XC_LANGUAGE_CZECH,
XC_LANGUAGE_GREEK,
XC_LANGUAGE_TURKISH,
};
const int uiLocaleMap[UIScene_LanguageSelector::eLanguageSelector_MAX] = {
HAS_LANGUAGE_SYSTEM(MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_EN_US(
MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_DE_DE(MINECRAFT_LANGUAGE_DEFAULT)
HAS_LANGUAGE_ES_ES(XC_LOCALE_SPAIN) HAS_LANGUAGE_ES_MX(
XC_LOCALE_LATIN_AMERICA) HAS_LANGUAGE_FR_FR(MINECRAFT_LANGUAGE_DEFAULT)
HAS_LANGUAGE_IT_IT(MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_PT_PT(
XC_LOCALE_PORTUGAL) HAS_LANGUAGE_PT_BR(XC_LOCALE_BRAZIL)
HAS_LANGUAGE_JA_JP(MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_KO_KR(
MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_CN_TW(MINECRAFT_LANGUAGE_DEFAULT)
HAS_LANGUAGE_CN_CN(MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_DA_DK(
MINECRAFT_LANGUAGE_DEFAULT)
HAS_LANGUAGE_FI_FI(MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_NL_NL(
MINECRAFT_LANGUAGE_DEFAULT)
HAS_LANGUAGE_PL_PL(MINECRAFT_LANGUAGE_DEFAULT)
HAS_LANGUAGE_RU_RU(MINECRAFT_LANGUAGE_DEFAULT)
HAS_LANGUAGE_SV_SE(
MINECRAFT_LANGUAGE_DEFAULT)
HAS_LANGUAGE_NB_NO(
MINECRAFT_LANGUAGE_DEFAULT)
HAS_LANGUAGE_SK_SK(
MINECRAFT_LANGUAGE_DEFAULT)
HAS_LANGUAGE_CZ_CZ(
MINECRAFT_LANGUAGE_DEFAULT)
HAS_LANGUAGE_EL_GR(
MINECRAFT_LANGUAGE_DEFAULT)
HAS_LANGUAGE_TR_TR(
MINECRAFT_LANGUAGE_DEFAULT)};
const int uiLocaleMap[UIScene_LanguageSelector::eLanguageSelector_MAX] =
{
MINECRAFT_LANGUAGE_DEFAULT,
MINECRAFT_LANGUAGE_DEFAULT,
MINECRAFT_LANGUAGE_DEFAULT,
XC_LOCALE_SPAIN,
XC_LOCALE_LATIN_AMERICA,
MINECRAFT_LANGUAGE_DEFAULT,
MINECRAFT_LANGUAGE_DEFAULT,
XC_LOCALE_PORTUGAL,
XC_LOCALE_BRAZIL,
MINECRAFT_LANGUAGE_DEFAULT,
MINECRAFT_LANGUAGE_DEFAULT,
MINECRAFT_LANGUAGE_DEFAULT,
MINECRAFT_LANGUAGE_DEFAULT,
MINECRAFT_LANGUAGE_DEFAULT,
MINECRAFT_LANGUAGE_DEFAULT,
MINECRAFT_LANGUAGE_DEFAULT,
MINECRAFT_LANGUAGE_DEFAULT,
MINECRAFT_LANGUAGE_DEFAULT,
MINECRAFT_LANGUAGE_DEFAULT,
MINECRAFT_LANGUAGE_DEFAULT,
MINECRAFT_LANGUAGE_DEFAULT,
MINECRAFT_LANGUAGE_DEFAULT,
MINECRAFT_LANGUAGE_DEFAULT,
MINECRAFT_LANGUAGE_DEFAULT,
};

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_ReinstallMenu.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_SettingsAudioMenu.h"

View file

@ -1,4 +1,5 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_SettingsControlMenu.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"

View file

@ -1,4 +1,5 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_SettingsGraphicsMenu.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_SettingsMenu.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_SettingsOptionsMenu.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_SettingsUIMenu.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_SkinSelectMenu.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_AbstractContainerMenu.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h"
#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"

View file

@ -1,4 +1,5 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_InventoryMenu.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "Minecraft.World/net/minecraft/util/HtmlString.h"
#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_DeathMenu.h"
#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_EndPoem.h"
#include "Minecraft.Client/Common/Source Files/UI/UIBitmapFont.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_InGameHostOptionsMenu.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"

View file

@ -1,4 +1,5 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_InGameInfoMenu.h"
#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_InGamePlayerOptionsMenu.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_InGameSaveManagementMenu.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_PauseMenu.h"
#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
#include "UIScene_SignEntryMenu.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_TeleportMenu.h"
#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_ConnectingProgress.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_FullscreenProgress.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_Keyboard.h"

View file

@ -1,4 +1,8 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "4J_Profile.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_MessageBox.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_QuadrantSignin.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"

View file

@ -10,10 +10,12 @@
#include "Minecraft.Client/Windows64/Iggy/include/iggy.h"
#endif
#include "4J_Storage.h"
#include "4J.Common/4J_InputActions.h"
#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIController.h"
#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h"
#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h"
#include "UIGroup.h"
class UIAbstractBitmapFont;

View file

@ -1,8 +1,6 @@
// Minecraft.cpp : Defines the entry point for the application.
//
#include "Minecraft.Client/Header Files/stdafx.h"
#include <assert.h>
#include <mutex>
// #include <system_service.h>
@ -66,7 +64,12 @@ static void sigsegv_handler(int sig) {
#include "Minecraft.World/Header Files/compression.h"
#include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
#include "Minecraft.Client/Common/App_Defines.h"
#include "4J_Input.h"
#include "4J_Profile.h"
#include "4J.Common/4J_InputActions.h"
// #include "../Orbis/Leaderboards/OrbisLeaderboardManager.h"
// #include "../Orbis/Network/Orbis_NPToolkit.h"

View file

@ -1,5 +1,3 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "WindowsLeaderboardManager.h"
LeaderboardManager* LeaderboardManager::m_instance =

View file

@ -1,7 +1,7 @@
// Minecraft.cpp : Defines the entry point for the application.
//
#include "Minecraft.Client/Header Files/stdafx.h"
#include <assert.h>
#include <mutex>

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Windows64_UIController.h"
// Temp

View file

@ -16,7 +16,6 @@
// Copyright (C) Microsoft Corporation. All rights reserved.
//-------------------------------------------------------------------------------------
#include "Minecraft.Client/Header Files/stdafx.h"
#include "ATGXmlParser.h"
#include <cstring>

View file

@ -3,6 +3,7 @@
#include <ctime>
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.h"
#include "Minecraft.Client/net/minecraft/server/level/GameMode.h"
#include "Minecraft.Client/net/minecraft/client/gui/PauseScreen.h"

View file

@ -1,4 +1,5 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Gui.h"
#include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h"
#include "Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h"
@ -35,6 +36,7 @@
#include "Minecraft.Client/net/minecraft/client/ClientConstants.h"
#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
#include "Minecraft.World/net/minecraft/util/Mth.h"
#include "4J.Common/4J_Compat.h"
ResourceLocation Gui::PUMPKIN_BLUR_LOCATION =
ResourceLocation(TN__BLUR__MISC_PUMPKINBLUR);

View file

@ -2,7 +2,7 @@
#include <memory>
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h"
#include "Minecraft.World/net/minecraft/world/inventory/AnvilMenu.h"
#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "WitherBossModel.h"
#include "Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h"
#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h"

View file

@ -1,4 +1,5 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "DragonModel.h"
#include "Minecraft.World/net/minecraft/util/Mth.h"
#include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.World/Header Files/stdafx.h"
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.World/ConsoleHelpers/PlatformTime.h"
#include "ClientConnection.h"
#include <cfloat>

View file

@ -456,9 +456,9 @@ void GameRenderer::bobView(float a) {
float bob = player->oBob + (player->bob - player->oBob) * a;
float tilt = player->oTilt + (player->tilt - player->oTilt) * a;
glTranslatef((float)sinf(b * std::numbers::pi) * bob * 0.5f,
-(float)abs(cosf(b * std::numbers::pi) * bob), 0);
-(float)std::abs(cosf(b * std::numbers::pi) * bob), 0);
glRotatef((float)sinf(b * std::numbers::pi) * bob * 3, 0, 0, 1);
glRotatef((float)abs(cosf(b * std::numbers::pi - 0.2f) * bob) * 5, 1, 0, 0);
glRotatef((float)std::abs(cosf(b * std::numbers::pi - 0.2f) * bob) * 5, 1, 0, 0);
glRotatef((float)tilt, 1, 0, 0);
}

View file

@ -1,5 +1,5 @@
#pragma once
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Culler.h"
#include "Frustum.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/net/minecraft/client/model/dragon/EnderCrystalModel.h"
#include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
#include "EnderCrystalRenderer.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.h"
#include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h"

View file

@ -1,4 +1,5 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include <cmath>
#include "EntityRenderDispatcher.h"
#include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h"
#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h"
@ -194,7 +195,8 @@ EntityRenderer* EntityRenderDispatcher::getRenderer(eINSTANCEOF e) {
if (it == renderers.end()) {
app.DebugPrintf("Couldn't find renderer for entity of type %d\n", e);
// New renderer mapping required in above table
__debugbreak();
// __debugbreak();
assert(0);
}
/* 4J - not doing this hierarchical search anymore. We need to explicitly
add renderers for any eINSTANCEOF type that we want to be able to render if

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "WitherBossRenderer.h"
#include "Minecraft.Client/net/minecraft/client/model/WitherBossModel.h"
#include "MobRenderer.h"

View file

@ -1,7 +1,7 @@
#pragma once
#include <string>
#include "Minecraft.Client/Header Files/stdafx.h"
#include "StitchedTexture.h"
// 4J Added this class to store the uv data that we have pre-calculated and

View file

@ -1,4 +1,5 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "SignRenderer.h"
#include "Minecraft.Client/net/minecraft/client/model/SignModel.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "DefaultTexturePack.h"
#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "TexturePackRepository.h"
#include "DefaultTexturePack.h"
#include "FileTexturePack.h"

View file

@ -1,5 +1,7 @@
#pragma once
#include <string>
class ConsoleInputSource {
public:
virtual ~ConsoleInputSource() {}

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
// #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
#include <ctime>

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include <cstdint>
#include "PlayerList.h"
#include "Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.h"

View file

@ -3,6 +3,8 @@
#include <deque>
#include <mutex>
#include "4J.Common/4J_Compat.h"
class ServerPlayer;
class PlayerChunkMap;
class MinecraftServer;

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "CreativeMode.h"
#include "Minecraft.Client/net/minecraft/client/User.h"
#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h"

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "DemoMode.h"
#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"

View file

@ -1,4 +1,5 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include <unordered_set>
#include "EntityTracker.h"
#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
#include "Minecraft.Client/net/minecraft/server/PlayerList.h"

View file

@ -3,9 +3,14 @@
#include "Minecraft.World/ConsoleHelpers/HashExtension.h"
#include "java/JavaIntHash.h"
#include <unordered_set>
#include <unordered_map>
#include <memory>
class Entity;
class ServerLevel;
class ServerPlayer;
class LevelChunk;
class TrackedEntity;
class MinecraftServer;
class Packet;

View file

@ -1,4 +1,4 @@
#include "Minecraft.Client/Header Files/stdafx.h"
#include "GameMode.h"
#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h"
#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h"

Some files were not shown because too many files have changed in this diff Show more