New File System and Cleanup some code Part 3

* Remove stdafx.h and some <unordered_set> includes
* Update Minecraft Server Defines and remove more unused folders/files
* Unbloat stdafx.h from Minecraft.World
This commit is contained in:
GabsPuNs
2026-05-24 21:23:25 -04:00
parent 145a1ca7a1
commit bc6c09146a
1569 changed files with 109 additions and 1602 deletions

View File

@@ -1,5 +1,5 @@
CompileFlags:
Add: [-std=c++14,
Add: [-std=c++20,
-m64,
-Wno-unused-includes
]

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\Minecraft.World\net.minecraft.core.h"
#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
#include "..\Minecraft.World\net.minecraft.world.level.tile.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "AchievementScreen.h"
#include "SmallButton.h"
#include "Options.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "AllowAllCuller.h"
bool AllowAllCuller::isVisible(AABB *bb)

View File

@@ -1,5 +1,3 @@
#include "stdafx.h"
#include "..\Minecraft.World\StringHelpers.h"
#include "..\Minecraft.World\compression.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "ArrowRenderer.h"
#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
#include "..\Minecraft.World\Mth.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\Minecraft.World\net.minecraft.world.entity.ambient.h"
#include "BatModel.h"
#include "ModelPart.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\Minecraft.World\net.minecraft.world.entity.ambient.h"
#include "BatRenderer.h"
#include "BatModel.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
#include "..\Minecraft.World\net.minecraft.world.level.h"
#include "BeaconRenderer.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\Minecraft.World\Mth.h"
#include "BlazeModel.h"
#include "ModelPart.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "BlazeModel.h"
#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
#include "BlazeRenderer.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "BoatModel.h"
BoatModel::BoatModel() : Model()

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "BoatRenderer.h"
#include "BoatModel.h"
#include "..\Minecraft.World\net.minecraft.world.entity.item.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\Minecraft.World\Mth.h"
#include "BookModel.h"
#include "ModelPart.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "BossMobGuiInfo.h"
#include "../Minecraft.World/BossMob.h"
#include "../Minecraft.World/LevelData.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "BreakingItemParticle.h"
#include "Tesselator.h"
#include "..\Minecraft.World\net.minecraft.world.level.tile.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "BubbleParticle.h"
#include "..\Minecraft.World\Random.h"
#include "..\Minecraft.World\Mth.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "Camera.h"
#include "MemoryTracker.h"
#include "..\Minecraft.World\net.minecraft.world.entity.player.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "CaveSpiderRenderer.h"
ResourceLocation CaveSpiderRenderer::CAVE_SPIDER_LOCATION = ResourceLocation(TN_MOB_CAVE_SPIDER);

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "ChestModel.h"
#include "ModelPart.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "ChestRenderer.h"
#include "ChestModel.h"
#include "LargeChestModel.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\Minecraft.World\Mth.h"
#include "ChickenModel.h"
#include "ModelPart.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\Minecraft.World\Mth.h"
#include "ChickenRenderer.h"
#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "Chunk.h"
#include "TileRenderer.h"
#include "TileEntityRenderDispatcher.h"

View File

@@ -1,5 +1,4 @@
#pragma once
#include <unordered_set>
#include "..\Minecraft.World\net.minecraft.network.h"
class Minecraft;
class MultiPlayerLevel;

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "ClientConstants.h"
//const wstring ClientConstants::VERSION_STRING = wstring(L"Minecraft LCE ") + VER_FILEVERSION_STR_W;//+ SharedConstants::VERSION_STRING;

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "Minecraft.h"
#include "..\Minecraft.World\net.minecraft.world.level.h"
#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "Consoles_SoundEngine.h"

View File

@@ -1,9 +1,5 @@
#include "stdafx.h"
#include "Consoles_SoundEngine.h"
const wchar_t *ConsoleSoundEngine::wchSoundNames[eSoundType_MAX]=
{
L"mob.chicken.say", // eSoundType_MOB_CHICKEN_AMBIENT

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "ColourTable.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "ConsoleGameMode.h"
#include ".\Tutorial\Tutorial.h"

View File

@@ -1,5 +1,4 @@
#include "stdafx.h"
#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
#ifdef MINECRAFT_SERVER_BUILD
#include "..\..\Minecraft.Server\ServerLogManager.h"
#endif
@@ -13,7 +12,7 @@ static VOID DebugSpewV( const CHAR* strFormat, va_list pArgList )
#if defined __PS3__ || defined __ORBIS__ || defined __PSVITA__
assert(0);
#else
#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
#ifdef MINECRAFT_SERVER_BUILD
// Dedicated server routes legacy debug spew through ServerLogger to preserve CLI prompt handling.
if (ServerRuntime::ServerLogManager::ShouldForwardClientDebugLogs())
{

View File

@@ -231,7 +231,7 @@ void CMinecraftApp::DebugPrintf(const char *szFormat, ...)
#ifndef _FINAL_BUILD
va_list ap;
va_start(ap, szFormat);
#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
#ifdef MINECRAFT_SERVER_BUILD
// Dedicated server routes client debug spew through ServerLogger so CLI output stays prompt-safe.
if (ServerRuntime::ServerLogManager::ShouldForwardClientDebugLogs())
{
@@ -255,7 +255,7 @@ void CMinecraftApp::DebugPrintf(int user, const char *szFormat, ...)
return;
va_list ap;
va_start(ap, szFormat);
#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
#ifdef MINECRAFT_SERVER_BUILD
// Dedicated server routes client debug spew through ServerLogger so CLI output stays prompt-safe.
if (ServerRuntime::ServerLogManager::ShouldForwardClientDebugLogs())
{

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "DLCManager.h"
#include "DLCAudioFile.h"
#include "..\..\Windows64\XML\ATGXmlParser.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "DLCManager.h"
#include "DLCCapeFile.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "DLCFile.h"
DLCFile::DLCFile(DLCManager::EDLCType type, const wstring &path)

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "DLCManager.h"
#include "DLCGameRulesFile.h"

View File

@@ -1,5 +1,3 @@
#include "stdafx.h"
#include <string>
#include "..\..\..\Minecraft.World\File.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "DLCManager.h"
#include "DLCLocalisationFile.h"
#include "..\..\StringTable.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include <algorithm>
#include "DLCManager.h"
#include "DLCPack.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "DLCPack.h"
#include "DLCSkinFile.h"
#include "DLCCapeFile.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "DLCManager.h"
#include "DLCSkinFile.h"
#include "..\..\ModelPart.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "DLCManager.h"
#include "DLCTextureFile.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "DLCManager.h"
#include "DLCUIDataFile.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.enchantment.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "BiomeOverride.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\..\WstringLookup.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "CollectItemRuleDefinition.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "CompleteAllRuleDefinition.h"
#include "ConsoleGameRules.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
#include "CompoundGameRuleDefinition.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "ConsoleGenerateStructure.h"
#include "ConsoleGameRules.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include <vector>
#include "..\..\..\Minecraft.World\com.mojang.nbt.h"
#include "..\..\..\Minecraft.World\System.h"

View File

@@ -4,7 +4,8 @@ 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"
#include "../../../Minecraft.World/compression.h"
class Level;
class DataOutputStream;

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "ConsoleGameRules.h"
GameRule::GameRule(GameRuleDefinition *definition, Connection *connection)

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\..\WstringLookup.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "ConsoleGameRules.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\compression.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "..\..\..\Minecraft.World\File.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "LevelGenerationOptions.h"
#include "LevelGenerators.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "LevelRules.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "..\..\StringTable.h"
#include "ConsoleGameRules.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "NamedAreaRuleDefinition.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "StartFeature.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "UpdatePlayerRuleDefinition.h"
#include "ConsoleGameRules.h"
#include "..\..\..\Minecraft.World\Pos.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "UseTileRuleDefinition.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "XboxStructureActionGenerateBox.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "XboxStructureActionPlaceBlock.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "XboxStructureActionPlaceContainer.h"
#include "AddItemRuleDefinition.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "XboxStructureActionPlaceSpawner.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "LeaderboardInterface.h"
LeaderboardInterface::LeaderboardInterface(LeaderboardManager *man)

View File

@@ -1,5 +1,3 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "LeaderboardManager.h"

View File

@@ -1,5 +1,3 @@
#include "stdafx.h"
#include <cstdlib>
#include <np.h>
//#include <sys/ppu_thread.h>

View File

@@ -22,11 +22,8 @@
3. This notice may not be removed or altered from any source distribution.
Ren<65> Nyffenegger rene.nyffenegger@adp-gmbh.ch
*/
#include "stdafx.h"
#include "base64.h"
#include <iostream>

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\Socket.h"
#include "..\..\..\Minecraft.World\StringHelpers.h"
#include "PlatformNetworkManagerStub.h"

View File

@@ -1,5 +1,3 @@
#include "stdafx.h"
#include "MultiPlayerLocalPlayer.h"
#include "..\Minecraft.World\LevelSettings.h"

View File

@@ -1,5 +1,3 @@
#include "stdafx.h"
#include "..\..\Minecraft.h"
#include "..\..\MultiplayerLocalPlayer.h"
#include "AreaConstraint.h"

View File

@@ -1,5 +1,3 @@
#include "stdafx.h"
#include "..\..\Minecraft.h"
#include "..\..\MultiplayerLocalPlayer.h"
#include "AreaHint.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "Tutorial.h"
#include "AreaTask.h"

View File

@@ -1,5 +1,3 @@
#include "stdafx.h"
#include "Tutorial.h"
#include "..\..\Minecraft.h"
#include "..\..\MultiplayerLocalPlayer.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include <string>
#include <unordered_map>
#include "..\..\Minecraft.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\ItemInstance.h"
#include "CompleteUsingItemTask.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include <string>
#include <unordered_map>
#include "..\..\Minecraft.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "CraftTask.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"

View File

@@ -1,4 +1,3 @@
#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"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h"
#include "EffectChangedTask.h"

View File

@@ -1,4 +1,3 @@
#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"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "Tutorial.h"
#include "FullTutorialActiveTask.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include <string>

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "InputConstraint.h"
bool InputConstraint::isMappingConstrained(int iPad, int mapping)

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "Tutorial.h"
#include "LookAtEntityHint.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
#include "Tutorial.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "PickupTask.h"
void PickupTask::onTake(shared_ptr<ItemInstance> item, unsigned int invItemCountAnyAux, unsigned int invItemCountThisAux)

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "ProcedureCompoundTask.h"
ProcedureCompoundTask::~ProcedureCompoundTask()

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "ProgressFlagTask.h"
bool ProgressFlagTask::isCompleted()

View File

@@ -1,5 +1,3 @@
#include "stdafx.h"
#include <string>
#include "Minecraft.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\..\Minecraft.h"
#include "..\..\LocalPlayer.h"
#include "..\..\StatsCounter.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
#include "Tutorial.h"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
#include "..\..\LocalPlayer.h"
#include "..\..\..\Minecraft.World\Entity.h"

View File

@@ -1,4 +1,3 @@
#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"

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include "TutorialMessage.h"
TutorialMessage::TutorialMessage(int messageId, bool limitRepeats /*= false*/, unsigned char numRepeats /*= TUTORIAL_MESSAGE_DEFAULT_SHOW*/)

View File

@@ -1,4 +1,3 @@
#include "stdafx.h"
#include <memory>
#include "..\..\Minecraft.h"
#include "..\..\MultiplayerLocalPlayer.h"

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