split out extraX64.h and delete x64headers folder

This commit is contained in:
Tropical 2026-04-01 09:27:02 -05:00
parent 1451a991b3
commit 4fc56e0225
72 changed files with 217 additions and 86 deletions

View file

@ -3,7 +3,9 @@
#include <cstdint>
#include "4J.Storage/4J_Storage.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h"
#include "Minecraft.Client/Common/App_Defines.h"
#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h"

View file

@ -23,7 +23,9 @@
#include "Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.h"
#include "Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.h"
#include "Minecraft.Client/Common/App_structs.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
typedef struct _JoinFromInviteData {
std::uint32_t dwUserIndex; // dwUserIndex

View file

@ -5,7 +5,9 @@
#include "ColourTable.h"
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "java/InputOutputStream/ByteArrayInputStream.h"
#include "java/InputOutputStream/DataInputStream.h"

View file

@ -9,7 +9,9 @@
#include "4J_Storage.h"
#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#if defined(_WINDOWS64)
#include "Minecraft.Client/Windows64/XML/ATGXmlParser.h"
#include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h"

View file

@ -7,7 +7,9 @@
#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
DLCSkinFile::DLCSkinFile(const std::wstring& path)
: DLCFile(DLCManager::e_DLCType_Skin, path) {

View file

@ -12,7 +12,9 @@
#include "Minecraft.World/net/minecraft/world/level/Level.h"
#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h"
#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "java/InputOutputStream/DataOutputStream.h"
ApplySchematicRuleDefinition::ApplySchematicRuleDefinition(

View file

@ -19,7 +19,9 @@
#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h"
#include "Minecraft.World/net/minecraft/world/phys/AABB.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "java/Class.h"
#include "java/InputOutputStream/DataInputStream.h"
#include "java/InputOutputStream/DataOutputStream.h"

View file

@ -13,7 +13,9 @@
#include "LevelGenerationOptions.h"
#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h"
#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "4J_Storage.h"

View file

@ -1,7 +1,9 @@
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
#include "LeaderboardManager.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
const std::wstring LeaderboardManager::filterNames[eNumFilterModes] = {
L"Friends", L"MyScore", L"TopRank"};

View file

@ -2,7 +2,9 @@
#include <limits.h>
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "java/System.h"
NetworkPlayerQNet::NetworkPlayerQNet(IQNetPlayer* qnetPlayer) {

View file

@ -5,7 +5,9 @@
#include <qnet.h>
#endif
#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "NetworkPlayerInterface.h"
#include "SessionInfo.h"

View file

@ -9,7 +9,9 @@
#include "PlatformNetworkManagerInterface.h"
#include "SessionInfo.h"
#include "4J.Common/4J_Compat.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
class C4JThread;
class CGameNetworkManager;

View file

@ -9,7 +9,9 @@
#include "Minecraft.Client/net/minecraft/server/network/ServerConnection.h"
#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h"
#include "Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
class SocketAddress {};

View file

@ -1,4 +1,6 @@
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "Minecraft.Client/Common/Source Files/UI/UI.h"
#include "UIScene_LanguageSelector.h"

View file

@ -2,7 +2,9 @@
#include "Minecraft.Client/Common/Source Files/UI/UIScene.h"
#include "Minecraft.Client/Common/App_Defines.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
class UIScene_LanguageSelector : public UIScene {
public:

View file

@ -14,7 +14,9 @@
#include "Minecraft.Client/Linux/Linux_UIController.h"
#include "Minecraft.World/Header Files/SoundTypes.h"
#include "Minecraft.World/net/minecraft/world/SimpleContainer.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
class UILayer;

View file

@ -76,7 +76,9 @@
#include "Minecraft.Client/Common/Source Files/UI/UIGroup.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "Minecraft.Client/Linux/Linux_UIController.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
UILayer::UILayer(UIGroup* parent) {
m_parentGroup = parent;

View file

@ -21,7 +21,9 @@
#include "Minecraft.World/Header Files/SoundTypes.h"
#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h"
#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "java/System.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"

View file

@ -1,7 +1,9 @@
#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
#include "UIString.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
bool UIString::setCurrentLanguage() {
int nextLanguage, nextLocale;

View file

@ -7,6 +7,8 @@ void Display::update() {}
int CMinecraftApp::GetTPConfigVal(wchar_t* pwchDataFile) { return 0; }
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#endif

View file

@ -21,7 +21,9 @@
#include "Minecraft.World/net/minecraft/locale/Language.h"
#include "Minecraft.World/net/minecraft/world/level/LevelSettings.h"
#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
#include "Minecraft.Client/net/minecraft/client/gui/Screen.h"
#include "Minecraft.Client/Header Files/stubs.h"

View file

@ -33,7 +33,9 @@
#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
#include "Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.h"
#include "Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "java/Random.h"
#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h"

View file

@ -20,7 +20,9 @@
#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h"
#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h"
#include "Minecraft.Client/net/minecraft/client/renderer/culling/Culler.h"

View file

@ -69,7 +69,9 @@
#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
#include "Minecraft.World/net/minecraft/world/phys/AABB.h"
#include "Minecraft.World/net/minecraft/world/phys/HitResult.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "java/Class.h"
#include "java/Random.h"
#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h"

View file

@ -33,7 +33,9 @@
#include "Minecraft.World/net/minecraft/world/level/material/Material.h"
#include "Minecraft.World/net/minecraft/world/level/tile/FireTile.h"
#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "java/System.h"
#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"

View file

@ -7,7 +7,9 @@
#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
#include "Minecraft.World/Header Files/ParticleTypes.h"
#include "Minecraft.World/net/minecraft/world/phys/AABB.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
class ClipChunk;
class HitResult;

View file

@ -63,7 +63,9 @@
#include "Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.h"
#include "Minecraft.World/net/minecraft/world/level/tile/piston/PistonExtensionTile.h"
#include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
bool TileRenderer::fancy = true;

View file

@ -20,7 +20,9 @@
#include "Minecraft.World/net/minecraft/world/item/Item.h"
#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "java/Random.h"
#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
#include "Minecraft.Client/net/minecraft/client/gui/Font.h"

View file

@ -4,7 +4,9 @@
#include "MobRenderer.h"
#include "Minecraft.World/net/minecraft/world/entity/player/Player.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.h"
class HumanoidModel;

View file

@ -17,7 +17,9 @@
#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h"
#include "Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorage.h"
#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
ServerChunkCache::ServerChunkCache(ServerLevel* level, ChunkStorage* storage,
ChunkSource* source) {

View file

@ -46,7 +46,9 @@
#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h"
#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h"
#include "4J_Input.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h"
std::vector<WeighedTreasure*> ServerLevel::RANDOM_BONUS_ITEMS;

View file

@ -53,7 +53,9 @@
#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
#include "Minecraft.World/net/minecraft/world/item/MapItem.h"
#include "Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "java/Class.h"
class AttributeInstance;

View file

@ -18,7 +18,9 @@
#include "Minecraft.World/net/minecraft/network/Connection.h"
#include "Minecraft.World/net/minecraft/network/packet/LoginPacket.h"
#include "Minecraft.World/net/minecraft/network/packet/PreLoginPacket.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "Minecraft.Client/Common/Source Files/BuildVer/BuildVer.h"
#include "java/Random.h"

View file

@ -93,7 +93,9 @@
#include "Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h"
#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "java/Class.h"
#include "java/InputOutputStream/ByteArrayInputStream.h"
#include "java/InputOutputStream/DataInputStream.h"

View file

@ -30,7 +30,9 @@
#include "java/InputOutputStream/DataOutputStream.h"
#include "java/System.h"
#include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "platform/PlatformServices.h"
#define RESERVE_ALLOCATION MEM_RESERVE

View file

@ -35,7 +35,9 @@
#include "java/System.h"
#include "java/File.h"
#include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "platform/PlatformServices.h"
class ProgressListener;

View file

@ -7,7 +7,9 @@
#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h"
#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
#include "compression.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#if defined(_WIN64) || defined(__linux__)
// zconf.h defines "typedef unsigned char Byte" which conflicts with the
// project's "class Byte" from BasicTypeContainers.h (via stdafx.h).

View file

@ -49,5 +49,4 @@ crypto_dep = dependency('libcrypto') # for MD5 in Hasher.cpp on Linux
world_dep = declare_dependency(
link_with : lib_world,
dependencies : [crypto_dep, zlib_dep],
include_directories : include_directories('x64headers'),
)

View file

@ -17,7 +17,9 @@
#include "Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h"
#include "Minecraft.World/net/minecraft/network/packet/Packet.h"
#include "Minecraft.World/net/minecraft/network/packet/PacketListener.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
class SocketAddress;

View file

@ -8,7 +8,9 @@
#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h"
#include "Minecraft.World/net/minecraft/world/entity/player/Player.h"
#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
AddPlayerPacket::AddPlayerPacket() {
id = -1;

View file

@ -6,7 +6,9 @@
#include "java/InputOutputStream/DataOutputStream.h"
#include "Minecraft.World/net/minecraft/world/entity/player/Player.h"
#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
LoginPacket::LoginPacket() {
this->userName = L"";

View file

@ -46,7 +46,9 @@
#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
#include "Minecraft.World/net/minecraft/world/phys/AABB.h"
#include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
thread_local bool Entity::m_tlsUseSmallIds = false;

View file

@ -50,7 +50,9 @@
#include "net/minecraft/world/level/Level.h"
#include "net/minecraft/world/level/tile/Tile.h"
#include "net/minecraft/world/phys/AABB.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
const float Mob::MAX_WEARING_ARMOR_CHANCE = 0.15f;
const float Mob::MAX_PICKUP_LOOT_CHANCE = 0.55f;

View file

@ -82,7 +82,9 @@
#include "net/minecraft/world/scores/Scoreboard.h"
#include "net/minecraft/world/scores/Team.h"
#include "net/minecraft/world/scores/criteria/ObjectiveCriteria.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
class ModelPart;
class Objective;

View file

@ -18,7 +18,9 @@
#include "Minecraft.World/net/minecraft/world/level/Level.h"
#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
#include "Minecraft.World/net/minecraft/world/phys/AABB.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
Explosion::Explosion(Level* level, std::shared_ptr<Entity> source, double x,
double y, double z, float r) {

View file

@ -64,7 +64,9 @@
#include "net/minecraft/world/phys/HitResult.h"
#include "net/minecraft/world/phys/Vec3.h"
#include "net/minecraft/world/scores/Scoreboard.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "platform/PlatformServices.h"
class CompoundTag;

View file

@ -18,7 +18,9 @@
#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/SandFeature.h"
#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/SpringFeature.h"
#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
BiomeDecorator::BiomeDecorator(Biome* biome) {
_init();

View file

@ -15,7 +15,9 @@
#include "Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.h"
#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
#include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
JungleBiome::JungleBiome(int id) : Biome(id) {
decorator->treeCount = 50;

View file

@ -9,7 +9,9 @@
#include "java/InputOutputStream/DataInputStream.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "java/System.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
// Note: See header for an overview of this class

View file

@ -6,9 +6,6 @@
class DataInputStream;
class DataOutputStream;
template <typename T> class XLockFreeStack;
#if !defined(__linux__)
#include "../../../../../x64headers/xmcore.h"
#endif
// This class is used for the compressed storage of tile data. Unlike the
// SparseLightingStorage class, data is split into 512 blocks of 4x4x4 tiles.

View file

@ -43,7 +43,9 @@
#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h"
#include "Minecraft.World/net/minecraft/world/phys/AABB.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
class DataInputStream;
class DataOutputStream;

View file

@ -7,7 +7,9 @@
#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
#include "java/InputOutputStream/DataInputStream.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
// Note: See header for an overview of this class

View file

@ -1,9 +1,6 @@
#pragma once
#include <stdint.h>
#include <format>
#if !defined(__linux__)
#include "../../../../../x64headers/xmcore.h"
#endif
// 4J added - Storage for data (ie the extra per tile storage). Data is normally
// stored as 4-bits per tile, in a DataLayer class of 16384 bytes ( 128 x 16 x

View file

@ -7,7 +7,9 @@
#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
#include "java/InputOutputStream/DataInputStream.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
// Note: See header for an overview of this class

View file

@ -1,9 +1,6 @@
#pragma once
#include <stdint.h>
#include <format>
#if !defined(__linux__)
#include "../../../../../x64headers/xmcore.h"
#endif
// 4J added - Storage for block & sky light data. Lighting data is normally
// stored as 4-bits per tile, in a DataLayer class of 16384 bytes ( 128 x 16 x

View file

@ -28,7 +28,9 @@
#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h"
#include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h"
#include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "platform/PlatformServices.h"
class DataInput;

View file

@ -28,7 +28,9 @@
#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h"
#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "platform/PlatformServices.h"
thread_local OldChunkStorage::ThreadStorage* OldChunkStorage::m_tlsStorage =

View file

@ -13,7 +13,9 @@
#include "java/InputOutputStream/ByteArrayInputStream.h"
#include "java/InputOutputStream/DataInputStream.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
std::vector<uint8_t> RegionFile::emptySector(SECTOR_BYTES);

View file

@ -27,7 +27,9 @@
#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
#include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h"
#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
const double CustomLevelSource::SNOW_SCALE = 0.3;
const double CustomLevelSource::SNOW_CUTOFF = 0.5;

View file

@ -9,7 +9,9 @@
#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.h"
#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
// FlatLevelSource::villageFeature = new VillageFeature(1);

View file

@ -12,7 +12,9 @@
#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
#include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h"
#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
HellFlatLevelSource::HellFlatLevelSource(Level* level, int64_t seed) {
int xzSize = level->getLevelData()->getXZSize();
@ -103,13 +105,28 @@ LevelChunk* HellFlatLevelSource::create(int x, int z) { return getChunk(x, z); }
LevelChunk* HellFlatLevelSource::getChunk(int xOffs, int zOffs) {
random->setSeed(xOffs * 341873128712l + zOffs * 132897987541l);
// 4J - now allocating this with a physical alloc & bypassing general memory
// management so that it will get cleanly freed
int chunksSize = Level::genDepth * 16 * 16;
std::vector<uint8_t> blocks(chunksSize, 0);
uint8_t* tileData = (uint8_t*)malloc(chunksSize);
memset(tileData, 0, chunksSize);
std::vector<uint8_t> blocks = std::vector<uint8_t>(tileData, tileData + chunksSize);
// std::vector<uint8_t> blocks = std::vector<uint8_t>(16 * level->depth * 16);
prepareHeights(xOffs, zOffs, blocks);
buildSurfaces(xOffs, zOffs, blocks);
// caveFeature->apply(this, level, xOffs, zOffs, blocks);
// townFeature.apply(this, level, xOffs, zOffs, blocks);
// addCaves(xOffs, zOffs, blocks);
// addTowns(xOffs, zOffs, blocks);
// 4J - this now creates compressed block data from the blocks array passed
// in, so needs to be after data is finalised. Also now need to free the
// passed in blocks as the LevelChunk doesn't use the passed in allocation
// anymore.
LevelChunk* levelChunk = new LevelChunk(level, blocks, xOffs, zOffs);
free(tileData);
return levelChunk;
}

View file

@ -22,7 +22,9 @@
#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
#include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h"
#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
HellRandomLevelSource::HellRandomLevelSource(Level* level, int64_t seed) {
int xzSize = level->getLevelData()->getXZSize();

View file

@ -24,7 +24,9 @@
#include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h"
#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
#include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
const double RandomLevelSource::SNOW_SCALE = 0.3;
const double RandomLevelSource::SNOW_CUTOFF = 0.5;

View file

@ -10,7 +10,9 @@
#include "Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.h"
#include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h"
#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
TheEndLevelRandomLevelSource::TheEndLevelRandomLevelSource(Level* level,
int64_t seed) {

View file

@ -11,7 +11,9 @@
#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h"
#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
#include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
uint8_t BasicTree::axisConversionArray[] = {2, 0, 0, 1, 2, 1};

View file

@ -4,7 +4,9 @@
#include "java/Random.h"
#include "Minecraft.World/net/minecraft/world/level/Level.h"
#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
GroundBushFeature::GroundBushFeature(int trunkType, int leafType) {
trunkTileType = trunkType;

View file

@ -9,7 +9,9 @@
#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h"
#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
#include "Minecraft.World/net/minecraft/world/level/tile/VineTile.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
MegaTreeFeature::MegaTreeFeature(bool doUpdate, int baseHeight, int trunkType,
int leafType)

View file

@ -7,7 +7,9 @@
#include "Minecraft.World/net/minecraft/util/Mth.h"
#include "Minecraft.World/net/minecraft/world/level/Level.h"
#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
void OreFeature::_init(int tile, int count, int targetTile) {
this->tile = tile;

View file

@ -9,7 +9,9 @@
#include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h"
#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
#include "Minecraft.World/net/minecraft/world/level/tile/VineTile.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
TreeFeature::TreeFeature(bool doUpdate)
: Feature(doUpdate),

View file

@ -37,7 +37,9 @@
#include "Minecraft.World/net/minecraft/world/level/dimension/TheEndDimension.h"
#include "Minecraft.World/net/minecraft/world/level/storage/LevelStorage.h"
#include "Minecraft.World/net/minecraft/world/level/storage/PlayerIO.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
#include "platform/PlatformServices.h"
const std::wstring DirectoryLevelStorage::sc_szPlayerDir(L"players/");

View file

@ -21,7 +21,9 @@
#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h"
#include "Minecraft.World/net/minecraft/world/phys/AABB.h"
#include "Minecraft.World/x64headers/extraX64.h"
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"
class Icon;

View file

@ -1,8 +0,0 @@
// Compatibility shim — includes the split headers for code that still
// references the old monolithic header. Migrate direct includers to use
// NetTypes.h or XboxStubs.h instead, then delete this file.
#pragma once
#include "Minecraft.Client/Header Files/NetTypes.h"
#include "Minecraft.Client/Header Files/XboxStubs.h"
#include "Minecraft.Client/Header Files/SkinBox.h"