backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-09 06:37:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(Minecraft.Client|World) FIX ALL HEADERS HOLY SHIT

Browse source
This commit is contained in:
Mohamed Ashraf 2026-03-01 21:42:44 +04:00
parent 241491e122
commit d6f88335e7
16 changed files with 75 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Minecraft.Client/ArchiveFile.h
View file

@ -3,8 +3,8 @@
#include <vector>
#include <unordered_map>
#include "..\Minecraft.World\File.h"
#include "..\Minecraft.World\ArrayWithLength.h"
#include "../Minecraft.World/File.h"
#include "../Minecraft.World/ArrayWithLength.h"
using namespace std;
@ -35,4 +35,4 @@ public:
bool hasFile(const wstring &filename);
int getFileSize(const wstring &filename);
byteArray getFile(const wstring &filename);
};
};

5
Minecraft.Client/Common/Audio/Consoles_SoundEngine.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "..\..\..\Minecraft.World\SoundTypes.h"
#include "../../../Minecraft.World/SoundTypes.h"
#ifdef _XBOX
@ -16,6 +16,9 @@
#include "..\..\Durango\Miles\include\mss.h"
#elif defined _WINDOWS64
#include "..\..\windows64\Miles\include\mss.h"
#elif defined(__linux__)
// (DecalOverdose)HACK + TODO: Find native Linux headers and libs for this, but for now I'm using Win64 ones
// #include "../../windows64/Miles/include/mss.h"
#else // PS4
// 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles
#define _SEKRIT2

23
Minecraft.Client/Common/Consoles_App.h
View file

@ -3,25 +3,28 @@
using namespace std;
#include "Audio/Consoles_SoundEngine.h"
#ifndef __linux__
#include <xuiapp.h>
#include "..\Common\Tutorial\TutorialEnum.h"
#endif
#include "../Common/Tutorial/TutorialEnum.h"
#ifdef _XBOX
#include "..\Common\XUI\XUI_Helper.h"
#include "..\Common\XUI\XUI_HelpCredits.h"
#endif
#include "UI\UIStructs.h"
#include "UI/UIStructs.h"
#include "..\..\Minecraft.World\DisconnectPacket.h"
#include "../../Minecraft.World/DisconnectPacket.h"
#ifndef __linux__
#include <xsocialpost.h>
#endif // __linux__
#include "..\StringTable.h"
#include "..\Common\DLC\DLCManager.h"
#include "..\Common\GameRules\ConsoleGameRulesConstants.h"
#include "..\Common\GameRules\GameRuleManager.h"
#include "..\SkinBox.h"
#include "..\ArchiveFile.h"
#include "../StringTable.h"
#include "../Common/DLC/DLCManager.h"
#include "../Common/GameRules/ConsoleGameRulesConstants.h"
#include "../Common/GameRules/GameRuleManager.h"
#include "../SkinBox.h"
#include "../ArchiveFile.h"
typedef struct _JoinFromInviteData
{

4
Minecraft.Client/Common/DLC/DLCSkinFile.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "DLCFile.h"
#include "..\..\..\Minecraft.Client\HumanoidModel.h"
#include "../../../Minecraft.Client/HumanoidModel.h"
class DLCSkinFile : public DLCFile
{
@ -26,4 +26,4 @@ public:
int getAdditionalBoxesCount();
unsigned int getAnimOverrideBitmask() { return m_uiAnimOverrideBitmask;}
bool isFree() {return m_bIsFree;}
};
};

4
Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "GameRuleDefinition.h"
#include "..\..\..\Minecraft.World\StructurePiece.h"
#include "../../../Minecraft.World/StructurePiece.h"
class Level;
class Random;
@ -35,4 +35,4 @@ public:
bool checkIntersects(int x0, int y0, int z0, int x1, int y1, int z1);
virtual int getMinY();
};
};

4
Minecraft.Client/Common/GameRules/ConsoleSchematicFile.h
View file

@ -4,7 +4,7 @@ using namespace std;
#define XBOX_SCHEMATIC_ORIGINAL_VERSION 1
#define XBOX_SCHEMATIC_CURRENT_VERSION 2
#include "..\..\..\Minecraft.World\ArrayWithLength.h"
#include "../../../Minecraft.World/ArrayWithLength.h"
class Level;
class DataOutputStream;
@ -87,4 +87,4 @@ private:
void chunkCoordToSchematicCoord(AABB *destinationBox, int chunkX, int chunkZ, ESchematicRotation rot, int &schematicX, int &schematicZ);
void schematicCoordToChunkCoord(AABB *destinationBox, double schematicX, double schematicZ, ESchematicRotation rot, double &chunkX, double &chunkZ);
};
};

4
Minecraft.Client/Common/GameRules/GameRuleDefinition.h
View file

@ -3,7 +3,7 @@ using namespace std;
#include <unordered_map>
#include <string>
#include "..\..\..\Minecraft.World\ItemInstance.h"
#include "../../../Minecraft.World/ItemInstance.h"
#include "ConsoleGameRulesConstants.h"
#include "GameRulesInstance.h"
@ -63,4 +63,4 @@ public:
static GameRulesInstance *generateNewGameRulesInstance(GameRulesInstance::EGameRulesInstanceType type, LevelRuleset *rules, Connection *connection);
static wstring generateDescriptionString(ConsoleGameRules::EGameRuleType defType, const wstring &description, void *data = NULL, int dataLength = 0);
};
};

4
Minecraft.Client/Common/GameRules/LevelGenerationOptions.h
View file

@ -4,7 +4,7 @@ using namespace std;
#pragma message("LevelGenerationOptions.h ")
#include "GameRuleDefinition.h"
#include "..\..\..\Minecraft.World\StructureFeature.h"
#include "../../../Minecraft.World/StructureFeature.h"
class ApplySchematicRuleDefinition;
class LevelChunk;
@ -213,4 +213,4 @@ public:
// This file contains state that needs to be deleted
// or reset once a game has finished.
void reset_finish();
};
};

4
Minecraft.Client/Common/GameRules/StartFeature.h
View file

@ -2,7 +2,7 @@
using namespace std;
#include "GameRuleDefinition.h"
#include "..\..\..\Minecraft.World\StructureFeature.h"
#include "../../../Minecraft.World/StructureFeature.h"
class StartFeature : public GameRuleDefinition
{
@ -19,4 +19,4 @@ public:
virtual void addAttribute(const wstring &attributeName, const wstring &attributeValue);
bool isFeatureChunk(int chunkX, int chunkZ, StructureFeature::EFeatureTypes feature);
};
};

4
Minecraft.Client/Common/GameRules/UseTileRuleDefinition.h
View file

@ -2,7 +2,7 @@
using namespace std;
#include "GameRuleDefinition.h"
#include "..\..\..\Minecraft.World\Pos.h"
#include "../../../Minecraft.World/Pos.h"
class UseTileRuleDefinition : public GameRuleDefinition
{
@ -21,4 +21,4 @@ public:
virtual void addAttribute(const wstring &attributeName, const wstring &attributeValue);
virtual bool onUseTile(GameRule *rule, int tileId, int x, int y, int z);
};
};

4
Minecraft.Client/Common/Network/GameNetworkManager.h
View file

@ -1,8 +1,10 @@
#pragma once
using namespace std;
#include <vector>
#ifndef __linux__
#include <qnet.h>
#include "..\..\..\Minecraft.World\C4JThread.h"
#endif
#include "../../../Minecraft.World/C4JThread.h"
#include "NetworkPlayerInterface.h"
#ifdef _XBOX
#include "..\..\Xbox\Network\PlatformNetworkManagerXbox.h"

4
Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h
View file

@ -1,8 +1,10 @@
#pragma once
using namespace std;
#include <vector>
#ifndef __linux__
#include <qnet.h>
#include "..\..\..\Minecraft.World\C4JThread.h"
#endif // __linux__
#include "../../../Minecraft.World/C4JThread.h"
#include "NetworkPlayerInterface.h"
#include "SessionInfo.h"

2
Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h
View file

@ -1,7 +1,7 @@
#pragma once
using namespace std;
#include <vector>
#include "..\..\..\Minecraft.World\C4JThread.h"
#include "../../../Minecraft.World/C4JThread.h"
#include "NetworkPlayerInterface.h"
#include "PlatformNetworkManagerInterface.h"
#include "SessionInfo.h"

4
Minecraft.Client/Common/Telemetry/TelemetryManager.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "..\..\Common\UI\UIEnums.h"
#include "../../Common/UI/UIEnums.h"
class CTelemetryManager
{
@ -62,4 +62,4 @@ protected:
INT GetLevelExitProgressStat2();
};
extern CTelemetryManager *TelemetryManager;
extern CTelemetryManager *TelemetryManager;

4
Minecraft.Client/Model.h
View file

@ -1,7 +1,7 @@
#pragma once
using namespace std;
#include "..\Minecraft.World\Random.h"
#include "..\Minecraft.Client\SkinBox.h"
#include "../Minecraft.World/Random.h"
#include "../Minecraft.Client/SkinBox.h"
class Mob;
class ModelPart;
class TexOffs;

49
Minecraft.World/stdafx.h
View file

@ -90,6 +90,10 @@ typedef XUID GameSessionUID;
#include "PSVitaTypes.h"
#include "PSVitaStubs.h"
#include "PSVitaMaths.h"
#elif defined(__linux__)
#include <unordered_map>
#include <unordered_set>
#include <vector>
#else
#include <unordered_map>
#include <unordered_set>
@ -116,10 +120,10 @@ typedef XUID GameSessionUID;
#include <assert.h>
#endif
#ifndef _XBOX
#if !defined(__linux__)
#include "extraX64.h"
#else
#include "..\Minecraft.Client\xbox\network\extra.h"
#include "../Minecraft.Client/Xbox/Network/extra.h"
#endif
#include "Definitions.h"
@ -173,6 +177,11 @@ void MemSect(int sect);
#include "..\Minecraft.Client\PSVita\4JLibs\inc\4J_Render.h"
#include "..\Minecraft.Client\PSVita\4JLibs\inc\4J_Storage.h"
#include "..\Minecraft.Client\PSVita\4JLibs\inc\4J_Input.h"
#elif defined __linux__
#include "../Minecraft.Client/Windows64/4JLibs/inc/4J_Profile.h"
#include "../Minecraft.Client/Windows64/4JLibs/inc/4J_Render.h"
#include "../Minecraft.Client/Windows64/4JLibs/inc/4J_Storage.h"
#include "../Minecraft.Client/Windows64/4JLibs/inc/4J_Input.h"
#else
#include "..\Minecraft.Client\Orbis\4JLibs\inc\4J_Profile.h"
#include "..\Minecraft.Client\Orbis\4JLibs\inc\4J_Render.h"
@ -180,25 +189,25 @@ void MemSect(int sect);
#include "..\Minecraft.Client\Orbis\4JLibs\inc\4J_Input.h"
#endif
#include "..\Minecraft.Client\Common\Network\GameNetworkManager.h"
#include "../Minecraft.Client/Common/Network/GameNetworkManager.h"
// #ifdef _XBOX
#include "..\Minecraft.Client\Common\UI\UIEnums.h"
#include "..\Minecraft.Client\Common\App_defines.h"
#include "..\Minecraft.Client\Common\App_enums.h"
#include "..\Minecraft.Client\Common\Tutorial\TutorialEnum.h"
#include "..\Minecraft.Client\Common\App_structs.h"
#include "../Minecraft.Client/Common/UI/UIEnums.h"
#include "../Minecraft.Client/Common/App_Defines.h"
#include "../Minecraft.Client/Common/App_enums.h"
#include "../Minecraft.Client/Common/Tutorial/TutorialEnum.h"
#include "../Minecraft.Client/Common/App_structs.h"
//#endif
#ifdef _XBOX
#include "..\Minecraft.Client\Common\XUI\XUI_Helper.h"
#include "..\Minecraft.Client\Common\XUI\XUI_Scene_Base.h"
#endif
#include "..\Minecraft.Client\Common\Consoles_App.h"
#include "..\Minecraft.Client\Common\Minecraft_Macros.h"
#include "..\Minecraft.Client\Common\Colours\ColourTable.h"
#include "../Minecraft.Client/Common/Consoles_App.h"
#include "../Minecraft.Client/Common/Minecraft_Macros.h"
#include "../Minecraft.Client/Common/Colours/ColourTable.h"
#include "..\Minecraft.Client\Common\BuildVer.h"
#include "../Minecraft.Client/Common/BuildVer.h"
#ifdef _XBOX
#include "..\Minecraft.Client\Xbox\Xbox_App.h"
@ -231,6 +240,8 @@ void MemSect(int sect);
#include "..\Minecraft.Client\PSVitaMedia\strings.h" // TODO - create PSVita-specific version of this
#include "..\Minecraft.Client\PSVita\Sentient\SentientManager.h"
#include "..\Minecraft.Client\PSVita\Sentient\MinecraftTelemetry.h"
#elif defined(__linux__)
// DecalOverdose: TODO????
#else
#include "..\Minecraft.Client\Orbis\Orbis_App.h"
#include "..\Minecraft.Client\OrbisMedia\strings.h"
@ -238,10 +249,10 @@ void MemSect(int sect);
#include "..\Minecraft.Client\Orbis\Sentient\MinecraftTelemetry.h"
#endif
#include "..\Minecraft.Client\Common\DLC\DLCSkinFile.h"
#include "..\Minecraft.Client\Common\Console_Awards_enum.h"
#include "..\Minecraft.Client\Common\Potion_Macros.h"
#include "..\Minecraft.Client\Common\Console_Debug_enum.h"
#include "..\Minecraft.Client\Common\GameRules\ConsoleGameRulesConstants.h"
#include "..\Minecraft.Client\Common\GameRules\ConsoleGameRules.h"
#include "..\Minecraft.Client\Common\Telemetry\TelemetryManager.h"
#include "../Minecraft.Client/Common/DLC/DLCSkinFile.h"
#include "../Minecraft.Client/Common/Console_Awards_enum.h"
#include "../Minecraft.Client/Common/Potion_Macros.h"
#include "../Minecraft.Client/Common/Console_Debug_enum.h"
#include "../Minecraft.Client/Common/GameRules/ConsoleGameRulesConstants.h"
#include "../Minecraft.Client/Common/GameRules/ConsoleGameRules.h"
#include "../Minecraft.Client/Common/Telemetry/TelemetryManager.h"