diff --git a/CMakeLists.txt b/CMakeLists.txt index 9463c877d..370feace6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,7 @@ list(TRANSFORM MINECRAFT_WORLD_SOURCES PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/Mine add_library(MinecraftWorld STATIC ${MINECRAFT_WORLD_SOURCES}) target_include_directories(MinecraftWorld PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" + "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.World" "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.World/x64headers" ) target_compile_definitions(MinecraftWorld PRIVATE diff --git a/Minecraft.Client/AbstractContainerScreen.cpp b/Minecraft.Client/AbstractContainerScreen.cpp index 9866ef1f0..7789c52b7 100644 --- a/Minecraft.Client/AbstractContainerScreen.cpp +++ b/Minecraft.Client/AbstractContainerScreen.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "AbstractContainerScreen.h" #include "ItemRenderer.h" -#include "MultiplayerLocalPlayer.h" +#include "MultiPlayerLocalPlayer.h" #include "Lighting.h" #include "GameMode.h" #include "KeyMapping.h" diff --git a/Minecraft.Client/ChatScreen.cpp b/Minecraft.Client/ChatScreen.cpp index 5b0a67c26..34ebfdd4f 100644 --- a/Minecraft.Client/ChatScreen.cpp +++ b/Minecraft.Client/ChatScreen.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ChatScreen.h" -#include "MultiplayerLocalPlayer.h" +#include "MultiPlayerLocalPlayer.h" #include #include diff --git a/Minecraft.Client/ClockTexture.cpp b/Minecraft.Client/ClockTexture.cpp index bb2e434ad..947044b1d 100644 --- a/Minecraft.Client/ClockTexture.cpp +++ b/Minecraft.Client/ClockTexture.cpp @@ -2,7 +2,7 @@ #include "Minecraft.h" #include #include -#include "MultiplayerLocalPlayer.h" +#include "MultiPlayerLocalPlayer.h" #include #include "Texture.h" #include "ClockTexture.h" diff --git a/Minecraft.Client/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Common/Audio/SoundEngine.cpp index 8b8c0e29a..9684d0862 100644 --- a/Minecraft.Client/Common/Audio/SoundEngine.cpp +++ b/Minecraft.Client/Common/Audio/SoundEngine.cpp @@ -2,10 +2,10 @@ #include "SoundEngine.h" #include -#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp b/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp index e7f71ce4a..f328b2063 100644 --- a/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp +++ b/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include -#include +#include #include "AreaConstraint.h" #include diff --git a/Minecraft.Client/Common/Tutorial/AreaHint.cpp b/Minecraft.Client/Common/Tutorial/AreaHint.cpp index d5ba9f329..20bab19df 100644 --- a/Minecraft.Client/Common/Tutorial/AreaHint.cpp +++ b/Minecraft.Client/Common/Tutorial/AreaHint.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include -#include +#include #include "AreaHint.h" #include #include "Tutorial.h" diff --git a/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp b/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp index 951108d46..5dff1aed7 100644 --- a/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp +++ b/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp @@ -2,7 +2,7 @@ #include "Tutorial.h" #include -#include +#include #include #include "ChangeStateConstraint.h" #include diff --git a/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp b/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp index 487919290..7e667b9ba 100644 --- a/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp +++ b/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include "Tutorial.h" #include "TutorialConstraints.h" #include "ChoiceTask.h" diff --git a/Minecraft.Client/Common/Tutorial/ControllerTask.cpp b/Minecraft.Client/Common/Tutorial/ControllerTask.cpp index 1b74abde9..71fbe5532 100644 --- a/Minecraft.Client/Common/Tutorial/ControllerTask.cpp +++ b/Minecraft.Client/Common/Tutorial/ControllerTask.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include "Tutorial.h" #include "TutorialConstraints.h" #include "ControllerTask.h" diff --git a/Minecraft.Client/Common/Tutorial/InfoTask.cpp b/Minecraft.Client/Common/Tutorial/InfoTask.cpp index 3119db04e..8561cd56d 100644 --- a/Minecraft.Client/Common/Tutorial/InfoTask.cpp +++ b/Minecraft.Client/Common/Tutorial/InfoTask.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include "Tutorial.h" #include "TutorialConstraints.h" #include "InfoTask.h" diff --git a/Minecraft.Client/Common/Tutorial/TutorialHint.cpp b/Minecraft.Client/Common/Tutorial/TutorialHint.cpp index bf8b1286b..e3bd2f725 100644 --- a/Minecraft.Client/Common/Tutorial/TutorialHint.cpp +++ b/Minecraft.Client/Common/Tutorial/TutorialHint.cpp @@ -5,7 +5,7 @@ #include "Tutorial.h" #include "TutorialHint.h" #include -#include +#include TutorialHint::TutorialHint(eTutorial_Hint id, Tutorial *tutorial, int descriptionId, eHintType type, bool allowFade /*= true*/) : m_id( id ), m_tutorial(tutorial), m_descriptionId( descriptionId ), m_type( type ), m_counter( 0 ), diff --git a/Minecraft.Client/Common/Tutorial/TutorialMode.cpp b/Minecraft.Client/Common/Tutorial/TutorialMode.cpp index 6819ce29b..42b3a609f 100644 --- a/Minecraft.Client/Common/Tutorial/TutorialMode.cpp +++ b/Minecraft.Client/Common/Tutorial/TutorialMode.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include #include -#include +#include #include #include #include diff --git a/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp index 097c13727..fade63080 100644 --- a/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #ifdef __ORBIS__ diff --git a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp index 8b3e27b1d..5953d76c8 100644 --- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp @@ -2,7 +2,7 @@ #include "IUIScene_CreativeMenu.h" #include -#include +#include #include #include #include diff --git a/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp index c70c7bb8c..7b434a323 100644 --- a/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include #include -#include +#include #include "IUIScene_EnchantingMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_EnchantingMenu::GetSectionAndSlotInDirection( IUIScene_AbstractContainerMenu::ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY ) diff --git a/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp b/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp index 910ad22ff..693bcba40 100644 --- a/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp +++ b/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp @@ -3,7 +3,7 @@ #include "UIComponent_TutorialPopup.h" #include #include -#include +#include #include #include diff --git a/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp b/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp index 1a67a3722..11aaf1b14 100644 --- a/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp +++ b/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp @@ -3,7 +3,7 @@ #include "UIControl_EnchantmentButton.h" #include #include -#include +#include #include UIControl_EnchantmentButton::UIControl_EnchantmentButton() diff --git a/Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp b/Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp index 24df9794a..b81fe4bcf 100644 --- a/Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp +++ b/Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp @@ -16,7 +16,7 @@ #include //#include -#include +#include #include "UI.h" #include "UIControl_MinecraftHorse.h" diff --git a/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp b/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp index dbc00be15..7659546dd 100644 --- a/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp +++ b/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include "UI.h" #include "UIControl_MinecraftPlayer.h" diff --git a/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp b/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp index bcb966fb2..b22583087 100644 --- a/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #ifdef _WINDOWS64 #include #endif diff --git a/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp index 8be40f9b3..999f574aa 100644 --- a/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp @@ -2,7 +2,7 @@ #include "UI.h" #include "UIScene_ControlsMenu.h" #include -#include +#include UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp index 63ec98a09..9396f0e12 100644 --- a/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "UI.h" #include -#include +#include #include #include "UIScene_CraftingMenu.h" diff --git a/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp index df0ad0dff..46b0982fe 100644 --- a/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp @@ -3,7 +3,7 @@ #include "UIScene_DeathMenu.h" #include "IUIScene_PauseMenu.h" #include -#include +#include UIScene_DeathMenu::UIScene_DeathMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { diff --git a/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp b/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp index 7a067ffa2..0700e0848 100644 --- a/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp +++ b/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp @@ -3,7 +3,7 @@ #include "UIScene_EndPoem.h" #include "UIBitmapFont.h" #include -#include +#include #include UIScene_EndPoem::UIScene_EndPoem(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) diff --git a/Minecraft.Client/Common/UI/UIScene_HUD.cpp b/Minecraft.Client/Common/UI/UIScene_HUD.cpp index f686afd4f..906110209 100644 --- a/Minecraft.Client/Common/UI/UIScene_HUD.cpp +++ b/Minecraft.Client/Common/UI/UIScene_HUD.cpp @@ -3,7 +3,7 @@ #include "UIScene_HUD.h" #include "BossMobGuiInfo.h" #include -#include +#include #include #include #include diff --git a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp index 02e383c03..7433f7cd1 100644 --- a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp b/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp index 31597537e..7f4a8e5f3 100644 --- a/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp @@ -2,7 +2,7 @@ #include "UI.h" #include "UIScene_PauseMenu.h" #include -#include +#include #include #include #include diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_4JEdit.h b/Minecraft.Client/Common/XUI/XUI_Ctrl_4JEdit.h index f6899d192..823f6d19f 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_4JEdit.h +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_4JEdit.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #define XUI_4JEDIT_MAX_CHARS 61 diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_CraftIngredientSlot.h b/Minecraft.Client/Common/XUI/XUI_Ctrl_CraftIngredientSlot.h index 5cf7a7f41..375e3b894 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_CraftIngredientSlot.h +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_CraftIngredientSlot.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include //----------------------------------------------------------------------------- diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp index c1a4b1d5f..f37ecabf9 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include "XUI_Ctrl_MinecraftPlayer.h" #include "XUI_Scene_AbstractContainer.h" #include "XUI_Scene_Inventory.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.h b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.h index fa28d6b83..78760c492 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.h +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include using namespace std; diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h index b751ebcc9..404e15a21 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include //#include #include diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.h b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.h index 5dafec53a..f941fae8b 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.h +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include using namespace std; diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_PassThroughList.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_PassThroughList.cpp index d00762b83..cc34326cc 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_PassThroughList.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_PassThroughList.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "XUI_Ctrl_PassThroughList.h" +#include "XUI_Ctrl_PassthroughList.h" HRESULT CXuiCtrlPassThroughList::OnInit(XUIMessageInit *pInitData, BOOL& bHandled) { diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_SplashPulser.h b/Minecraft.Client/Common/XUI/XUI_Ctrl_SplashPulser.h index 504cf4c5a..e001f7cd3 100644 --- a/Minecraft.Client/Common/XUI/XUI_Ctrl_SplashPulser.h +++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_SplashPulser.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include using namespace std; diff --git a/Minecraft.Client/Common/XUI/XUI_Death.cpp b/Minecraft.Client/Common/XUI/XUI_Death.cpp index df6d3639e..d1f1bae89 100644 --- a/Minecraft.Client/Common/XUI/XUI_Death.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Death.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Minecraft.Client/Common/XUI/XUI_Death.h b/Minecraft.Client/Common/XUI/XUI_Death.h index c7c886096..c5b4abdc9 100644 --- a/Minecraft.Client/Common/XUI/XUI_Death.h +++ b/Minecraft.Client/Common/XUI/XUI_Death.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "XUI_CustomMessages.h" #define BUTTON_DEATH_RESPAWN 0 diff --git a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp index 44fc46b36..8373ef700 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp +++ b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include -#include -#include +#include +#include #include #include #include diff --git a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp index 6df23f0fa..6606b5704 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp +++ b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp @@ -6,7 +6,7 @@ // #include #include -#include +#include #ifndef _CONTENT_PACKAGE HRESULT CScene_DebugSetCamera::OnInit( XUIMessageInit *pInitData, BOOL &bHandled ) diff --git a/Minecraft.Client/Common/XUI/XUI_DebugTips.h b/Minecraft.Client/Common/XUI/XUI_DebugTips.h index b3e5cf446..067e6376b 100644 --- a/Minecraft.Client/Common/XUI/XUI_DebugTips.h +++ b/Minecraft.Client/Common/XUI/XUI_DebugTips.h @@ -1,6 +1,6 @@ #pragma once -#include +#include diff --git a/Minecraft.Client/Common/XUI/XUI_HUD.cpp b/Minecraft.Client/Common/XUI/XUI_HUD.cpp index e4a514ed3..baf6be526 100644 --- a/Minecraft.Client/Common/XUI/XUI_HUD.cpp +++ b/Minecraft.Client/Common/XUI/XUI_HUD.cpp @@ -2,7 +2,7 @@ #include "XUI_HUD.h" #include #include -#include +#include #include #include #include diff --git a/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp b/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp index 09c4516d1..8443392ad 100644 --- a/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp +++ b/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #define ALIGN_START 0 #define ALIGN_END 1 diff --git a/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp b/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp index de8780801..b6865bfc8 100644 --- a/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp +++ b/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Minecraft.Client/Common/XUI/XUI_PauseMenu.h b/Minecraft.Client/Common/XUI/XUI_PauseMenu.h index 1e01a4bb1..8299bc412 100644 --- a/Minecraft.Client/Common/XUI/XUI_PauseMenu.h +++ b/Minecraft.Client/Common/XUI/XUI_PauseMenu.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #include #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Reinstall.h b/Minecraft.Client/Common/XUI/XUI_Reinstall.h index cf1d56b52..148e50704 100644 --- a/Minecraft.Client/Common/XUI/XUI_Reinstall.h +++ b/Minecraft.Client/Common/XUI/XUI_Reinstall.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #define BUTTON_REINSTALL_THEME 0 #define BUTTON_REINSTALL_GAMERPIC1 1 diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp index 869b01fcd..565962162 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include -#include -#include +#include +#include #include #include #include diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp index 4759d7006..995c22ad5 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include "XUI_Ctrl_SlotList.h" #include "XUI_Scene_Container.h" #include "XUI_Ctrl_SlotItemListItem.h" diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp index 5da263a9e..2536d99a9 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp @@ -4,7 +4,7 @@ #include "stdafx.h" #include -#include +#include #include #include #include diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp index 13da509ca..a11ff453c 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp @@ -6,7 +6,7 @@ #include //#include -#include +#include #include #include #include diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp index 6dae28116..e3687d4b6 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include -#include +#include #include #include #include diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp index b0ff5894b..d5393406f 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp index 7c3840b59..6bf50c21d 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include @@ -20,7 +20,7 @@ #include "XUI_Ctrl_SlotList.h" #include "XUI_Ctrl_SlotItemListItem.h" -#include +#include //-------------------------------------------------------------------------------------- // Name: CXuiSceneInventoryCreative::OnInit diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp index 5c201c1e2..5a31f4195 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include "XUI_Ctrl_SlotList.h" #include "XUI_Scene_Trap.h" #include diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp index c2dd7a6c8..7c50aa3bc 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include "XUI_Scene_Win.h" BYTE CScene_Win::s_winUserIndex = 0; diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Win.h b/Minecraft.Client/Common/XUI/XUI_Scene_Win.h index 12c318510..cf392befe 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_Win.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_Win.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "XUI_CustomMessages.h" class CScene_Win : public CXuiSceneImpl diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsAll.h b/Minecraft.Client/Common/XUI/XUI_SettingsAll.h index fcaa8b95d..d0ec42ff7 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsAll.h +++ b/Minecraft.Client/Common/XUI/XUI_SettingsAll.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "XUI_Ctrl_SliderWrapper.h" #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsAudio.h b/Minecraft.Client/Common/XUI/XUI_SettingsAudio.h index bcee315a7..7761f909a 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsAudio.h +++ b/Minecraft.Client/Common/XUI/XUI_SettingsAudio.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "XUI_Ctrl_SliderWrapper.h" #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsControl.h b/Minecraft.Client/Common/XUI/XUI_SettingsControl.h index 16bfe94a5..dc6f8e1ae 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsControl.h +++ b/Minecraft.Client/Common/XUI/XUI_SettingsControl.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "XUI_Ctrl_SliderWrapper.h" #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.h b/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.h index c3164e953..0e84fbf88 100644 --- a/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.h +++ b/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "XUI_Ctrl_SliderWrapper.h" #include "XUI_CustomMessages.h" diff --git a/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp b/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp index 07192aebb..6341a69e5 100644 --- a/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp +++ b/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include +#include #include #include #include diff --git a/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp b/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp index d33712629..04edcf993 100644 --- a/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp +++ b/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "XUI_TextEntry.h" -#include +#include CScene_TextEntry::CommandParams CScene_TextEntry::CommandA[CScene_TextEntry::eCommand_MAX]= diff --git a/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp b/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp index d972f426c..2f340a846 100644 --- a/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp +++ b/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include -#include +#include #include #include #include diff --git a/Minecraft.Client/CompassTexture.cpp b/Minecraft.Client/CompassTexture.cpp index fb21a9cb2..d741602bf 100644 --- a/Minecraft.Client/CompassTexture.cpp +++ b/Minecraft.Client/CompassTexture.cpp @@ -2,7 +2,7 @@ #include "Minecraft.h" #include #include -#include "MultiplayerLocalPlayer.h" +#include "MultiPlayerLocalPlayer.h" #include #include "Texture.h" #include "CompassTexture.h" diff --git a/Minecraft.Client/CraftingScreen.cpp b/Minecraft.Client/CraftingScreen.cpp index 45b3afde7..1dae770a0 100644 --- a/Minecraft.Client/CraftingScreen.cpp +++ b/Minecraft.Client/CraftingScreen.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "CraftingScreen.h" #include "Textures.h" -#include "MultiplayerLocalPlayer.h" +#include "MultiPlayerLocalPlayer.h" #include CraftingScreen::CraftingScreen(shared_ptr inventory, Level *level, int x, int y, int z) : AbstractContainerScreen(new CraftingMenu(inventory, level, x, y, z)) diff --git a/Minecraft.Client/Cross64/Cross64Extras/Cross64Stubs.cpp b/Minecraft.Client/Cross64/Cross64Extras/Cross64Stubs.cpp deleted file mode 100644 index 1577c4e3b..000000000 --- a/Minecraft.Client/Cross64/Cross64Extras/Cross64Stubs.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "stdafx.h" \ No newline at end of file diff --git a/Minecraft.Client/DeathScreen.cpp b/Minecraft.Client/DeathScreen.cpp index 0a29529bd..7ab6fe653 100644 --- a/Minecraft.Client/DeathScreen.cpp +++ b/Minecraft.Client/DeathScreen.cpp @@ -2,7 +2,7 @@ #include #include "DeathScreen.h" #include "Button.h" -#include "MultiplayerLocalPlayer.h" +#include "MultiPlayerLocalPlayer.h" #include "TitleScreen.h" void DeathScreen::init() diff --git a/Minecraft.Client/DragonModel.cpp b/Minecraft.Client/DragonModel.cpp index e4688ce48..6d3a68607 100644 --- a/Minecraft.Client/DragonModel.cpp +++ b/Minecraft.Client/DragonModel.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "DragonModel.h" #include -#include +#include DragonModel::DragonModel(float g) : Model() { diff --git a/Minecraft.Client/EntityRenderDispatcher.cpp b/Minecraft.Client/EntityRenderDispatcher.cpp index c4ab679d3..00b0c4eeb 100644 --- a/Minecraft.Client/EntityRenderDispatcher.cpp +++ b/Minecraft.Client/EntityRenderDispatcher.cpp @@ -44,7 +44,7 @@ #include "ExperienceOrbRenderer.h" #include "SilverfishRenderer.h" #include "MushroomCowRenderer.h" -#include "SnowmanRenderer.h" +#include "SnowManRenderer.h" #include "LavaSlimeRenderer.h" #include "VillagerRenderer.h" #include "EnderDragonRenderer.h" diff --git a/Minecraft.Client/GameRenderer.cpp b/Minecraft.Client/GameRenderer.cpp index 5b90e7b68..0fcd1e7bb 100644 --- a/Minecraft.Client/GameRenderer.cpp +++ b/Minecraft.Client/GameRenderer.cpp @@ -13,7 +13,7 @@ #include "CreativeMode.h" #include "Lighting.h" #include "Options.h" -#include "MultiplayerLocalPlayer.h" +#include "MultiPlayerLocalPlayer.h" #include "GuiParticles.h" #include "MultiPlayerLevel.h" #include "Chunk.h" diff --git a/Minecraft.Client/Gui.cpp b/Minecraft.Client/Gui.cpp index a786e86c7..4635ea2c6 100644 --- a/Minecraft.Client/Gui.cpp +++ b/Minecraft.Client/Gui.cpp @@ -3,7 +3,7 @@ #include "ItemRenderer.h" #include "GameRenderer.h" #include "Options.h" -#include "MultiplayerLocalPlayer.h" +#include "MultiPlayerLocalPlayer.h" #include "Textures.h" #include "TextureAtlas.h" #include "GameMode.h" diff --git a/Minecraft.Client/InBedChatScreen.cpp b/Minecraft.Client/InBedChatScreen.cpp index ac36b2773..40f8bf064 100644 --- a/Minecraft.Client/InBedChatScreen.cpp +++ b/Minecraft.Client/InBedChatScreen.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "InBedChatScreen.h" #include "Button.h" -#include "MultiplayerLocalPlayer.h" +#include "MultiPlayerLocalPlayer.h" #include #include diff --git a/Minecraft.Client/InventoryScreen.cpp b/Minecraft.Client/InventoryScreen.cpp index 9c2eef348..344f3eee4 100644 --- a/Minecraft.Client/InventoryScreen.cpp +++ b/Minecraft.Client/InventoryScreen.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "InventoryScreen.h" -#include "MultiplayerLocalPlayer.h" +#include "MultiPlayerLocalPlayer.h" #include "Font.h" #include "EntityRenderDispatcher.h" #include "Lighting.h" diff --git a/Minecraft.Client/ItemFrameRenderer.cpp b/Minecraft.Client/ItemFrameRenderer.cpp index 534968c3b..100881653 100644 --- a/Minecraft.Client/ItemFrameRenderer.cpp +++ b/Minecraft.Client/ItemFrameRenderer.cpp @@ -1,15 +1,15 @@ #include "stdafx.h" #include "ItemRenderer.h" -#include "tileRenderer.h" -#include "entityRenderDispatcher.h" +#include "TileRenderer.h" +#include "EntityRenderDispatcher.h" //#include #include "ItemFrameRenderer.h" #include "TextureAtlas.h" #include -#include -#include -#include +#include +#include +#include #include #include #include "Minecraft.h" diff --git a/Minecraft.Client/ItemInHandRenderer.cpp b/Minecraft.Client/ItemInHandRenderer.cpp index 0508bf3a4..a82163d22 100644 --- a/Minecraft.Client/ItemInHandRenderer.cpp +++ b/Minecraft.Client/ItemInHandRenderer.cpp @@ -8,7 +8,7 @@ #include "PlayerRenderer.h" #include "EntityRenderDispatcher.h" #include "Lighting.h" -#include "MultiplayerLocalPlayer.h" +#include "MultiPlayerLocalPlayer.h" #include "Minimap.h" #include "MultiPlayerLevel.h" #include diff --git a/Minecraft.Client/ItemRenderer.cpp b/Minecraft.Client/ItemRenderer.cpp index 07e6d3dca..0c4b942b6 100644 --- a/Minecraft.Client/ItemRenderer.cpp +++ b/Minecraft.Client/ItemRenderer.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "ItemRenderer.h" #include "TileRenderer.h" -#include "entityRenderDispatcher.h" +#include "EntityRenderDispatcher.h" #include #include #include diff --git a/Minecraft.Client/LevelRenderer.cpp b/Minecraft.Client/LevelRenderer.cpp index 93c22d186..d78061846 100644 --- a/Minecraft.Client/LevelRenderer.cpp +++ b/Minecraft.Client/LevelRenderer.cpp @@ -56,7 +56,7 @@ #include #include #include -#include "MultiplayerLocalPlayer.h" +#include "MultiPlayerLocalPlayer.h" #include "MultiPlayerLevel.h" #include #include "FrustumCuller.h" diff --git a/Minecraft.Client/LocalPlayer.cpp b/Minecraft.Client/LocalPlayer.cpp index 646766580..f3970a7d7 100644 --- a/Minecraft.Client/LocalPlayer.cpp +++ b/Minecraft.Client/LocalPlayer.cpp @@ -37,9 +37,9 @@ #include "CritParticle.h" // 4J : WESTY : Added for new achievements. -#include -#include -#include +#include +#include +#include // 4J Stu - Added for tutorial callbacks #include "Minecraft.h" diff --git a/Minecraft.Client/MobRenderer.cpp b/Minecraft.Client/MobRenderer.cpp index 09e730db2..b79a832ca 100644 --- a/Minecraft.Client/MobRenderer.cpp +++ b/Minecraft.Client/MobRenderer.cpp @@ -7,7 +7,7 @@ #include #include #include -#include "entityRenderDispatcher.h" +#include "EntityRenderDispatcher.h" MobRenderer::MobRenderer(Model *model, float shadow) : LivingEntityRenderer(model, shadow) { diff --git a/Minecraft.Client/MultiPlayerLocalPlayer.cpp b/Minecraft.Client/MultiPlayerLocalPlayer.cpp index daf0ad5ab..e2e02cb4e 100644 --- a/Minecraft.Client/MultiPlayerLocalPlayer.cpp +++ b/Minecraft.Client/MultiPlayerLocalPlayer.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" //#include -#include "MultiplayerLocalPlayer.h" +#include "MultiPlayerLocalPlayer.h" #include "ClientConnection.h" #include #include diff --git a/Minecraft.Client/PaintingRenderer.cpp b/Minecraft.Client/PaintingRenderer.cpp index 4c493f7d8..3e2bfdecc 100644 --- a/Minecraft.Client/PaintingRenderer.cpp +++ b/Minecraft.Client/PaintingRenderer.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "PaintingRenderer.h" -#include "entityRenderDispatcher.h" +#include "EntityRenderDispatcher.h" #include #include #include diff --git a/Minecraft.Client/PendingConnection.cpp b/Minecraft.Client/PendingConnection.cpp index da885ab11..94af0c01f 100644 --- a/Minecraft.Client/PendingConnection.cpp +++ b/Minecraft.Client/PendingConnection.cpp @@ -8,7 +8,7 @@ #include "PlayerList.h" #include "MinecraftServer.h" #include -#include +#include #include #include #include diff --git a/Minecraft.Client/PlayerRenderer.cpp b/Minecraft.Client/PlayerRenderer.cpp index 94f080124..cb73ae2c3 100644 --- a/Minecraft.Client/PlayerRenderer.cpp +++ b/Minecraft.Client/PlayerRenderer.cpp @@ -6,7 +6,7 @@ #include "ModelPart.h" #include "LocalPlayer.h" #include "MultiPlayerLocalPlayer.h" -#include "entityRenderDispatcher.h" +#include "EntityRenderDispatcher.h" #include #include #include diff --git a/Minecraft.Client/SnowManModel.cpp b/Minecraft.Client/SnowManModel.cpp index e21fa7fc3..5252b2922 100644 --- a/Minecraft.Client/SnowManModel.cpp +++ b/Minecraft.Client/SnowManModel.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "SnowmanModel.h" +#include "SnowManModel.h" #include #include "ModelPart.h" diff --git a/Minecraft.Client/StringTable.cpp b/Minecraft.Client/StringTable.cpp index a29da1794..0605c27a7 100644 --- a/Minecraft.Client/StringTable.cpp +++ b/Minecraft.Client/StringTable.cpp @@ -1,4 +1,4 @@ -#include "StdAfx.h" +#include "stdafx.h" #include "StringTable.h" StringTable::StringTable(void) diff --git a/Minecraft.Client/Vertex.cpp b/Minecraft.Client/Vertex.cpp index 138987296..88452a4f8 100644 --- a/Minecraft.Client/Vertex.cpp +++ b/Minecraft.Client/Vertex.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "vertex.h" +#include "Vertex.h" Vertex::Vertex(float x, float y, float z, float u, float v) { diff --git a/Minecraft.Client/ViewportCuller.h b/Minecraft.Client/ViewportCuller.h index 318d3861c..6b2574dc4 100644 --- a/Minecraft.Client/ViewportCuller.h +++ b/Minecraft.Client/ViewportCuller.h @@ -1,6 +1,6 @@ #pragma once #include "Culler.h" -#include +#include class Mob; class ViewportCuller : public Culler diff --git a/Minecraft.Client/stdafx.h b/Minecraft.Client/stdafx.h index baa0a9a68..070e11d1f 100644 --- a/Minecraft.Client/stdafx.h +++ b/Minecraft.Client/stdafx.h @@ -160,7 +160,7 @@ typedef XUID GameSessionUID; #endif #include -#include +#include #include #include #include @@ -171,7 +171,7 @@ typedef XUID GameSessionUID; #include #include #include - #include + #include #include #elif defined (__PS3__) @@ -221,7 +221,7 @@ typedef XUID GameSessionUID; #include #endif -#include +#include #include #include // #ifdef _XBOX diff --git a/Minecraft.World/ClothDyeRecipes.cpp b/Minecraft.World/ClothDyeRecipes.cpp index c0625d2e1..c65994660 100644 --- a/Minecraft.World/ClothDyeRecipes.cpp +++ b/Minecraft.World/ClothDyeRecipes.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "net.minecraft.world.Item.h" +#include "net.minecraft.world.item.h" #include "net.minecraft.world.level.tile.h" #include "Recipy.h" #include "Recipes.h" diff --git a/Minecraft.World/Dimension.cpp b/Minecraft.World/Dimension.cpp index ea4d0e0e1..6c44d364b 100644 --- a/Minecraft.World/Dimension.cpp +++ b/Minecraft.World/Dimension.cpp @@ -3,7 +3,7 @@ #include "net.minecraft.world.level.levelgen.h" #include "net.minecraft.world.level.h" #include "net.minecraft.world.level.storage.h" -#include "dimension.h" +#include "Dimension.h" #include "BiomeSource.h" #include "FixedBiomeSource.h" #include "OldChunkStorage.h" diff --git a/Minecraft.World/Entity.cpp b/Minecraft.World/Entity.cpp index db7e3dd9c..0ef9b12c1 100644 --- a/Minecraft.World/Entity.cpp +++ b/Minecraft.World/Entity.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/Minecraft.World/FireChargeItem.cpp b/Minecraft.World/FireChargeItem.cpp index 7a865ff5e..ea5b59f1e 100644 --- a/Minecraft.World/FireChargeItem.cpp +++ b/Minecraft.World/FireChargeItem.cpp @@ -6,7 +6,7 @@ #include "net.minecraft.world.h" #include "SoundTypes.h" #include "FireChargeItem.h" -#include "tile.h" +#include "Tile.h" FireChargeItem::FireChargeItem(int id) : Item(id) { diff --git a/Minecraft.World/GlowstoneTile.cpp b/Minecraft.World/GlowstoneTile.cpp index dba4ce919..5add7c258 100644 --- a/Minecraft.World/GlowstoneTile.cpp +++ b/Minecraft.World/GlowstoneTile.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "Glowstonetile.h" +#include "GlowstoneTile.h" #include "net.minecraft.world.item.h" Glowstonetile::Glowstonetile(int id, Material *material) : Tile(id, material) diff --git a/Minecraft.World/HangingEntityItem.h b/Minecraft.World/HangingEntityItem.h index d0e828978..6c1a641d4 100644 --- a/Minecraft.World/HangingEntityItem.h +++ b/Minecraft.World/HangingEntityItem.h @@ -1,6 +1,6 @@ #pragma once -#include "item.h" +#include "Item.h" class HangingEntity; diff --git a/Minecraft.World/Level.h b/Minecraft.World/Level.h index fbf41301f..3d341f42e 100644 --- a/Minecraft.World/Level.h +++ b/Minecraft.World/Level.h @@ -7,7 +7,7 @@ using namespace std; #include "SavedData.h" #include "Definitions.h" #include "ParticleTypes.h" -#include "biome.h" +#include "Biome.h" #include "C4JThread.h" #ifdef __PSVITA__ diff --git a/Minecraft.World/NetherBridgeFeature.h b/Minecraft.World/NetherBridgeFeature.h index 2fd1701a1..d638e82bc 100644 --- a/Minecraft.World/NetherBridgeFeature.h +++ b/Minecraft.World/NetherBridgeFeature.h @@ -1,7 +1,7 @@ #pragma once #include "StructureFeature.h" #include "StructureStart.h" -#include "biome.h" +#include "Biome.h" class Random; class NetherBridgeFeature : public StructureFeature diff --git a/Minecraft.World/Path.cpp b/Minecraft.World/Path.cpp index 538917f6f..ff8a641ad 100644 --- a/Minecraft.World/Path.cpp +++ b/Minecraft.World/Path.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "net.minecraft.world.entity.h" #include "net.minecraft.world.level.pathfinder.h" -#include "path.h" +#include "Path.h" Path::~Path() { diff --git a/Minecraft.World/PreLoginPacket.cpp b/Minecraft.World/PreLoginPacket.cpp index 4b4742141..e007d3a2c 100644 --- a/Minecraft.World/PreLoginPacket.cpp +++ b/Minecraft.World/PreLoginPacket.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include #include "PacketListener.h" -#include "PreloginPacket.h" +#include "PreLoginPacket.h" #include "InputOutputStream.h" diff --git a/Minecraft.World/RedStoneItem.cpp b/Minecraft.World/RedStoneItem.cpp index 3d8ee453c..6e12842ad 100644 --- a/Minecraft.World/RedStoneItem.cpp +++ b/Minecraft.World/RedStoneItem.cpp @@ -4,7 +4,7 @@ #include "net.minecraft.world.level.tile.h" #include "ItemInstance.h" #include "GenericStats.h" -#include "RedstoneItem.h" +#include "RedStoneItem.h" RedStoneItem::RedStoneItem(int id) : Item(id) { diff --git a/Minecraft.World/TileItem.cpp b/Minecraft.World/TileItem.cpp index ce313dd6c..0ca13e55e 100644 --- a/Minecraft.World/TileItem.cpp +++ b/Minecraft.World/TileItem.cpp @@ -10,7 +10,7 @@ using namespace std; #include "net.minecraft.world.h" #include "net.minecraft.stats.h" #include "TileItem.h" -#include "facing.h" +#include "Facing.h" // 4J-PB - for the debug option of not removing items #include diff --git a/Minecraft.World/WoodSlabTile.cpp b/Minecraft.World/WoodSlabTile.cpp index ba3a98e50..d7a0e9e10 100644 --- a/Minecraft.World/WoodSlabTile.cpp +++ b/Minecraft.World/WoodSlabTile.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "WoodSlabTile.h" -#include "woodtile.h" -#include "treetile.h" +#include "WoodTile.h" +#include "TreeTile.h" #include "net.minecraft.world.level.h" #include "net.minecraft.world.level.biome.h" #include "net.minecraft.world.item.h" diff --git a/Minecraft.World/net.minecraft.world.item.h b/Minecraft.World/net.minecraft.world.item.h index 76a10bed6..71844b815 100644 --- a/Minecraft.World/net.minecraft.world.item.h +++ b/Minecraft.World/net.minecraft.world.item.h @@ -34,7 +34,7 @@ #include "ShearsItem.h" #include "ShovelItem.h" #include "SignItem.h" -#include "SnowBallItem.h" +#include "SnowballItem.h" #include "StoneSlabTileItem.h" #include "TileItem.h" #include "TilePlanterItem.h" diff --git a/Minecraft.World/net.minecraft.world.level.tile.h b/Minecraft.World/net.minecraft.world.level.tile.h index 36c7ac5c6..fb94ddf34 100644 --- a/Minecraft.World/net.minecraft.world.level.tile.h +++ b/Minecraft.World/net.minecraft.world.level.tile.h @@ -44,7 +44,7 @@ #include "FlowerPotTile.h" #include "FurnaceTile.h" #include "GlassTile.h" -#include "Glowstonetile.h" +#include "GlowstoneTile.h" #include "GrassTile.h" #include "GravelTile.h" #include "HalfSlabTile.h" diff --git a/Minecraft.World/stdafx.h b/Minecraft.World/stdafx.h index ef2688b91..4e261707e 100644 --- a/Minecraft.World/stdafx.h +++ b/Minecraft.World/stdafx.h @@ -156,7 +156,7 @@ void MemSect(int sect); #ifdef _XBOX #include #include -#include +#include #include #include #elif defined (__PS3__) @@ -189,7 +189,7 @@ void MemSect(int sect); #include // #ifdef _XBOX -#include +#include #include #include #include