painful update

2026-06-01 10:55:21 +00:00 · 2026-03-06 18:31:46 +01:00
parent 587e9a676e
commit 417ea73050
408 changed files with 1605 additions and 1594 deletions
--- a/Common/Tutorial/AreaConstraint.cpp
+++ b/Common/Tutorial/AreaConstraint.cpp
@@ -1,9 +1,9 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"

-#include "../../../Minecraft.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
 #include "AreaConstraint.h"
-#include "../../../../Minecraft.World/Util/AABB.h"
+#include "../../Minecraft.World/Util/AABB.h"

 AreaConstraint::AreaConstraint( int descriptionId, double x0, double y0, double z0, double x1, double y1, double z1, bool contains /*= true*/, bool restrictsMovement /*=true*/ )
 	: TutorialConstraint( descriptionId )
--- a/Common/Tutorial/AreaHint.cpp
+++ b/Common/Tutorial/AreaHint.cpp
@@ -1,9 +1,9 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"

-#include "../../../Minecraft.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
 #include "AreaHint.h"
-#include "../../../../Minecraft.World/Util/AABB.h"
+#include "../../Minecraft.World/Util/AABB.h"
 #include "Tutorial.h"

 AreaHint::AreaHint(eTutorial_Hint id, Tutorial *tutorial, eTutorial_State displayState, eTutorial_State completeState,
--- a/Common/Tutorial/AreaTask.cpp
+++ b/Common/Tutorial/AreaTask.cpp
@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "Tutorial.h"
 #include "AreaTask.h"

--- a/Common/Tutorial/ChangeStateConstraint.cpp
+++ b/Common/Tutorial/ChangeStateConstraint.cpp
@@ -1,13 +1,13 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"

 #include "Tutorial.h"
-#include "../../../Minecraft.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
 #include "ChangeStateConstraint.h"
-#include "../../../../Minecraft.World/Util/AABB.h"
-#include "../../../Network/ClientConnection.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.network.packet.h"
+#include "../../Minecraft.World/Util/AABB.h"
+#include "../../Minecraft.Client/Network/ClientConnection.h"
+#include "../../Minecraft.World/Headers/net.minecraft.network.packet.h"

 ChangeStateConstraint::ChangeStateConstraint( Tutorial *tutorial, eTutorial_State targetState, eTutorial_State sourceStates[], DWORD sourceStatesCount,
 	double x0, double y0, double z0, double x1, double y1, double z1, bool contains /*= true*/, bool changeGameMode /*= false*/, GameType *targetGameMode /*= 0*/ )
--- a/Common/Tutorial/ChoiceTask.cpp
+++ b/Common/Tutorial/ChoiceTask.cpp
@@ -1,12 +1,12 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include <string>
 #include <unordered_map>
-#include "../../../Minecraft.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
 #include "Tutorial.h"
 #include "TutorialConstraints.h"
 #include "ChoiceTask.h"
-#include "../../../../Minecraft.World/Blocks/Material.h"
+#include "../../Minecraft.World/Blocks/Material.h"

 ChoiceTask::ChoiceTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/,
 	int iConfirmMapping /*= 0*/, int iCancelMapping /*= 0*/,
--- a/Common/Tutorial/CompleteUsingItemTask.cpp
+++ b/Common/Tutorial/CompleteUsingItemTask.cpp
@@ -1,5 +1,5 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../../Minecraft.World/Items/ItemInstance.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Items/ItemInstance.h"
 #include "CompleteUsingItemTask.h"

 CompleteUsingItemTask::CompleteUsingItemTask(Tutorial *tutorial, int descriptionId, int itemIds[], unsigned int itemIdsLength, bool enablePreCompletion)
--- a/Common/Tutorial/ControllerTask.cpp
+++ b/Common/Tutorial/ControllerTask.cpp
@@ -1,8 +1,8 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include <string>
 #include <unordered_map>
-#include "../../../Minecraft.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
 #include "Tutorial.h"
 #include "TutorialConstraints.h"
 #include "ControllerTask.h"
--- a/Common/Tutorial/CraftTask.cpp
+++ b/Common/Tutorial/CraftTask.cpp
@@ -1,6 +1,6 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "CraftTask.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"

 CraftTask::CraftTask( int itemId, int auxValue, int  quantity,
 	Tutorial *tutorial, int descriptionId, bool enablePreCompletion /*= true*/, vector<TutorialConstraint *> *inConstraints /*= NULL*/,
--- a/Common/Tutorial/DiggerItemHint.cpp
+++ b/Common/Tutorial/DiggerItemHint.cpp
@@ -1,8 +1,8 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.entity.h"
 #include "Tutorial.h"
 #include "DiggerItemHint.h"

--- a/Common/Tutorial/EffectChangedTask.cpp
+++ b/Common/Tutorial/EffectChangedTask.cpp
@@ -1,5 +1,5 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.effect.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.effect.h"
 #include "EffectChangedTask.h"

 EffectChangedTask::EffectChangedTask(Tutorial *tutorial, int descriptionId, MobEffect *effect, bool apply,
--- a/Common/Tutorial/FullTutorial.cpp
+++ b/Common/Tutorial/FullTutorial.cpp
@@ -1,9 +1,9 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.phys.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.effect.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.phys.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.effect.h"
 #include "../GameRules/ConsoleGameRules.h"
 #include "DiggerItemHint.h"
 #include "TutorialTasks.h"
--- a/Common/Tutorial/FullTutorialActiveTask.cpp
+++ b/Common/Tutorial/FullTutorialActiveTask.cpp
@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "Tutorial.h"
 #include "FullTutorialActiveTask.h"

--- a/Common/Tutorial/FullTutorialMode.cpp
+++ b/Common/Tutorial/FullTutorialMode.cpp
@@ -1,5 +1,5 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../Minecraft.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.Client/Minecraft.h"
 #include "FullTutorial.h"
 #include "FullTutorialMode.h"

--- a/Common/Tutorial/InfoTask.cpp
+++ b/Common/Tutorial/InfoTask.cpp
@@ -1,12 +1,12 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include <string>
 #include <unordered_map>
-#include "../../../Minecraft.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
 #include "Tutorial.h"
 #include "TutorialConstraints.h"
 #include "InfoTask.h"
-#include "../../../../Minecraft.World/Blocks/Material.h"
+#include "../../Minecraft.World/Blocks/Material.h"

 InfoTask::InfoTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/,
 	int iMapping /*= 0*/, ETelemetryChallenges telemetryEvent /*= eTelemetryTutorial_NoEvent*/)
--- a/Common/Tutorial/InputConstraint.cpp
+++ b/Common/Tutorial/InputConstraint.cpp
@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "InputConstraint.h"

 bool InputConstraint::isMappingConstrained(int iPad, int mapping)
--- a/Common/Tutorial/LookAtEntityHint.cpp
+++ b/Common/Tutorial/LookAtEntityHint.cpp
@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "Tutorial.h"
 #include "LookAtEntityHint.h"

--- a/Common/Tutorial/LookAtEntityHint.h
+++ b/Common/Tutorial/LookAtEntityHint.h
@@ -1,7 +1,7 @@
 #pragma once
 using namespace std;

-#include "../../../../Minecraft.World/Util/Class.h"
+#include "../../Minecraft.World/Util/Class.h"
 #include "TutorialHint.h"

 class ItemInstance;
--- a/Common/Tutorial/LookAtTileHint.cpp
+++ b/Common/Tutorial/LookAtTileHint.cpp
@@ -1,6 +1,6 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
 #include "Tutorial.h"
 #include "LookAtTileHint.h"

--- a/Common/Tutorial/PickupTask.cpp
+++ b/Common/Tutorial/PickupTask.cpp
@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "PickupTask.h"

 void PickupTask::onTake(shared_ptr<ItemInstance> item, unsigned int invItemCountAnyAux, unsigned int invItemCountThisAux)
--- a/Common/Tutorial/ProcedureCompoundTask.cpp
+++ b/Common/Tutorial/ProcedureCompoundTask.cpp
@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "ProcedureCompoundTask.h"

 ProcedureCompoundTask::~ProcedureCompoundTask()
--- a/Common/Tutorial/ProgressFlagTask.cpp
+++ b/Common/Tutorial/ProgressFlagTask.cpp
@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "ProgressFlagTask.h"

 bool ProgressFlagTask::isCompleted()
--- a/Common/Tutorial/StatTask.cpp
+++ b/Common/Tutorial/StatTask.cpp
@@ -1,8 +1,8 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../Minecraft.h"
-#include "../../../Player/LocalPlayer.h"
-#include "../../../GameState/StatsCounter.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.stats.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Player/LocalPlayer.h"
+#include "../../Minecraft.Client/GameState/StatsCounter.h"
+#include "../../Minecraft.World/Headers/net.minecraft.stats.h"
 #include "StatTask.h"

 StatTask::StatTask(Tutorial *tutorial, int descriptionId, bool enablePreCompletion, Stat *stat, int variance /*= 1*/)
--- a/Common/Tutorial/TakeItemHint.cpp
+++ b/Common/Tutorial/TakeItemHint.cpp
@@ -1,6 +1,6 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
 #include "Tutorial.h"
 #include "TakeItemHint.h"

--- a/Common/Tutorial/Tutorial.cpp
+++ b/Common/Tutorial/Tutorial.cpp
@@ -1,17 +1,17 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.stats.h"
-#include "../../../Player/LocalPlayer.h"
-#include "../../../../Minecraft.World/Entities/Entity.h"
-#include "../../../../Minecraft.World/Level/Level.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
-#include "../../../MinecraftServer.h"
-#include "../../../Minecraft.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
-#include "../../../Level/MultiPlayerLevel.h"
-#include "../../../GameState/SurvivalMode.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Headers/net.minecraft.stats.h"
+#include "../../Minecraft.Client/Player/LocalPlayer.h"
+#include "../../Minecraft.World/Entities/Entity.h"
+#include "../../Minecraft.World/Level/Level.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
+#include "../../Minecraft.Client/MinecraftServer.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.Client/Level/MultiPlayerLevel.h"
+#include "../../Minecraft.Client/GameState/SurvivalMode.h"
 #include "Tutorial.h"
 #include "TutorialMessage.h"
 #include "TutorialTasks.h"
--- a/Common/Tutorial/TutorialHint.cpp
+++ b/Common/Tutorial/TutorialHint.cpp
@@ -1,11 +1,11 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
 #include "Tutorial.h"
 #include "TutorialHint.h"
-#include "../../../Minecraft.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"

 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 ),
--- a/Common/Tutorial/TutorialMessage.cpp
+++ b/Common/Tutorial/TutorialMessage.cpp
@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "TutorialMessage.h"

 TutorialMessage::TutorialMessage(int messageId, bool limitRepeats /*= false*/, unsigned char numRepeats /*= TUTORIAL_MESSAGE_DEFAULT_SHOW*/)
--- a/Common/Tutorial/TutorialMode.cpp
+++ b/Common/Tutorial/TutorialMode.cpp
@@ -1,12 +1,12 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include <memory>
-#include "../../../Minecraft.h"
-#include "../../../Player/MultiPlayerLocalPlayer.h"
-#include "../../../Level/MultiPlayerLevel.h"
-#include "../../../../Minecraft.World/Containers/Inventory.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
-#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.Client/Level/MultiPlayerLevel.h"
+#include "../../Minecraft.World/Containers/Inventory.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
+#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
 #include "TutorialMode.h"

 TutorialMode::TutorialMode(int iPad, Minecraft *minecraft, ClientConnection *connection) : MultiPlayerGameMode( minecraft, connection ), m_iPad( iPad )
--- a/Common/Tutorial/TutorialMode.h
+++ b/Common/Tutorial/TutorialMode.h
@@ -1,7 +1,7 @@
 #pragma once
 using namespace std;

-#include "../../../Player/MultiPlayerGameMode.h"
+#include "../../Minecraft.Client/Player/MultiPlayerGameMode.h"
 #include "Tutorial.h"

 class TutorialMode : public MultiPlayerGameMode
--- a/Common/Tutorial/TutorialTask.cpp
+++ b/Common/Tutorial/TutorialTask.cpp
@@ -1,4 +1,4 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Build/stdafx.h"
 #include "Tutorial.h"
 #include "TutorialConstraints.h"
 #include "TutorialTask.h"
--- a/Common/Tutorial/UseItemTask.cpp
+++ b/Common/Tutorial/UseItemTask.cpp
@@ -1,7 +1,7 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../../Minecraft.World/Entities/Entity.h"
-#include "../../../../Minecraft.World/Level/Level.h"
-#include "../../../../Minecraft.World/Items/ItemInstance.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Entities/Entity.h"
+#include "../../Minecraft.World/Level/Level.h"
+#include "../../Minecraft.World/Items/ItemInstance.h"
 #include "UseItemTask.h"

 UseItemTask::UseItemTask(const int itemId, Tutorial *tutorial, int descriptionId,
--- a/Common/Tutorial/UseTileTask.cpp
+++ b/Common/Tutorial/UseTileTask.cpp
@@ -1,7 +1,7 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../../Minecraft.World/Entities/Entity.h"
-#include "../../../../Minecraft.World/Level/Level.h"
-#include "../../../../Minecraft.World/Items/ItemInstance.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Entities/Entity.h"
+#include "../../Minecraft.World/Level/Level.h"
+#include "../../Minecraft.World/Items/ItemInstance.h"
 #include "UseTileTask.h"

 UseTileTask::UseTileTask(const int tileId, int x, int y, int z, Tutorial *tutorial, int descriptionId,
--- a/Common/Tutorial/XuiCraftingTask.cpp
+++ b/Common/Tutorial/XuiCraftingTask.cpp
@@ -1,5 +1,5 @@
-#include "../../../../Minecraft.World/Build/stdafx.h"
-#include "../../../../Minecraft.World/Items/ItemInstance.h"
+#include "../../Minecraft.World/Build/stdafx.h"
+#include "../../Minecraft.World/Items/ItemInstance.h"
 #if !(defined _XBOX) && !(defined __PSVITA__)
 #include "../UI/UI.h"
 #endif
--- a/Common/Tutorial/XuiCraftingTask.h
+++ b/Common/Tutorial/XuiCraftingTask.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "TutorialTask.h"
-#include "../../../../Minecraft.World/Recipes/Recipy.h"
+#include "../../Minecraft.World/Recipes/Recipy.h"

 class XuiCraftingTask : public TutorialTask
 {