TestUser/MinecraftConsoles
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

major: Switch to forward slashes(+more) to fix compilation on Linux (#1403)

Browse Source 
Notably also adds some metadata files for NixOS 

* add support for linux clang cross compiles

* add linux clang instructions

* un-capitalize Mob.horse.*

* update the description in flake.nix

---------

Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
Riley M.
2026-04-14 16:47:37 -05:00
committed by GitHub
parent f78dec6e00
commit c0da06e4ee
874 changed files with 4256 additions and 3544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Minecraft.Client/Common/XUI/SlotProgressControl.cpp
View File

@@ -1,7 +1,7 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\Slot.h"
#include "..\..\..\Minecraft.World\ItemInstance.h"
#include "../../../Minecraft.World/Slot.h"
#include "../../../Minecraft.World/ItemInstance.h"
#include "SlotItemControlBase.h"
#include "SlotProgressControl.h"

4
Minecraft.Client/Common/XUI/XUI_Chat.cpp
View File

@@ -1,7 +1,7 @@
#include "stdafx.h"
#include "XUI_Chat.h"
#include "..\..\Minecraft.h"
#include "..\..\Gui.h"
#include "../../Minecraft.h"
#include "../../Gui.h"
HRESULT CScene_Chat::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
{

4
Minecraft.Client/Common/XUI/XUI_ConnectingProgress.cpp
View File

@@ -4,8 +4,8 @@
#include "stdafx.h"
#include <assert.h>
#include "..\..\Minecraft.h"
#include "..\..\..\Minecraft.World\DisconnectPacket.h"
#include "../../Minecraft.h"
#include "../../../Minecraft.World/DisconnectPacket.h"
//----------------------------------------------------------------------------------
// Performs initialization tasks - retrieves controls.

2
Minecraft.Client/Common/XUI/XUI_Control_ComboBox.cpp
View File

@@ -1,6 +1,6 @@
#include "stdafx.h"
#include "XUI_Control_ComboBox.h"
#include "..\Xbox_App.h"
#include "../Xbox_App.h"
HRESULT CXuiControl4JComboBox::OnInit(XUIMessageInit *pInitData, BOOL& bHandled)
{

6
Minecraft.Client/Common/XUI/XUI_Ctrl_BrewProgress.cpp
View File

@@ -1,8 +1,8 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
#include "..\..\..\Minecraft.World\SharedConstants.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.alchemy.h"
#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
#include "../../../Minecraft.World/SharedConstants.h"
#include "../../../Minecraft.World/net.minecraft.world.item.alchemy.h"
#include "XUI_Ctrl_BrewProgress.h"
int CXuiCtrlBrewProgress::GetValue()

2
Minecraft.Client/Common/XUI/XUI_Ctrl_BubblesProgress.cpp
View File

@@ -1,6 +1,6 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
#include "XUI_Ctrl_BubblesProgress.h"
int CXuiCtrlBubblesProgress::GetValue()

4
Minecraft.Client/Common/XUI/XUI_Ctrl_BurnProgress.cpp
View File

@@ -1,7 +1,7 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\FurnaceMenu.h"
#include "..\..\..\Minecraft.World\FurnaceTileEntity.h"
#include "../../../Minecraft.World/FurnaceMenu.h"
#include "../../../Minecraft.World/FurnaceTileEntity.h"
#include "XUI_Scene_Furnace.h"
#include "XUI_Ctrl_BurnProgress.h"

2
Minecraft.Client/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp
View File

@@ -1,7 +1,7 @@
#include "stdafx.h"
#include "XUI_Ctrl_CraftIngredientSlot.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
#include "../../../Minecraft.World/net.minecraft.world.item.h"
//-----------------------------------------------------------------------------
// CXuiCtrlMinecraftSlot class

10
Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantButton.cpp
View File

@@ -1,9 +1,9 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "..\..\Font.h"
#include "..\..\Lighting.h"
#include "..\..\MultiPlayerLocalPlayer.h"
#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
#include "../../../Minecraft.World/StringHelpers.h"
#include "../../Font.h"
#include "../../Lighting.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "XUI_Scene_Enchant.h"
#include "XUI_Ctrl_EnchantButton.h"

22
Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp
View File

@@ -1,21 +1,21 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
#include "../../../Minecraft.World/net.minecraft.world.item.h"
#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
#include "..\..\Minecraft.h"
#include "..\..\ScreenSizeCalculator.h"
#include "..\..\TileEntityRenderDispatcher.h"
#include "..\..\EnchantTableRenderer.h"
#include "..\..\Lighting.h"
#include "..\..\LocalPlayer.h"
#include "../../Minecraft.h"
#include "../../ScreenSizeCalculator.h"
#include "../../TileEntityRenderDispatcher.h"
#include "../../EnchantTableRenderer.h"
#include "../../Lighting.h"
#include "../../LocalPlayer.h"
#include "XUI_Scene_Enchant.h"
#include "XUI_Ctrl_EnchantmentBook.h"
#include "..\..\BookModel.h"
#include "..\..\Options.h"
#include "../../BookModel.h"
#include "../../Options.h"
//-----------------------------------------------------------------------------
// CXuiCtrlEnchantmentBook class

2
Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.h
View File

@@ -1,5 +1,5 @@
#pragma once
#include "..\..\..\Minecraft.World\Random.h"
#include "../../../Minecraft.World/Random.h"
using namespace std;

16
Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp
View File

@@ -1,15 +1,15 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "..\..\Font.h"
#include "..\..\Lighting.h"
#include "..\..\MultiPlayerLocalPlayer.h"
#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
#include "../../../Minecraft.World/StringHelpers.h"
#include "../../Font.h"
#include "../../Lighting.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "XUI_Scene_Enchant.h"
#include "XUI_Ctrl_EnchantButton.h"
#include "XUI_Ctrl_EnchantmentButtonText.h"
#include "..\..\Minecraft.h"
#include "..\..\TexturePackRepository.h"
#include "..\..\TexturePack.h"
#include "../../Minecraft.h"
#include "../../TexturePackRepository.h"
#include "../../TexturePack.h"
#include <iostream>
#include <string>

4
Minecraft.Client/Common/XUI/XUI_Ctrl_FireProgress.cpp
View File

@@ -1,7 +1,7 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\FurnaceMenu.h"
#include "..\..\..\Minecraft.World\FurnaceTileEntity.h"
#include "../../../Minecraft.World/FurnaceMenu.h"
#include "../../../Minecraft.World/FurnaceTileEntity.h"
#include "XUI_Scene_Furnace.h"
#include "XUI_Ctrl_FireProgress.h"

4
Minecraft.Client/Common/XUI/XUI_Ctrl_LoadingProgress.cpp
View File

@@ -1,8 +1,8 @@
#include "stdafx.h"
#include "XUI_Ctrl_LoadingProgress.h"
#include "..\..\Minecraft.h"
#include "..\..\ProgressRenderer.h"
#include "../../Minecraft.h"
#include "../../ProgressRenderer.h"
int CXuiCtrlLoadingProgress::GetValue()
{

12
Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp
View File

@@ -1,13 +1,13 @@
#include "stdafx.h"
#include "..\..\Minecraft.h"
#include "..\..\ScreenSizeCalculator.h"
#include "..\..\EntityRenderDispatcher.h"
#include "..\..\Lighting.h"
#include "..\..\MultiplayerLocalPlayer.h"
#include "../../Minecraft.h"
#include "../../ScreenSizeCalculator.h"
#include "../../EntityRenderDispatcher.h"
#include "../../Lighting.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "XUI_Ctrl_MinecraftPlayer.h"
#include "XUI_Scene_AbstractContainer.h"
#include "XUI_Scene_Inventory.h"
#include "..\..\Options.h"
#include "../../Options.h"
//-----------------------------------------------------------------------------
// CXuiCtrlMinecraftPlayer class

22
Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp
View File

@@ -1,18 +1,18 @@
#include "stdafx.h"
#include "..\..\Minecraft.h"
#include "..\..\ScreenSizeCalculator.h"
#include "..\..\EntityRenderDispatcher.h"
#include "..\..\PlayerRenderer.h"
#include "..\..\HumanoidModel.h"
#include "..\..\Lighting.h"
#include "..\..\..\Minecraft.World\Class.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
#include "../../Minecraft.h"
#include "../../ScreenSizeCalculator.h"
#include "../../EntityRenderDispatcher.h"
#include "../../PlayerRenderer.h"
#include "../../HumanoidModel.h"
#include "../../Lighting.h"
#include "../../../Minecraft.World/Class.h"
#include "../../../Minecraft.World/net.minecraft.world.entity.player.h"
#include "XUI_Ctrl_MinecraftSkinPreview.h"
#include "XUI_Scene_AbstractContainer.h"
#include "XUI_Scene_Inventory.h"
#include "..\..\Options.h"
#include "..\..\stubs.h"
#include "..\..\ModelPart.h"
#include "../../Options.h"
#include "../../stubs.h"
#include "../../ModelPart.h"
//#define SKIN_PREVIEW_BOB_ANIM
#define SKIN_PREVIEW_WALKING_ANIM

6
Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h
View File

@@ -2,9 +2,9 @@
#include <string>
#include <XuiApp.h>
#include "..\..\Textures.h"
//#include "..\..\Xbox\DLC\DLCSkinFile.h"
#include "..\..\Model.h"
#include "../../Textures.h"
//#include "../../Xbox/DLC/DLCSkinFile.h"
#include "../../Model.h"
using namespace std;

18
Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp
View File

@@ -1,14 +1,14 @@
#include "stdafx.h"
#include "..\..\ItemRenderer.h"
#include "..\..\GameRenderer.h"
#include "..\..\TileRenderer.h"
#include "..\..\Lighting.h"
#include "..\..\ScreenSizeCalculator.h"
#include "..\..\LocalPlayer.h"
#include "..\..\..\Minecraft.World\ItemInstance.h"
#include "..\..\..\Minecraft.World\Item.h"
#include "..\..\..\Minecraft.World\Tile.h"
#include "../../ItemRenderer.h"
#include "../../GameRenderer.h"
#include "../../TileRenderer.h"
#include "../../Lighting.h"
#include "../../ScreenSizeCalculator.h"
#include "../../LocalPlayer.h"
#include "../../../Minecraft.World/ItemInstance.h"
#include "../../../Minecraft.World/Item.h"
#include "../../../Minecraft.World/Tile.h"
#include "XUI_Ctrl_MinecraftSlot.h"
//-----------------------------------------------------------------------------

2
Minecraft.Client/Common/XUI/XUI_Ctrl_MobEffect.h
View File

@@ -1,7 +1,7 @@
#pragma once
using namespace std;
#include "..\..\..\Minecraft.World\MobEffect.h"
#include "../../../Minecraft.World/MobEffect.h"
class CXuiCtrlMobEffect : public CXuiControlImpl
{

2
Minecraft.Client/Common/XUI/XUI_Ctrl_PassThroughList.cpp
View File

@@ -1,5 +1,5 @@
#include "stdafx.h"
#include "XUI_Ctrl_PassThroughList.h"
#include "XUI_Ctrl_PassthroughList.h"
HRESULT CXuiCtrlPassThroughList::OnInit(XUIMessageInit *pInitData, BOOL& bHandled)
{

10
Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp
View File

@@ -1,10 +1,10 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "..\..\..\Minecraft.World\Slot.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
#include "..\..\MultiPlayerLocalPlayer.h"
#include "..\..\Minecraft.h"
#include "../../../Minecraft.World/StringHelpers.h"
#include "../../../Minecraft.World/Slot.h"
#include "../../../Minecraft.World/net.minecraft.world.item.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../Minecraft.h"
#include "XUI_Ctrl_SlotItemCtrlBase.h"

2
Minecraft.Client/Common/XUI/XUI_Ctrl_SlotList.cpp
View File

@@ -1,6 +1,6 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\AbstractContainerMenu.h"
#include "../../../Minecraft.World/AbstractContainerMenu.h"
#include "XUI_Ctrl_SlotItemListItem.h"
#include "XUI_Ctrl_SlotList.h"

12
Minecraft.Client/Common/XUI/XUI_Ctrl_SplashPulser.cpp
View File

@@ -1,11 +1,11 @@
#include "stdafx.h"
#include "..\..\Minecraft.h"
#include "..\..\ScreenSizeCalculator.h"
#include "..\..\Lighting.h"
#include "../../Minecraft.h"
#include "../../ScreenSizeCalculator.h"
#include "../../Lighting.h"
#include "XUI_Ctrl_SplashPulser.h"
#include "..\..\Font.h"
#include "..\..\..\Minecraft.World\Mth.h"
#include "..\..\..\Minecraft.World\System.h"
#include "../../Font.h"
#include "../../../Minecraft.World/Mth.h"
#include "../../../Minecraft.World/System.h"
//-----------------------------------------------------------------------------
// CXuiCtrlSplashPulser class

10
Minecraft.Client/Common/XUI/XUI_DLCOffers.cpp
View File

@@ -2,14 +2,14 @@
//
#include "stdafx.h"
#include "..\..\..\Minecraft.World\ByteArrayInputStream.h"
#include "..\..\..\Minecraft.World\BufferedReader.h"
#include "..\..\..\Minecraft.World\InputStreamReader.h"
#include "..\..\..\Minecraft.World\ArrayWithLength.h"
#include "../../../Minecraft.World/ByteArrayInputStream.h"
#include "../../../Minecraft.World/BufferedReader.h"
#include "../../../Minecraft.World/InputStreamReader.h"
#include "../../../Minecraft.World/ArrayWithLength.h"
#include <assert.h>
#include "XUI_Ctrl_4JIcon.h"
#include "XUI_DLCOffers.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "../../../Minecraft.World/StringHelpers.h"
#ifdef _XBOX
#include <xavatar.h>
#endif

4
Minecraft.Client/Common/XUI/XUI_DLCOffers.h
View File

@@ -1,7 +1,7 @@
#pragma once
#include "../media\xuiscene_DLCOffers.h"
#include "../media\xuiscene_DLCMain.h"
#include "../media/xuiscene_DLCOffers.h"
#include "../media/xuiscene_DLCMain.h"
#include "XUI_CustomMessages.h"

36
Minecraft.Client/Common/XUI/XUI_Death.cpp
View File

@@ -2,25 +2,25 @@
//
#include "stdafx.h"
#include "..\XUI\XUI_Death.h"
#include "../XUI/XUI_Death.h"
#include <assert.h>
#include "..\..\..\Minecraft.World\AABB.h"
#include "..\..\..\Minecraft.World\Vec3.h"
#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
#include "..\..\..\Minecraft.Client\StatsCounter.h"
#include "..\..\..\Minecraft.World\Entity.h"
#include "..\..\..\Minecraft.Client\MultiplayerLocalPlayer.h"
#include "..\..\..\Minecraft.World\Level.h"
#include "..\..\..\Minecraft.World\ChunkSource.h"
#include "..\..\..\Minecraft.Client\ProgressRenderer.h"
#include "..\..\..\Minecraft.Client\GameRenderer.h"
#include "..\..\..\Minecraft.Client\LevelRenderer.h"
#include "..\..\..\Minecraft.World\Pos.h"
#include "..\..\..\Minecraft.World\Dimension.h"
#include "..\..\Minecraft.h"
#include "..\..\Options.h"
#include "..\..\LocalPlayer.h"
#include "..\..\..\Minecraft.World\compression.h"
#include "../../../Minecraft.World/AABB.h"
#include "../../../Minecraft.World/Vec3.h"
#include "../../../Minecraft.World/net.minecraft.stats.h"
#include "../../../Minecraft.Client/StatsCounter.h"
#include "../../../Minecraft.World/Entity.h"
#include "../../../Minecraft.Client/MultiPlayerLocalPlayer.h"
#include "../../../Minecraft.World/Level.h"
#include "../../../Minecraft.World/ChunkSource.h"
#include "../../../Minecraft.Client/ProgressRenderer.h"
#include "../../../Minecraft.Client/GameRenderer.h"
#include "../../../Minecraft.Client/LevelRenderer.h"
#include "../../../Minecraft.World/Pos.h"
#include "../../../Minecraft.World/Dimension.h"
#include "../../Minecraft.h"
#include "../../Options.h"
#include "../../LocalPlayer.h"
#include "../../../Minecraft.World/compression.h"
//----------------------------------------------------------------------------------
// Performs initialization tasks - retrieves controls.
//----------------------------------------------------------------------------------

2
Minecraft.Client/Common/XUI/XUI_Death.h
View File

@@ -1,6 +1,6 @@
#pragma once
#include "../media/xuiscene_Death.h"
#include "../media/xuiscene_death.h"
#include "XUI_CustomMessages.h"
#define BUTTON_DEATH_RESPAWN 0

16
Minecraft.Client/Common/XUI/XUI_DebugItemEditor.cpp
View File

@@ -1,12 +1,12 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
#include "..\..\Minecraft.h"
#include "..\..\MultiPlayerLocalPlayer.h"
#include "..\..\ClientConnection.h"
#include "..\..\Common\GameRules\ConsoleGameRules.h"
#include "../../../Minecraft.World/StringHelpers.h"
#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
#include "../../../Minecraft.World/net.minecraft.world.item.h"
#include "../../../Minecraft.World/net.minecraft.network.packet.h"
#include "../../Minecraft.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../ClientConnection.h"
#include "../../Common/GameRules/ConsoleGameRules.h"
#include "XUI_DebugItemEditor.h"
#ifdef _DEBUG_MENUS_ENABLED

2
Minecraft.Client/Common/XUI/XUI_DebugItemEditor.h
View File

@@ -4,7 +4,7 @@ using namespace std;
#include "XUI_Ctrl_CraftIngredientSlot.h"
#include "XUI_Ctrl_4JEdit.h"
#include "..\..\..\Minecraft.World\ItemInstance.h"
#include "../../../Minecraft.World/ItemInstance.h"
class CScene_DebugItemEditor : public CXuiSceneImpl
{

50
Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp
View File

@@ -1,32 +1,32 @@
#include "stdafx.h"
#include "..\..\Minecraft.h"
#include "..\..\MultiplayerLocalPlayer.h"
#include "..\..\MultiplayerLevel.h"
#include "..\..\GameMode.h"
#include "..\..\SurvivalMode.h"
#include "..\..\CreativeMode.h"
#include "../../Minecraft.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../MultiPlayerLevel.h"
#include "../../GameMode.h"
#include "../../SurvivalMode.h"
#include "../../CreativeMode.h"
#include "ClientConnection.h"
#include "MultiPlayerLocalPlayer.h"
#include "..\..\..\Minecraft.World\ArrayWithLength.h"
#include "..\..\..\Minecraft.World\com.mojang.nbt.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.entity.animal.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.entity.monster.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.saveddata.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.chunk.storage.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.storage.h"
#include "..\..\..\Minecraft.World\InputOutputStream.h"
#include "..\..\..\Minecraft.World\ConsoleSaveFileIO.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.enchantment.h"
#include "../../../Minecraft.World/ArrayWithLength.h"
#include "../../../Minecraft.World/com.mojang.nbt.h"
#include "../../../Minecraft.World/net.minecraft.world.entity.player.h"
#include "../../../Minecraft.World/net.minecraft.world.entity.animal.h"
#include "../../../Minecraft.World/net.minecraft.world.entity.monster.h"
#include "../../../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h"
#include "../../../Minecraft.World/net.minecraft.world.level.h"
#include "../../../Minecraft.World/net.minecraft.world.level.saveddata.h"
#include "../../../Minecraft.World/net.minecraft.world.level.chunk.storage.h"
#include "../../../Minecraft.World/net.minecraft.world.level.storage.h"
#include "../../../Minecraft.World/InputOutputStream.h"
#include "../../../Minecraft.World/ConsoleSaveFileIO.h"
#include "../../../Minecraft.World/net.minecraft.world.item.h"
#include "../../../Minecraft.World/net.minecraft.world.item.enchantment.h"
#include "XUI_DebugOverlay.h"
#include "..\..\..\Minecraft.Client\GameRenderer.h"
#include "..\..\MinecraftServer.h"
#include "..\..\Common\Tutorial\Tutorial.h"
#include "..\..\..\Minecraft.World\net.minecraft.commands.common.h"
#include "..\..\..\Minecraft.World\ConsoleSaveFileOriginal.h"
#include "../../../Minecraft.Client/GameRenderer.h"
#include "../../MinecraftServer.h"
#include "../../Common/Tutorial/Tutorial.h"
#include "../../../Minecraft.World/net.minecraft.commands.common.h"
#include "../../../Minecraft.World/ConsoleSaveFileOriginal.h"
#ifdef _DEBUG_MENUS_ENABLED
HRESULT CScene_DebugOverlay::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )

4
Minecraft.Client/Common/XUI/XUI_DebugOverlay.h
View File

@@ -7,8 +7,8 @@ using namespace std;
class RegionFile;
class DataOutputStream;
class ConsoleSaveFile;
#include "..\..\..\Minecraft.World\File.h"
#include "..\..\..\Minecraft.World\Entity.h"
#include "../../../Minecraft.World/File.h"
#include "../../../Minecraft.World/Entity.h"
class CScene_DebugOverlay : public CXuiSceneImpl
{

6
Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.cpp
View File

@@ -1,8 +1,8 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "../../../Minecraft.World/StringHelpers.h"
#include "XUI_DebugSchematicCreator.h"
#include "..\..\..\Minecraft.World\ChunkSource.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
#include "../../../Minecraft.World/ChunkSource.h"
#include "../../../Minecraft.World/net.minecraft.world.level.h"
#ifndef _CONTENT_PACKAGE
HRESULT CScene_DebugSchematicCreator::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )

4
Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.h
View File

@@ -1,7 +1,7 @@
#pragma once
#include "..\Media\xuiscene_debug_schematic_create.h"
#include "../Media/xuiscene_debug_schematic_create.h"
#include "XUI_Ctrl_4JEdit.h"
#include "..\..\Common\GameRules\ConsoleSchematicFile.h"
#include "../../Common/GameRules/ConsoleSchematicFile.h"
class CScene_DebugSchematicCreator : public CXuiSceneImpl
{

10
Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp
View File

@@ -1,12 +1,12 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "../../../Minecraft.World/StringHelpers.h"
#include "XUI_DebugSetCamera.h"
#include "..\..\..\Minecraft.World\ChunkSource.h"
#include "../../../Minecraft.World/ChunkSource.h"
// #include "..\..\Xbox\4JLibs\inc\4J_Input.h"
// #include "../../Xbox/4JLibs/inc/4J_Input.h"
#include "..\..\Minecraft.h"
#include "..\..\MultiplayerLocalPlayer.h"
#include "../../Minecraft.h"
#include "../../MultiPlayerLocalPlayer.h"
#ifndef _CONTENT_PACKAGE
HRESULT CScene_DebugSetCamera::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )

4
Minecraft.Client/Common/XUI/XUI_DebugSetCamera.h
View File

@@ -1,7 +1,7 @@
#pragma once
#include "..\Media\xuiscene_debug_set_camera.h"
#include "../Media/xuiscene_debug_set_camera.h"
#include "XUI_Ctrl_4JEdit.h"
#include "..\..\Common\GameRules\ConsoleSchematicFile.h"
#include "../../Common/GameRules/ConsoleSchematicFile.h"
class CScene_DebugSetCamera : public CXuiSceneImpl
{

2
Minecraft.Client/Common/XUI/XUI_DebugTips.cpp
View File

@@ -2,7 +2,7 @@
#include <assert.h>
#include "XUI_DebugTips.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "../../../Minecraft.World/StringHelpers.h"
//----------------------------------------------------------------------------------
// Performs initialization tasks - retrieves controls.

2
Minecraft.Client/Common/XUI/XUI_DebugTips.h
View File

@@ -1,6 +1,6 @@
#pragma once
#include "../media/xuiscene_DebugTips.h"
#include "../media/xuiscene_debugtips.h"

8
Minecraft.Client/Common/XUI/XUI_FullscreenProgress.cpp
View File

@@ -4,10 +4,10 @@
#include "stdafx.h"
#include <assert.h>
#include "..\..\Minecraft.h"
#include "..\..\ProgressRenderer.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "..\..\Common\Tutorial\TutorialMode.h"
#include "../../Minecraft.h"
#include "../../ProgressRenderer.h"
#include "../../../Minecraft.World/StringHelpers.h"
#include "../../Common/Tutorial/TutorialMode.h"
//----------------------------------------------------------------------------------
// Performs initialization tasks - retrieves controls.

2
Minecraft.Client/Common/XUI/XUI_FullscreenProgress.h
View File

@@ -1,6 +1,6 @@
#pragma once
#include "../media/xuiscene_fullscreenprogress.h"
#include "..\..\..\Minecraft.World\C4JThread.h"
#include "../../../Minecraft.World/C4JThread.h"
#define ERROR_FULLSCREENPROGRESS_

14
Minecraft.Client/Common/XUI/XUI_HUD.cpp
View File

@@ -1,12 +1,12 @@
#include "stdafx.h"
#include "XUI_HUD.h"
#include "..\..\Minecraft.h"
#include "..\..\Gui.h"
#include "..\..\MultiplayerLocalPlayer.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
#include "..\..\..\Minecraft.World\Random.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.material.h"
#include "../../Minecraft.h"
#include "../../Gui.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
#include "../../../Minecraft.World/Random.h"
#include "../../../Minecraft.World/net.minecraft.world.effect.h"
#include "../../../Minecraft.World/net.minecraft.world.level.material.h"
HRESULT CXuiSceneHud::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
{

2
Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp
View File

@@ -4,7 +4,7 @@
#include "stdafx.h"
#include <assert.h>
#include "..\XUI\XUI_HelpAndOptions.h"
#include "../XUI/XUI_HelpAndOptions.h"
//----------------------------------------------------------------------------------

8
Minecraft.Client/Common/XUI/XUI_HelpControls.cpp
View File

@@ -1,12 +1,12 @@
#include "stdafx.h"
#include <assert.h>
#include "..\XUI\XUI_HelpControls.h"
#include "../XUI/XUI_HelpControls.h"
#include "XUI_Ctrl_4JList.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
#include "..\..\..\Minecraft.World\LevelData.h"
#include "..\..\MultiplayerLocalPlayer.h"
#include "../../../Minecraft.World/net.minecraft.world.level.h"
#include "../../../Minecraft.World/LevelData.h"
#include "../../MultiPlayerLocalPlayer.h"
#define ALIGN_START 0
#define ALIGN_END 1

2
Minecraft.Client/Common/XUI/XUI_HelpCredits.h
View File

@@ -5,7 +5,7 @@
#define MAX_CREDIT_STRINGS 360
// 213
#include "..\UI\UIStructs.h"
#include "../UI/UIStructs.h"
class CScene_Credits : public CXuiSceneImpl
{

4
Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp
View File

@@ -1,8 +1,8 @@
#include "stdafx.h"
#include <assert.h>
#include "..\XUI\XUI_HelpHowToPlay.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "../XUI/XUI_HelpHowToPlay.h"
#include "../../../Minecraft.World/StringHelpers.h"
static SHowToPlayPageDef gs_aPageDefs[ eHowToPlay_NumPages ] =
{

4
Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.cpp
View File

@@ -1,8 +1,8 @@
#include "stdafx.h"
#include <assert.h>
#include "..\XUI\XUI_HowToPlayMenu.h"
#include "..\XUI\XUI_HelpHowToPlay.h"
#include "../XUI/XUI_HowToPlayMenu.h"
#include "../XUI/XUI_HelpHowToPlay.h"
// strings for buttons in the list
unsigned int CScene_HowToPlayMenu::m_uiHTPButtonNameA[]=

10
Minecraft.Client/Common/XUI/XUI_InGameHostOptions.cpp
View File

@@ -1,11 +1,11 @@
#include "stdafx.h"
#include "XUI_MultiGameCreate.h"
#include "XUI_InGameHostOptions.h"
#include "..\..\Minecraft.h"
#include "..\..\MultiPlayerLocalPlayer.h"
#include "..\..\ClientConnection.h"
#include "..\..\..\Minecraft.World\net.minecraft.network.h"
#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
#include "../../Minecraft.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../ClientConnection.h"
#include "../../../Minecraft.World/net.minecraft.network.h"
#include "../../../Minecraft.World/net.minecraft.network.packet.h"
//----------------------------------------------------------------------------------
// Performs initialization tasks - retrieves controls.

2
Minecraft.Client/Common/XUI/XUI_InGameHostOptions.h
View File

@@ -1,5 +1,5 @@
#pragma once
#include "..\Media\xuiscene_ingame_host_options.h"
#include "../Media/xuiscene_ingame_host_options.h"
class CScene_InGameHostOptions : public CXuiSceneImpl
{

22
Minecraft.Client/Common/XUI/XUI_InGameInfo.cpp
View File

@@ -2,18 +2,18 @@
#include <assert.h>
#include "XUI_InGameInfo.h"
#include "..\..\ServerPlayer.h"
#include "..\..\PlayerConnection.h"
#include "..\..\PlayerList.h"
#include "..\..\MinecraftServer.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "..\..\PlayerRenderer.h"
#include "../../ServerPlayer.h"
#include "../../PlayerConnection.h"
#include "../../PlayerList.h"
#include "../../MinecraftServer.h"
#include "../../../Minecraft.World/StringHelpers.h"
#include "../../PlayerRenderer.h"
#include "XUI_InGamePlayerOptions.h"
#include "..\..\Minecraft.h"
#include "..\..\MultiPlayerLocalPlayer.h"
#include "..\..\ClientConnection.h"
#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
#include "..\..\Xbox\Network\NetworkPlayerXbox.h"
#include "../../Minecraft.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../ClientConnection.h"
#include "../../../Minecraft.World/net.minecraft.network.packet.h"
#include "../../Xbox/Network/NetworkPlayerXbox.h"
#define IGNORE_KEYPRESS_TIMERID 0
#define TOOLTIP_TIMERID 1

12
Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.cpp
View File

@@ -1,12 +1,12 @@
#include "stdafx.h"
#include "XUI_MultiGameCreate.h"
#include "XUI_InGamePlayerOptions.h"
#include "..\..\Minecraft.h"
#include "..\..\MultiPlayerLocalPlayer.h"
#include "..\..\ClientConnection.h"
#include "..\..\..\Minecraft.World\net.minecraft.network.h"
#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
#include "../../Minecraft.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../ClientConnection.h"
#include "../../../Minecraft.World/net.minecraft.network.h"
#include "../../../Minecraft.World/net.minecraft.network.packet.h"
#include "../../../Minecraft.World/net.minecraft.world.entity.player.h"
#include "XUI_InGameInfo.h"

2
Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.h
View File

@@ -1,5 +1,5 @@
#pragma once
#include "..\Media\xuiscene_ingame_player_options.h"
#include "../Media/xuiscene_ingame_player_options.h"
class CScene_InGamePlayerOptions : public CXuiSceneImpl
{

2
Minecraft.Client/Common/XUI/XUI_Intro.cpp
View File

@@ -4,7 +4,7 @@
#include "stdafx.h"
#include <assert.h>
#include "..\XUI\XUI_Intro.h"
#include "../XUI/XUI_Intro.h"
#define TIMELINE_NORMAL 0
#define TIMELINE_ESRBFADE 1

4
Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp
View File

@@ -2,8 +2,8 @@
#include <xuiresource.h>
#include <xuiapp.h>
#include "XUI_Leaderboards.h"
#include "..\..\..\Minecraft.World\Tile.h"
#include "..\..\..\Minecraft.World\Item.h"
#include "../../../Minecraft.World/Tile.h"
#include "../../../Minecraft.World/Item.h"
#include "XUI_Ctrl_CraftIngredientSlot.h"
#include "XUI_XZP_Icons.h"

2
Minecraft.Client/Common/XUI/XUI_Leaderboards.h
View File

@@ -2,7 +2,7 @@
#include "XUI_Helper.h"
#include "../media/xuiscene_leaderboards.h"
#include "..\Leaderboards\LeaderboardManager.h"
#include "../Leaderboards/LeaderboardManager.h"
class CXuiCtrlCraftIngredientSlot;

36
Minecraft.Client/Common/XUI/XUI_LoadSettings.cpp
View File

@@ -2,29 +2,29 @@
#include <xuiresource.h>
#include <xuiapp.h>
#include <assert.h>
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "..\..\Common\Tutorial\TutorialMode.h"
#include "..\..\..\Minecraft.World\ConsoleSaveFileIO.h"
#include "..\..\LocalPlayer.h"
#include "..\..\Minecraft.h"
#include "..\..\..\Minecraft.World\AABB.h"
#include "..\..\..\Minecraft.World\Vec3.h"
#include "..\..\..\Minecraft.World\ArrayWithLength.h"
#include "..\..\..\Minecraft.World\File.h"
#include "..\..\..\Minecraft.World\InputOutputStream.h"
#include "..\..\MinecraftServer.h"
#include "..\..\Options.h"
#include "../../../Minecraft.World/StringHelpers.h"
#include "../../Common/Tutorial/TutorialMode.h"
#include "../../../Minecraft.World/ConsoleSaveFileIO.h"
#include "../../LocalPlayer.h"
#include "../../Minecraft.h"
#include "../../../Minecraft.World/AABB.h"
#include "../../../Minecraft.World/Vec3.h"
#include "../../../Minecraft.World/ArrayWithLength.h"
#include "../../../Minecraft.World/File.h"
#include "../../../Minecraft.World/InputOutputStream.h"
#include "../../MinecraftServer.h"
#include "../../Options.h"
#include "XUI_Ctrl_4JList.h"
#include "XUI_MultiGameInfo.h"
#include "XUI_MultiGameJoinLoad.h"
#include "XUI_Ctrl_4JIcon.h"
#include "XUI_LoadSettings.h"
#include "..\..\..\Minecraft.World\LevelSettings.h"
#include "..\..\TexturePackRepository.h"
#include "..\..\TexturePack.h"
#include "..\GameRules\ConsoleGameRules.h"
#include "..\..\StringTable.h"
#include "..\..\DLCTexturePack.h"
#include "../../../Minecraft.World/LevelSettings.h"
#include "../../TexturePackRepository.h"
#include "../../TexturePack.h"
#include "../GameRules/ConsoleGameRules.h"
#include "../../StringTable.h"
#include "../../DLCTexturePack.h"
#define GAME_CREATE_ONLINE_TIMER_ID 0
#define GAME_CREATE_ONLINE_TIMER_TIME 100

28
Minecraft.Client/Common/XUI/XUI_MainMenu.cpp
View File

@@ -4,21 +4,21 @@
#include "stdafx.h"
#include <assert.h>
#include "..\XUI\XUI_MainMenu.h"
#include "..\..\..\Minecraft.Client\SurvivalMode.h"
#include "..\..\..\Minecraft.World\ConsoleSaveFileIO.h"
#include "..\..\LocalPlayer.h"
#include "..\..\..\Minecraft.World\AABB.h"
#include "..\..\..\Minecraft.World\Vec3.h"
#include "..\..\User.h"
#include "../XUI/XUI_MainMenu.h"
#include "../../../Minecraft.Client/SurvivalMode.h"
#include "../../../Minecraft.World/ConsoleSaveFileIO.h"
#include "../../LocalPlayer.h"
#include "../../../Minecraft.World/AABB.h"
#include "../../../Minecraft.World/Vec3.h"
#include "../../User.h"
//#include "XUI_CreateLoad.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "..\..\..\Minecraft.World\Random.h"
#include "..\..\MinecraftServer.h"
#include "..\..\Minecraft.h"
#include "..\..\Options.h"
#include "..\..\Font.h"
#include "..\..\Common\GameRules\ConsoleGameRules.h"
#include "../../../Minecraft.World/StringHelpers.h"
#include "../../../Minecraft.World/Random.h"
#include "../../MinecraftServer.h"
#include "../../Minecraft.h"
#include "../../Options.h"
#include "../../Font.h"
#include "../../Common/GameRules/ConsoleGameRules.h"
#define DLC_INSTALLED_TIMER_ID 1
#define DLC_INSTALLED_TIMER_TIME 100

28
Minecraft.Client/Common/XUI/XUI_MultiGameCreate.cpp
View File

@@ -1,21 +1,21 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\Random.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "../../../Minecraft.World/Random.h"
#include "../../../Minecraft.World/StringHelpers.h"
#include "XUI_MultiGameCreate.h"
#include "XUI_Controls.h"
#include "..\..\MinecraftServer.h"
#include "..\..\Minecraft.h"
#include "..\..\Options.h"
#include "..\..\..\Minecraft.World\LevelSettings.h"
#include "../../MinecraftServer.h"
#include "../../Minecraft.h"
#include "../../Options.h"
#include "../../../Minecraft.World/LevelSettings.h"
#include "XUI_MultiGameLaunchMoreOptions.h"
#include "..\..\..\Minecraft.World\BiomeSource.h"
#include "..\..\..\Minecraft.World\IntCache.h"
#include "..\..\..\Minecraft.World\LevelType.h"
#include "..\..\TexturePackRepository.h"
#include "..\..\TexturePack.h"
#include "..\DLC\DLCLocalisationFile.h"
#include "..\..\StringTable.h"
#include "..\..\DLCTexturePack.h"
#include "../../../Minecraft.World/BiomeSource.h"
#include "../../../Minecraft.World/IntCache.h"
#include "../../../Minecraft.World/LevelType.h"
#include "../../TexturePackRepository.h"
#include "../../TexturePack.h"
#include "../DLC/DLCLocalisationFile.h"
#include "../../StringTable.h"
#include "../../DLCTexturePack.h"
#define GAME_CREATE_ONLINE_TIMER_ID 0
#define GAME_CREATE_ONLINE_TIMER_TIME 100

2
Minecraft.Client/Common/XUI/XUI_MultiGameCreate.h
View File

@@ -1,5 +1,5 @@
#pragma once
#include "..\Media\xuiscene_multi_create.h"
#include "../Media/xuiscene_multi_create.h"
#include "XUI_Ctrl_4JEdit.h"
#include "XUI_Ctrl_SliderWrapper.h"
#include "XUI_MultiGameLaunchMoreOptions.h"

8
Minecraft.Client/Common/XUI/XUI_MultiGameInfo.cpp
View File

@@ -2,12 +2,12 @@
#include <xuiresource.h>
#include <xuiapp.h>
#include <assert.h>
#include "..\..\..\Minecraft.World\LevelSettings.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "../../../Minecraft.World/LevelSettings.h"
#include "../../../Minecraft.World/StringHelpers.h"
#include "XUI_MultiGameInfo.h"
#include "XUI_MultiGameJoinLoad.h"
#include "..\..\..\Minecraft.World\LevelSettings.h"
#include "..\..\..\Minecraft.World\Difficulty.h"
#include "../../../Minecraft.World/LevelSettings.h"
#include "../../../Minecraft.World/Difficulty.h"
#define UPDATE_PLAYERS_TIMER_ID 0
#define UPDATE_PLAYERS_TIMER_TIME 30000

2
Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h
View File

@@ -2,7 +2,7 @@
using namespace std;
#include <vector>
#include <qnet.h>
#include "..\Media\xuiscene_multi_gameinfo.h"
#include "../Media/xuiscene_multi_gameinfo.h"
class FriendSessionInfo;

34
Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.cpp
View File

@@ -2,30 +2,30 @@
#include <xuiresource.h>
#include <xuiapp.h>
#include <assert.h>
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "..\..\Common\Tutorial\TutorialMode.h"
#include "..\..\..\Minecraft.World\ConsoleSaveFileIO.h"
#include "..\..\LocalPlayer.h"
#include "..\..\Minecraft.h"
#include "..\..\ProgressRenderer.h"
#include "..\..\..\Minecraft.World\AABB.h"
#include "..\..\..\Minecraft.World\Vec3.h"
#include "..\..\..\Minecraft.World\ArrayWithLength.h"
#include "..\..\..\Minecraft.World\File.h"
#include "..\..\..\Minecraft.World\InputOutputStream.h"
#include "../../../Minecraft.World/StringHelpers.h"
#include "../../Common/Tutorial/TutorialMode.h"
#include "../../../Minecraft.World/ConsoleSaveFileIO.h"
#include "../../LocalPlayer.h"
#include "../../Minecraft.h"
#include "../../ProgressRenderer.h"
#include "../../../Minecraft.World/AABB.h"
#include "../../../Minecraft.World/Vec3.h"
#include "../../../Minecraft.World/ArrayWithLength.h"
#include "../../../Minecraft.World/File.h"
#include "../../../Minecraft.World/InputOutputStream.h"
#include "XUI_Ctrl_4JList.h"
#include "XUI_Ctrl_4JIcon.h"
#include "XUI_LoadSettings.h"
#include "XUI_MultiGameInfo.h"
#include "XUI_MultiGameJoinLoad.h"
#include "XUI_MultiGameCreate.h"
#include "..\..\MinecraftServer.h"
#include "..\..\Options.h"
#include "../../MinecraftServer.h"
#include "../../Options.h"
#include "..\GameRules\LevelGenerationOptions.h"
#include "..\..\TexturePackRepository.h"
#include "..\..\TexturePack.h"
#include "..\..\..\Minecraft.World\LevelSettings.h"
#include "../GameRules/LevelGenerationOptions.h"
#include "../../TexturePackRepository.h"
#include "../../TexturePack.h"
#include "../../../Minecraft.World/LevelSettings.h"
#define CHECKFORAVAILABLETEXTUREPACKS_TIMER_ID 3
#define CHECKFORAVAILABLETEXTUREPACKS_TIMER_TIME 100

2
Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.h
View File

@@ -1,7 +1,7 @@
#pragma once
using namespace std;
#include <vector>
#include "..\Media\xuiscene_multi_joinload.h"
#include "../Media/xuiscene_multi_joinload.h"
#include "XUI_CustomMessages.h"

4
Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp
View File

@@ -1,8 +1,8 @@
#include "stdafx.h"
#include "XUI_MultiGameCreate.h"
#include "XUI_MultiGameLaunchMoreOptions.h"
#include "..\..\TexturePackRepository.h"
#include "..\..\Minecraft.h"
#include "../../TexturePackRepository.h"
#include "../../Minecraft.h"
#define GAME_CREATE_ONLINE_TIMER_ID 0
#define GAME_CREATE_ONLINE_TIMER_TIME 100

2
Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.h
View File

@@ -1,6 +1,6 @@
#pragma once
using namespace std;
#include "..\Media\xuiscene_multi_launch_more_options.h"
#include "../Media/xuiscene_multi_launch_more_options.h"
class CScene_MultiGameLaunchMoreOptions : public CXuiSceneImpl
{

2
Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.cpp
View File

@@ -3,7 +3,7 @@
#include "stdafx.h"
// #include "XUI_Ctrl_4JIcon.h"
#include "XUI_NewUpdateMessage.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "../../../Minecraft.World/StringHelpers.h"
HRESULT CScene_NewUpdateMessage::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )

2
Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.h
View File

@@ -1,6 +1,6 @@
#pragma once
#include "../media\xuiscene_NewUpdateMessage.h"
#include "../media/xuiscene_NewUpdateMessage.h"
class CScene_NewUpdateMessage : public CXuiSceneImpl
{

2
Minecraft.Client/Common/XUI/XUI_PartnernetPassword.cpp
View File

@@ -1,6 +1,6 @@
#include "stdafx.h"
#include "XUI_PartnernetPassword.h"
#include "..\XUI\XUI_Ctrl_4JList.h"
#include "../XUI/XUI_Ctrl_4JList.h"
#ifdef _CONTENT_PACKAGE
#ifndef _FINAL_BUILD

2
Minecraft.Client/Common/XUI/XUI_PartnernetPassword.h
View File

@@ -1,5 +1,5 @@
#pragma once
#include "..\Media\xuiscene_partnernetpassword.h"
#include "../Media/xuiscene_partnernetpassword.h"
#include "XUI_Ctrl_4JEdit.h"
#ifdef _CONTENT_PACKAGE

34
Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp
View File

@@ -4,23 +4,23 @@
#include "stdafx.h"
#include <assert.h>
#include "..\..\..\Minecraft.World\AABB.h"
#include "..\..\..\Minecraft.World\Vec3.h"
#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
#include "..\..\..\Minecraft.Client\StatsCounter.h"
#include "..\..\..\Minecraft.World\Entity.h"
#include "..\..\..\Minecraft.World\Level.h"
#include "..\..\..\Minecraft.Client\MultiplayerLocalPlayer.h"
#include "..\..\MinecraftServer.h"
#include "..\..\MultiPlayerLevel.h"
#include "..\..\ProgressRenderer.h"
#include "..\..\..\Minecraft.World\DisconnectPacket.h"
#include "..\..\Minecraft.h"
#include "..\..\Options.h"
#include "..\..\..\Minecraft.World\compression.h"
#include "..\..\TexturePackRepository.h"
#include "..\..\TexturePack.h"
#include "..\..\DLCTexturePack.h"
#include "../../../Minecraft.World/AABB.h"
#include "../../../Minecraft.World/Vec3.h"
#include "../../../Minecraft.World/net.minecraft.stats.h"
#include "../../../Minecraft.Client/StatsCounter.h"
#include "../../../Minecraft.World/Entity.h"
#include "../../../Minecraft.World/Level.h"
#include "../../../Minecraft.Client/MultiPlayerLocalPlayer.h"
#include "../../MinecraftServer.h"
#include "../../MultiPlayerLevel.h"
#include "../../ProgressRenderer.h"
#include "../../../Minecraft.World/DisconnectPacket.h"
#include "../../Minecraft.h"
#include "../../Options.h"
#include "../../../Minecraft.World/compression.h"
#include "../../TexturePackRepository.h"
#include "../../TexturePack.h"
#include "../../DLCTexturePack.h"
#define IGNORE_KEYPRESS_TIMERID 0
#define IGNORE_KEYPRESS_TIME 100

4
Minecraft.Client/Common/XUI/XUI_PauseMenu.h
View File

@@ -1,6 +1,6 @@
#pragma once
#include "../media/xuiscene_Pause.h"
#include "..\UI\IUIScene_PauseMenu.h"
#include "../media/xuiscene_pause.h"
#include "../UI/IUIScene_PauseMenu.h"
#include "XUI_CustomMessages.h"
#define BUTTON_PAUSE_RESUMEGAME 0

26
Minecraft.Client/Common/XUI/XUI_Reinstall.cpp
View File

@@ -4,19 +4,19 @@
#include "stdafx.h"
#include <assert.h>
#include "..\XUI\XUI_Reinstall.h"
#include "..\..\..\Minecraft.World\AABB.h"
#include "..\..\..\Minecraft.World\Vec3.h"
#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
#include "..\..\..\Minecraft.Client\StatsCounter.h"
#include "..\..\..\Minecraft.World\Entity.h"
#include "..\..\..\Minecraft.World\Level.h"
#include "..\..\..\Minecraft.Client\LocalPlayer.h"
#include "..\..\MinecraftServer.h"
#include "..\..\ProgressRenderer.h"
#include "..\..\..\Minecraft.World\DisconnectPacket.h"
#include "..\..\Minecraft.h"
#include "..\..\Options.h"
#include "../XUI/XUI_Reinstall.h"
#include "../../../Minecraft.World/AABB.h"
#include "../../../Minecraft.World/Vec3.h"
#include "../../../Minecraft.World/net.minecraft.stats.h"
#include "../../../Minecraft.Client/StatsCounter.h"
#include "../../../Minecraft.World/Entity.h"
#include "../../../Minecraft.World/Level.h"
#include "../../../Minecraft.Client/LocalPlayer.h"
#include "../../MinecraftServer.h"
#include "../../ProgressRenderer.h"
#include "../../../Minecraft.World/DisconnectPacket.h"
#include "../../Minecraft.h"
#include "../../Options.h"

2
Minecraft.Client/Common/XUI/XUI_Reinstall.h
View File

@@ -1,6 +1,6 @@
#pragma once
#include "../media/xuiscene_Reinstall.h"
#include "../media/xuiscene_reinstall.h"
#define BUTTON_REINSTALL_THEME 0
#define BUTTON_REINSTALL_GAMERPIC1 1

2
Minecraft.Client/Common/XUI/XUI_SaveMessage.cpp
View File

@@ -1,6 +1,6 @@
#include "stdafx.h"
#include <assert.h>
#include "..\XUI\XUI_SaveMessage.h"
#include "../XUI/XUI_SaveMessage.h"
//----------------------------------------------------------------------------------
// Performs initialization tasks - retrieves controls.

30
Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp
View File

@@ -3,22 +3,22 @@
#include <xuiapp.h>
#include <assert.h>
#include "..\..\..\Minecraft.World\Player.h"
#include "..\..\..\Minecraft.Client\LocalPlayer.h"
#include "..\..\..\Minecraft.Client\Minecraft.h"
#include "..\..\..\Minecraft.Client\GameMode.h"
#include "..\..\..\Minecraft.World\AbstractContainerMenu.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
#include "..\..\..\Minecraft.World\Tile.h"
#include "..\..\..\Minecraft.World\FurnaceRecipes.h"
#include "..\..\..\Minecraft.World\Recipy.h"
#include "..\..\..\Minecraft.World\Recipes.h"
#include "..\..\..\Minecraft.World\ArmorRecipes.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "../../../Minecraft.World/Player.h"
#include "../../../Minecraft.Client/LocalPlayer.h"
#include "../../../Minecraft.Client/Minecraft.h"
#include "../../../Minecraft.Client/GameMode.h"
#include "../../../Minecraft.World/AbstractContainerMenu.h"
#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
#include "../../../Minecraft.World/net.minecraft.world.item.h"
#include "../../../Minecraft.World/Tile.h"
#include "../../../Minecraft.World/FurnaceRecipes.h"
#include "../../../Minecraft.World/Recipy.h"
#include "../../../Minecraft.World/Recipes.h"
#include "../../../Minecraft.World/ArmorRecipes.h"
#include "../../../Minecraft.World/StringHelpers.h"
#include "..\..\Common\Tutorial\Tutorial.h"
#include "..\..\Common\Tutorial\TutorialMode.h"
#include "../../Common/Tutorial/Tutorial.h"
#include "../../Common/Tutorial/TutorialMode.h"
#include "XUI_Ctrl_SlotList.h"
#include "XUI_Ctrl_SlotItem.h"

4
Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.h
View File

@@ -1,7 +1,7 @@
#pragma once
#include "..\UI\IUIScene_AbstractContainerMenu.h"
#include "../UI/IUIScene_AbstractContainerMenu.h"
#include "XUI_CustomMessages.h"
#include "..\..\Common\Tutorial\TutorialEnum.h"
#include "../../Common/Tutorial/TutorialEnum.h"
class CXuiCtrlSlotList;
class CXuiCtrlSlotItem;

14
Minecraft.Client/Common/XUI/XUI_Scene_Anvil.cpp
View File

@@ -1,12 +1,12 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "..\..\MultiPlayerLocalPlayer.h"
#include "..\..\Common\Tutorial\Tutorial.h"
#include "..\..\Common\Tutorial\TutorialMode.h"
#include "..\..\Common\Tutorial\TutorialEnum.h"
#include "..\..\Minecraft.h"
#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
#include "../../../Minecraft.World/StringHelpers.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../Common/Tutorial/Tutorial.h"
#include "../../Common/Tutorial/TutorialMode.h"
#include "../../Common/Tutorial/TutorialEnum.h"
#include "../../Minecraft.h"
#include "XUI_Ctrl_SlotList.h"
#include "XUI_Scene_Anvil.h"

6
Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h
View File

@@ -1,9 +1,9 @@
#pragma once
using namespace std;
#include "..\Media\xuiscene_anvil.h"
#include "../Media/xuiscene_anvil.h"
#include "XUI_Scene_AbstractContainer.h"
#include "..\UI\IUIScene_AnvilMenu.h"
#include "Common\XUI\XUI_Ctrl_4JEdit.h"
#include "../UI/IUIScene_AnvilMenu.h"
#include "Common/XUI/XUI_Ctrl_4JEdit.h"
#define ANVIL_UPDATE_TIMER_ID (10)
#define ANVIL_UPDATE_TIMER_TIME (1000) // 1 second

32
Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp
View File

@@ -1,24 +1,24 @@
#include "stdafx.h"
#include <assert.h>
#include "..\..\MultiplayerLevel.h"
#include "..\..\MultiplayerLocalPlayer.h"
#include "..\..\StatsCounter.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
#include "..\..\Minecraft.h"
#include "../../MultiPlayerLevel.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../StatsCounter.h"
#include "../../../Minecraft.World/StringHelpers.h"
#include "../../../Minecraft.World/net.minecraft.stats.h"
#include "../../Minecraft.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
#include "..\..\..\Minecraft.World\LevelData.h"
#include "../../../Minecraft.World/net.minecraft.world.level.h"
#include "../../../Minecraft.World/LevelData.h"
#include "XUI_CustomMessages.h"
#include "..\..\..\Minecraft.World\Dimension.h"
#include "..\..\..\Minecraft.World\SharedConstants.h"
#include "..\..\GameMode.h"
#include "..\..\EnderDragonRenderer.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
#include "..\..\TexturePackRepository.h"
#include "..\..\TexturePack.h"
#include "..\..\DLCTexturePack.h"
#include "../../../Minecraft.World/Dimension.h"
#include "../../../Minecraft.World/SharedConstants.h"
#include "../../GameMode.h"
#include "../../EnderDragonRenderer.h"
#include "../../../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h"
#include "../../TexturePackRepository.h"
#include "../../TexturePack.h"
#include "../../DLCTexturePack.h"
#define PRESS_START_TIMER 0

4
Minecraft.Client/Common/XUI/XUI_Scene_Base.h
View File

@@ -3,8 +3,8 @@
#include "../media/xuiscene_base.h"
#include "XUI_Ctrl_SlotItem.h"
#include "XUI_CustomMessages.h"
#include "..\UI\UIEnums.h"
#include "..\..\..\Minecraft.World\SoundTypes.h"
#include "../UI/UIEnums.h"
#include "../../../Minecraft.World/SoundTypes.h"
#define BUTTON_TOOLTIP_A 0
#define BUTTON_TOOLTIP_B 1

12
Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.cpp
View File

@@ -1,11 +1,11 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
#include "..\..\MultiPlayerLocalPlayer.h"
#include "..\..\Common\Tutorial\Tutorial.h"
#include "..\..\Common\Tutorial\TutorialMode.h"
#include "..\..\Common\Tutorial\TutorialEnum.h"
#include "..\..\Minecraft.h"
#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../Common/Tutorial/Tutorial.h"
#include "../../Common/Tutorial/TutorialMode.h"
#include "../../Common/Tutorial/TutorialEnum.h"
#include "../../Minecraft.h"
#include "XUI_Ctrl_SlotList.h"
#include "XUI_Scene_BrewingStand.h"
#include "XUI_Ctrl_BrewProgress.h"

4
Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.h
View File

@@ -1,8 +1,8 @@
#pragma once
using namespace std;
#include "..\Media\xuiscene_brewingstand.h"
#include "../Media/xuiscene_brewingstand.h"
#include "XUI_Scene_AbstractContainer.h"
#include "..\UI\IUIScene_BrewingMenu.h"
#include "../UI/IUIScene_BrewingMenu.h"
class CXuiCtrlSlotList;
class CXuiCtrlBrewProgress;

12
Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp
View File

@@ -1,15 +1,15 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\Container.h"
#include "..\..\..\Minecraft.World\ContainerMenu.h"
#include "..\..\MultiplayerLocalPlayer.h"
#include "../../../Minecraft.World/Container.h"
#include "../../../Minecraft.World/ContainerMenu.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "XUI_Ctrl_SlotList.h"
#include "XUI_Scene_Container.h"
#include "XUI_Ctrl_SlotItemListItem.h"
#include "XUI_Ctrl_SlotItem.h"
#include "..\..\Common\Tutorial\Tutorial.h"
#include "..\..\Common\Tutorial\TutorialMode.h"
#include "..\..\Common\Tutorial\TutorialEnum.h"
#include "../../Common/Tutorial/Tutorial.h"
#include "../../Common/Tutorial/TutorialMode.h"
#include "../../Common/Tutorial/TutorialEnum.h"
// The height of one row of slots
//#define ROW_HEIGHT 42.0f - comes from the pointer height in the xui

4
Minecraft.Client/Common/XUI/XUI_Scene_Container.h
View File

@@ -1,8 +1,8 @@
#pragma once
#include "..\Media\xuiscene_container.h"
#include "../Media/xuiscene_container.h"
#include "XUI_Scene_AbstractContainer.h"
#include "XUI_CustomMessages.h"
#include "..\UI\IUIScene_ContainerMenu.h"
#include "../UI/IUIScene_ContainerMenu.h"
//--------------------------------------------------------------------------------------
// Scene implementation class.

20
Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp
View File

@@ -4,16 +4,16 @@
#include "stdafx.h"
#include <assert.h>
#include "..\..\MultiplayerLocalPlayer.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.crafting.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
#include "..\..\..\Minecraft.World\Tile.h"
#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
#include "..\..\Common\Tutorial\Tutorial.h"
#include "..\..\Common\Tutorial\TutorialMode.h"
#include "..\..\Common\Tutorial\TutorialEnum.h"
#include "..\..\Minecraft.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../../Minecraft.World/net.minecraft.world.item.h"
#include "../../../Minecraft.World/net.minecraft.world.item.crafting.h"
#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
#include "../../../Minecraft.World/Tile.h"
#include "../../../Minecraft.World/net.minecraft.stats.h"
#include "../../Common/Tutorial/Tutorial.h"
#include "../../Common/Tutorial/TutorialMode.h"
#include "../../Common/Tutorial/TutorialEnum.h"
#include "../../Minecraft.h"
#include "XUI_Ctrl_CraftIngredientSlot.h"
#include "XUI_Ctrl_SlotList.h"

8
Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h
View File

@@ -3,12 +3,12 @@ using namespace std;
#include "../media/xuiscene_craftingpanel_2x2.h"
#include "XUI_Ctrl_MinecraftSlot.h"
#include "..\..\..\Minecraft.World\Recipy.h"
#include "../../../Minecraft.World/Recipy.h"
#include "XUI_Ctrl_CraftIngredientSlot.h"
#include "..\..\..\Minecraft.World\Item.h"
#include "../../../Minecraft.World/Item.h"
#include "XUI_CustomMessages.h"
#include "..\..\Common\Tutorial\TutorialEnum.h"
#include "..\UI\IUIScene_CraftingMenu.h"
#include "../../Common/Tutorial/TutorialEnum.h"
#include "../UI/IUIScene_CraftingMenu.h"
class CXuiCtrlSlotList;

20
Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp
View File

@@ -1,16 +1,16 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\AbstractContainerMenu.h"
#include "..\..\..\Minecraft.World\Slot.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.dimension.h"
#include "../../../Minecraft.World/AbstractContainerMenu.h"
#include "../../../Minecraft.World/Slot.h"
#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
#include "../../../Minecraft.World/net.minecraft.world.level.dimension.h"
//#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
#include "..\..\MultiplayerLocalPlayer.h"
#include "..\..\Common\Tutorial\Tutorial.h"
#include "..\..\Common\Tutorial\TutorialMode.h"
#include "..\..\Common\Tutorial\TutorialEnum.h"
#include "..\..\Minecraft.h"
//#include "../../../Minecraft.World/net.minecraft.stats.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../Common/Tutorial/Tutorial.h"
#include "../../Common/Tutorial/TutorialMode.h"
#include "../../Common/Tutorial/TutorialEnum.h"
#include "../../Minecraft.h"
#include "XUI_Ctrl_SlotList.h"
#include "XUI_Scene_Enchant.h"

10
Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h
View File

@@ -1,20 +1,20 @@
#pragma once
using namespace std;
#include "..\Media\xuiscene_enchant.h"
#include "../Media/xuiscene_enchant.h"
#include "..\..\BookModel.h"
#include "../../BookModel.h"
#include "XUI_Ctrl_SlotList.h"
#include "XUI_Ctrl_EnchantmentBook.h"
#include "XUI_Scene_AbstractContainer.h"
#include "..\UI\IUIScene_EnchantingMenu.h"
#include "../UI/IUIScene_EnchantingMenu.h"
#include "XUI_CustomMessages.h"
#include "XUI_Scene_Enchant.h"
#include "..\..\..\Minecraft.World\AbstractContainerMenu.h"
#include "..\..\..\Minecraft.World\SimpleContainer.h"
#include "../../../Minecraft.World/AbstractContainerMenu.h"
#include "../../../Minecraft.World/SimpleContainer.h"
class Level;
class CXuiCtrlEnchantmentButton;

12
Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp
View File

@@ -1,11 +1,11 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\FurnaceMenu.h"
#include "..\..\MultiplayerLocalPlayer.h"
#include "..\..\Common\Tutorial\Tutorial.h"
#include "..\..\Common\Tutorial\TutorialMode.h"
#include "..\..\Common\Tutorial\TutorialEnum.h"
#include "..\..\Minecraft.h"
#include "../../../Minecraft.World/FurnaceMenu.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../Common/Tutorial/Tutorial.h"
#include "../../Common/Tutorial/TutorialMode.h"
#include "../../Common/Tutorial/TutorialEnum.h"
#include "../../Minecraft.h"
#include "XUI_Ctrl_SlotList.h"
#include "XUI_Scene_Furnace.h"
#include "XUI_Ctrl_BurnProgress.h"

4
Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h
View File

@@ -1,8 +1,8 @@
#pragma once
using namespace std;
#include "..\Media\xuiscene_furnace.h"
#include "../Media/xuiscene_furnace.h"
#include "XUI_Scene_AbstractContainer.h"
#include "..\UI\IUIScene_FurnaceMenu.h"
#include "../UI/IUIScene_FurnaceMenu.h"
class CXuiCtrlSlotList;
class CXuiCtrlFireProgress;

16
Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp
View File

@@ -1,13 +1,13 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h"
#include "..\..\MultiplayerLocalPlayer.h"
#include "..\..\Common\Tutorial\Tutorial.h"
#include "..\..\Common\Tutorial\TutorialMode.h"
#include "..\..\Common\Tutorial\TutorialEnum.h"
#include "..\..\Minecraft.h"
#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
#include "../../../Minecraft.World/net.minecraft.stats.h"
#include "../../../Minecraft.World/net.minecraft.world.effect.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../Common/Tutorial/Tutorial.h"
#include "../../Common/Tutorial/TutorialMode.h"
#include "../../Common/Tutorial/TutorialEnum.h"
#include "../../Minecraft.h"
#include "XUI_Controls.h"
#include "XUI_Scene_Inventory.h"

4
Minecraft.Client/Common/XUI/XUI_Scene_Inventory.h
View File

@@ -1,9 +1,9 @@
#pragma once
using namespace std;
#include "..\Media\xuiscene_inventory.h"
#include "../Media/xuiscene_inventory.h"
#include "XUI_Scene_AbstractContainer.h"
#include "XUI_CustomMessages.h"
#include "..\UI\IUIScene_InventoryMenu.h"
#include "../UI/IUIScene_InventoryMenu.h"
#define INVENTORY_UPDATE_EFFECTS_TIMER_ID (10)
#define INVENTORY_UPDATE_EFFECTS_TIMER_TIME (1000) // 1 second

26
Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp
View File

@@ -1,26 +1,26 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
#include "..\..\..\Minecraft.World\Container.h"
#include "..\..\..\Minecraft.World\Slot.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
#include "../../../Minecraft.World/Container.h"
#include "../../../Minecraft.World/Slot.h"
#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
#include "../../../Minecraft.World/net.minecraft.world.item.h"
#include "../../../Minecraft.World/net.minecraft.world.entity.player.h"
#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
#include "..\..\MultiplayerLocalPlayer.h"
#include "..\..\Common\Tutorial\Tutorial.h"
#include "..\..\Common\Tutorial\TutorialMode.h"
#include "..\..\Minecraft.h"
#include "../../../Minecraft.World/net.minecraft.stats.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../Common/Tutorial/Tutorial.h"
#include "../../Common/Tutorial/TutorialMode.h"
#include "../../Minecraft.h"
#include "XUI_Scene_AbstractContainer.h"
#include "XUI_Ctrl_SlotItem.h"
#include "XUI_Ctrl_SlotList.h"
#include "XUI_Ctrl_SlotItemListItem.h"
#include "..\..\Common\Potion_macros.h"
#include "../../Common/Potion_Macros.h"
//--------------------------------------------------------------------------------------
// Name: CXuiSceneInventoryCreative::OnInit

8
Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.h
View File

@@ -1,13 +1,13 @@
#pragma once
using namespace std;
#include "..\Media\xuiscene_inventory_creative.h"
#include "../Media/xuiscene_inventory_creative.h"
#include "XUI_Scene_AbstractContainer.h"
#include "XUI_CustomMessages.h"
#include "..\..\..\Minecraft.World\AbstractContainerMenu.h"
#include "..\..\..\Minecraft.World\SimpleContainer.h"
#include "../../../Minecraft.World/AbstractContainerMenu.h"
#include "../../../Minecraft.World/SimpleContainer.h"
#include "..\UI\IUIScene_CreativeMenu.h"
#include "../UI/IUIScene_CreativeMenu.h"
#include <vector>

18
Minecraft.Client/Common/XUI/XUI_Scene_Trading.cpp
View File

@@ -1,16 +1,16 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.trading.h"
#include "..\..\MultiPlayerLocalPlayer.h"
#include "..\..\Common\Tutorial\Tutorial.h"
#include "..\..\Common\Tutorial\TutorialMode.h"
#include "..\..\Common\Tutorial\TutorialEnum.h"
#include "..\..\Minecraft.h"
#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
#include "../../../Minecraft.World/net.minecraft.world.item.trading.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "../../Common/Tutorial/Tutorial.h"
#include "../../Common/Tutorial/TutorialMode.h"
#include "../../Common/Tutorial/TutorialEnum.h"
#include "../../Minecraft.h"
#include "XUI_Ctrl_SlotList.h"
#include "XUI_Scene_Trading.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "..\..\..\Minecraft.World\JavaMath.h"
#include "../../../Minecraft.World/StringHelpers.h"
#include "../../../Minecraft.World/JavaMath.h"
//--------------------------------------------------------------------------------------
// Name: CXuiSceneTrading::OnInit

4
Minecraft.Client/Common/XUI/XUI_Scene_Trading.h
View File

@@ -1,7 +1,7 @@
#pragma once
using namespace std;
#include "..\Media\xuiscene_trading.h"
#include "..\UI\IUIScene_TradingMenu.h"
#include "../Media/xuiscene_trading.h"
#include "../UI/IUIScene_TradingMenu.h"
#define TRADING_UPDATE_TIMER_ID (10)
#define TRADING_UPDATE_TIMER_TIME (50)

12
Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp
View File

@@ -1,13 +1,13 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\DispenserTileEntity.h"
#include "..\..\..\Minecraft.World\TrapMenu.h"
#include "..\..\MultiplayerLocalPlayer.h"
#include "../../../Minecraft.World/DispenserTileEntity.h"
#include "../../../Minecraft.World/TrapMenu.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "XUI_Ctrl_SlotList.h"
#include "XUI_Scene_Trap.h"
#include "..\..\Common\Tutorial\Tutorial.h"
#include "..\..\Common\Tutorial\TutorialMode.h"
#include "..\..\Common\Tutorial\TutorialEnum.h"
#include "../../Common/Tutorial/Tutorial.h"
#include "../../Common/Tutorial/TutorialMode.h"
#include "../../Common/Tutorial/TutorialEnum.h"
//--------------------------------------------------------------------------------------
// Name: CXuiSceneTrap::OnInit

4
Minecraft.Client/Common/XUI/XUI_Scene_Trap.h
View File

@@ -1,8 +1,8 @@
#pragma once
using namespace std;
#include "..\Media\xuiscene_trap.h"
#include "../Media/xuiscene_trap.h"
#include "XUI_Scene_AbstractContainer.h"
#include "..\UI\IUIScene_DispenserMenu.h"
#include "../UI/IUIScene_DispenserMenu.h"
#include "XUI_CustomMessages.h"
class Container;

14
Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp
View File

@@ -2,13 +2,13 @@
//
#include "stdafx.h"
#include "..\..\Minecraft.h"
#include "..\..\Common\Tutorial\TutorialMode.h"
#include "..\..\Font.h"
#include "..\..\..\Minecraft.World\Random.h"
#include "..\..\..\Minecraft.World\SharedConstants.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "..\..\MultiplayerLocalPlayer.h"
#include "../../Minecraft.h"
#include "../../Common/Tutorial/TutorialMode.h"
#include "../../Font.h"
#include "../../../Minecraft.World/Random.h"
#include "../../../Minecraft.World/SharedConstants.h"
#include "../../../Minecraft.World/StringHelpers.h"
#include "../../MultiPlayerLocalPlayer.h"
#include "XUI_Scene_Win.h"
BYTE CScene_Win::s_winUserIndex = 0;

2
Minecraft.Client/Common/XUI/XUI_Scene_Win.h
View File

@@ -1,6 +1,6 @@
#pragma once
#include "../media/xuiscene_Win.h"
#include "../media/xuiscene_win.h"
#include "XUI_CustomMessages.h"
class CScene_Win : public CXuiSceneImpl

2
Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp
View File

@@ -2,7 +2,7 @@
//
#include "stdafx.h"
#include "..\XUI\XUI_SettingsAll.h"
#include "../XUI/XUI_SettingsAll.h"
//----------------------------------------------------------------------------------
// Performs initialization tasks - retrieves controls.

2
Minecraft.Client/Common/XUI/XUI_SettingsAll.h
View File

@@ -1,6 +1,6 @@
#pragma once
#include "../media/xuiscene_settings_all.h"
#include "../media/xuiscene_settings_All.h"
#include "XUI_Ctrl_SliderWrapper.h"
#include "XUI_CustomMessages.h"

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