mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-05-11 09:11:59 +00:00
major: Switch to forward slashes(+more) to fix compilation on Linux (#1403)
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:
@@ -1,9 +1,9 @@
|
||||
#include "stdafx.h"
|
||||
|
||||
#include "..\..\Minecraft.h"
|
||||
#include "..\..\MultiplayerLocalPlayer.h"
|
||||
#include "../../Minecraft.h"
|
||||
#include "../../MultiPlayerLocalPlayer.h"
|
||||
#include "AreaConstraint.h"
|
||||
#include "..\..\..\Minecraft.World\AABB.h"
|
||||
#include "../../../Minecraft.World/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 )
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#include "stdafx.h"
|
||||
|
||||
#include "..\..\Minecraft.h"
|
||||
#include "..\..\MultiplayerLocalPlayer.h"
|
||||
#include "../../Minecraft.h"
|
||||
#include "../../MultiPlayerLocalPlayer.h"
|
||||
#include "AreaHint.h"
|
||||
#include "..\..\..\Minecraft.World\AABB.h"
|
||||
#include "../../../Minecraft.World/AABB.h"
|
||||
#include "Tutorial.h"
|
||||
|
||||
AreaHint::AreaHint(eTutorial_Hint id, Tutorial *tutorial, eTutorial_State displayState, eTutorial_State completeState,
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
#include "stdafx.h"
|
||||
|
||||
#include "Tutorial.h"
|
||||
#include "..\..\Minecraft.h"
|
||||
#include "..\..\MultiplayerLocalPlayer.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
|
||||
#include "../../Minecraft.h"
|
||||
#include "../../MultiPlayerLocalPlayer.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.level.h"
|
||||
#include "ChangeStateConstraint.h"
|
||||
#include "..\..\..\Minecraft.World\AABB.h"
|
||||
#include "..\..\ClientConnection.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
|
||||
#include "../../../Minecraft.World/AABB.h"
|
||||
#include "../../ClientConnection.h"
|
||||
#include "../../../Minecraft.World/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*/ )
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
#include "stdafx.h"
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
#include "..\..\Minecraft.h"
|
||||
#include "..\..\MultiplayerLocalPlayer.h"
|
||||
#include "../../Minecraft.h"
|
||||
#include "../../MultiPlayerLocalPlayer.h"
|
||||
#include "Tutorial.h"
|
||||
#include "TutorialConstraints.h"
|
||||
#include "ChoiceTask.h"
|
||||
#include "..\..\..\Minecraft.World\Material.h"
|
||||
#include "..\..\Windows64\KeyboardMouseInput.h"
|
||||
#include "../../../Minecraft.World/Material.h"
|
||||
#include "../../Windows64/KeyboardMouseInput.h"
|
||||
#include "Common/UI/UI.h"
|
||||
|
||||
ChoiceTask::ChoiceTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include "stdafx.h"
|
||||
#include "..\..\..\Minecraft.World\ItemInstance.h"
|
||||
#include "../../../Minecraft.World/ItemInstance.h"
|
||||
#include "CompleteUsingItemTask.h"
|
||||
|
||||
CompleteUsingItemTask::CompleteUsingItemTask(Tutorial *tutorial, int descriptionId, int itemIds[], unsigned int itemIdsLength, bool enablePreCompletion)
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#include "stdafx.h"
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
#include "..\..\Minecraft.h"
|
||||
#include "..\..\MultiplayerLocalPlayer.h"
|
||||
#include "../../Minecraft.h"
|
||||
#include "../../MultiPlayerLocalPlayer.h"
|
||||
#include "Tutorial.h"
|
||||
#include "TutorialConstraints.h"
|
||||
#include "ControllerTask.h"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "stdafx.h"
|
||||
#include "CraftTask.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.item.h"
|
||||
|
||||
CraftTask::CraftTask( int itemId, int auxValue, int quantity,
|
||||
Tutorial *tutorial, int descriptionId, bool enablePreCompletion /*= true*/, vector<TutorialConstraint *> *inConstraints /*= nullptr*/,
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#include "stdafx.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.entity.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.level.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.item.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.entity.h"
|
||||
#include "Tutorial.h"
|
||||
#include "DiggerItemHint.h"
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include "stdafx.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.effect.h"
|
||||
#include "EffectChangedTask.h"
|
||||
|
||||
EffectChangedTask::EffectChangedTask(Tutorial *tutorial, int descriptionId, MobEffect *effect, bool apply,
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
#include "stdafx.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h"
|
||||
#include "..\GameRules\ConsoleGameRules.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.item.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.level.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.phys.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.effect.h"
|
||||
#include "../GameRules/ConsoleGameRules.h"
|
||||
#include "DiggerItemHint.h"
|
||||
#include "TutorialTasks.h"
|
||||
#include "AreaHint.h"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include "stdafx.h"
|
||||
#include "..\..\Minecraft.h"
|
||||
#include "../../Minecraft.h"
|
||||
#include "FullTutorial.h"
|
||||
#include "FullTutorialMode.h"
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "Minecraft.h"
|
||||
#include "Tutorial.h"
|
||||
|
||||
#include "..\Minecraft.World\EntityHorse.h"
|
||||
#include "../Minecraft.World/EntityHorse.h"
|
||||
|
||||
#include "HorseChoiceTask.h"
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
#include "stdafx.h"
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
#include "..\..\Minecraft.h"
|
||||
#include "..\..\MultiplayerLocalPlayer.h"
|
||||
#include "../../Minecraft.h"
|
||||
#include "../../MultiPlayerLocalPlayer.h"
|
||||
#include "Tutorial.h"
|
||||
#include "TutorialConstraints.h"
|
||||
#include "InfoTask.h"
|
||||
#include "..\..\..\Minecraft.World\Material.h"
|
||||
#include "..\..\Windows64\KeyboardMouseInput.h"
|
||||
#include "../../../Minecraft.World/Material.h"
|
||||
#include "../../Windows64/KeyboardMouseInput.h"
|
||||
#include "Common/UI/UI.h"
|
||||
|
||||
InfoTask::InfoTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
using namespace std;
|
||||
|
||||
#include "..\..\..\Minecraft.World\Class.h"
|
||||
#include "../../../Minecraft.World/Class.h"
|
||||
#include "TutorialHint.h"
|
||||
|
||||
class ItemInstance;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "stdafx.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.item.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
|
||||
#include "Tutorial.h"
|
||||
#include "LookAtTileHint.h"
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "Minecraft.h"
|
||||
#include "Tutorial.h"
|
||||
|
||||
#include "..\Minecraft.World\EntityHorse.h"
|
||||
#include "../Minecraft.World/EntityHorse.h"
|
||||
|
||||
#include "RideEntityTask.h"
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#include "stdafx.h"
|
||||
#include "..\..\Minecraft.h"
|
||||
#include "..\..\LocalPlayer.h"
|
||||
#include "..\..\StatsCounter.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
|
||||
#include "../../Minecraft.h"
|
||||
#include "../../LocalPlayer.h"
|
||||
#include "../../StatsCounter.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.stats.h"
|
||||
#include "StatTask.h"
|
||||
|
||||
StatTask::StatTask(Tutorial *tutorial, int descriptionId, bool enablePreCompletion, Stat *stat, int variance /*= 1*/)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "stdafx.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.item.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
|
||||
#include "Tutorial.h"
|
||||
#include "TakeItemHint.h"
|
||||
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
#include "stdafx.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
|
||||
#include "..\..\LocalPlayer.h"
|
||||
#include "..\..\..\Minecraft.World\Entity.h"
|
||||
#include "..\..\..\Minecraft.World\Level.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
|
||||
#include "..\..\MinecraftServer.h"
|
||||
#include "..\..\Minecraft.h"
|
||||
#include "..\..\MultiPlayerLocalPlayer.h"
|
||||
#include "..\..\MultiPlayerLevel.h"
|
||||
#include "..\..\SurvivalMode.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.stats.h"
|
||||
#include "../../LocalPlayer.h"
|
||||
#include "../../../Minecraft.World/Entity.h"
|
||||
#include "../../../Minecraft.World/Level.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.entity.player.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.item.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.level.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
|
||||
#include "../../MinecraftServer.h"
|
||||
#include "../../Minecraft.h"
|
||||
#include "../../MultiPlayerLocalPlayer.h"
|
||||
#include "../../MultiPlayerLevel.h"
|
||||
#include "../../SurvivalMode.h"
|
||||
#include "Tutorial.h"
|
||||
#include "TutorialMessage.h"
|
||||
#include "TutorialTasks.h"
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
#include "stdafx.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.level.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.item.h"
|
||||
#include "Tutorial.h"
|
||||
#include "TutorialHint.h"
|
||||
#include "..\..\Minecraft.h"
|
||||
#include "..\..\MultiplayerLocalPlayer.h"
|
||||
#include "../../Minecraft.h"
|
||||
#include "../../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 ),
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
#include "stdafx.h"
|
||||
#include <memory>
|
||||
#include "..\..\Minecraft.h"
|
||||
#include "..\..\MultiplayerLocalPlayer.h"
|
||||
#include "..\..\MultiPlayerLevel.h"
|
||||
#include "..\..\..\Minecraft.World\Inventory.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
|
||||
#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
|
||||
#include "../../Minecraft.h"
|
||||
#include "../../MultiPlayerLocalPlayer.h"
|
||||
#include "../../MultiPlayerLevel.h"
|
||||
#include "../../../Minecraft.World/Inventory.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.item.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.level.h"
|
||||
#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
|
||||
#include "TutorialMode.h"
|
||||
|
||||
TutorialMode::TutorialMode(int iPad, Minecraft *minecraft, ClientConnection *connection) : MultiPlayerGameMode( minecraft, connection ), m_iPad( iPad )
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
using namespace std;
|
||||
|
||||
#include "..\..\MultiPlayerGameMode.h"
|
||||
#include "../../MultiPlayerGameMode.h"
|
||||
#include "Tutorial.h"
|
||||
|
||||
class TutorialMode : public MultiPlayerGameMode
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "stdafx.h"
|
||||
#include "..\..\..\Minecraft.World\Entity.h"
|
||||
#include "..\..\..\Minecraft.World\Level.h"
|
||||
#include "..\..\..\Minecraft.World\ItemInstance.h"
|
||||
#include "../../../Minecraft.World/Entity.h"
|
||||
#include "../../../Minecraft.World/Level.h"
|
||||
#include "../../../Minecraft.World/ItemInstance.h"
|
||||
#include "UseItemTask.h"
|
||||
|
||||
UseItemTask::UseItemTask(const int itemId, Tutorial *tutorial, int descriptionId,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "stdafx.h"
|
||||
#include "..\..\..\Minecraft.World\Entity.h"
|
||||
#include "..\..\..\Minecraft.World\Level.h"
|
||||
#include "..\..\..\Minecraft.World\ItemInstance.h"
|
||||
#include "../../../Minecraft.World/Entity.h"
|
||||
#include "../../../Minecraft.World/Level.h"
|
||||
#include "../../../Minecraft.World/ItemInstance.h"
|
||||
#include "UseTileTask.h"
|
||||
|
||||
UseTileTask::UseTileTask(const int tileId, int x, int y, int z, Tutorial *tutorial, int descriptionId,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "stdafx.h"
|
||||
#include "..\..\..\Minecraft.World\ItemInstance.h"
|
||||
#include "../../../Minecraft.World/ItemInstance.h"
|
||||
#if !(defined _XBOX) && !(defined __PSVITA__)
|
||||
#include "..\UI\UI.h"
|
||||
#include "../UI/UI.h"
|
||||
#endif
|
||||
#include "Tutorial.h"
|
||||
#include "XuiCraftingTask.h"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
#include "TutorialTask.h"
|
||||
#include "..\..\..\Minecraft.World\Recipy.h"
|
||||
#include "../../../Minecraft.World/Recipy.h"
|
||||
|
||||
class XuiCraftingTask : public TutorialTask
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user